From 861e3230f0154e6a5942698adedf18d5eb0e0b8a Mon Sep 17 00:00:00 2001
From: Matthijs Kuiper <info@matthijskuiper.nl>
Date: Wed, 10 Jan 2018 20:08:33 +0100
Subject: Move imaegs to assets folder

---
 html/includes/config_pic.php  | 24 ++++--------------------
 html/includes/functions.php   | 18 +++++++++---------
 html/includes/header.php      |  2 +-
 html/includes/navbar.php      |  2 +-
 html/includes/weaponstats.php |  4 ++--
 5 files changed, 17 insertions(+), 33 deletions(-)

(limited to 'html/includes')

diff --git a/html/includes/config_pic.php b/html/includes/config_pic.php
index e70aee5..99bc089 100644
--- a/html/includes/config_pic.php
+++ b/html/includes/config_pic.php
@@ -1,7 +1,6 @@
 <?php
 // Picture configuration file
 
-
 // General note about colors:
 // When specifying a color, you specify it's RGB values in hex (like you do in HTML).
 // Example: 00FF00 = green (0 red, 255 green, 0 blue)
@@ -12,9 +11,6 @@
 // Acceptable values are 00 (completely opaque) to 7F (completely transparent)
 // FFFF003F will become half transparent yellow
 
-
-
-
 $i=0;
 // Enable users to use this picutre or (temporary) disable it?
 $pic[$i]['enabled'] = true;
@@ -25,7 +21,7 @@ $pic[$i]['enabled'] = true;
 $pic[$i]['gidrequired'] = true;
 
 // The template picture where we're going to write stuff at
-// We're searching for it in images/templates.
+// We're searching for it in assets/images/templates.
 $pic[$i]['load']['template'] = 'basic.png';
 // Create a copy of the picture and work with that copy?
 // That's needed f.e. if you're using a picture with a palette of colors and want
@@ -47,12 +43,10 @@ $pic[$i]['output']['type'] = 'png';
 // override the standard ;)
 $pic[$i]['default']['align'] = 'left';
 $pic[$i]['default']['angle'] = 0;
-$pic[$i]['default']['font'] = 'arbocrest.ttf';
+$pic[$i]['default']['font'] = 'arbocrest.ttf'; // Loaded from assets/fonts.
 $pic[$i]['default']['fontcolor'] = 'FFFFFF';
 $pic[$i]['default']['fontsize'] = 12;
 
-
-
 // Now we've loaded the picture and know how to output it.
 // Let's place some fancy stuff on it:
 
@@ -67,7 +61,7 @@ $pic[$i]['default']['fontsize'] = 12;
 //             inline variables are available (see below)
 // align     - The alignment of the text (left, center, right)
 //             (optional, default: left)
-// fontname  - The name of the TTF file (must be in images/fonts)
+// fontname  - The name of the TTF file (must be in assets/fonts)
 //             (optional if you specified a default value)
 // fontsize  - The font size. Depending on your version of GD, this should be specified
 //             as the pixel size (GD1) or point size (GD2).
@@ -157,7 +151,6 @@ $pic[$i]['default']['fontsize'] = 12;
 //           '%PLAYERNAME%'s overall accuracy this month was %MONTH_ACC% % while it was %LMONTH_ACC% last month!'
 //       ==> 'Player's overall accuracy this month was 42.22 % while it was 27.52 % last month!'
 
-
 $j=0;
 $pic[$i]['process'][$j]['type'] = 'text';
 $pic[$i]['process'][$j]['value'] = '%PLAYERNAME%';
@@ -197,13 +190,6 @@ $pic[$i]['process'][$j]['x_from'] = 75;
 $pic[$i]['process'][$j]['y_from'] = 91;
 $j++;
 
-
-
-
-
-
-
-
 // The next picture
 
 $i++;
@@ -234,6 +220,4 @@ $pic[$i]['process'][$j]['x_from'] = 9;
 $pic[$i]['process'][$j]['y_from'] = 43;
 $j++;
 
-
-
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/functions.php b/html/includes/functions.php
index 005a3c1..fb24308 100755
--- a/html/includes/functions.php
+++ b/html/includes/functions.php
@@ -271,9 +271,9 @@ function FlagImage($country, $mini = true) {
 	$width = ($mini) ? 20 : 20;
 	$height = ($mini) ? 14 : 14;
 	if (empty($country)) return('');
-	if (!file_exists("images/flags/$country.png")) return(''); //18*12
+	if (!file_exists("assets/images/flags/$country.png")) return(''); //18*12
 	$countryname = (isset($a_countries[$country])) ? $a_countries[$country] : '';
-	return('<img src="images/flags/'. $country .'.png" width="'.$width.'" height="'.$height.'" style="border:0;" alt="'. $country .'" title="'. $countryname .'">');
+	return('<img src="assets/images/flags/'. $country .'.png" width="'.$width.'" height="'.$height.'" style="border:0;" alt="'. $country .'" title="'. $countryname .'">');
 }
 
 function RankMovement($diff) {
@@ -291,11 +291,11 @@ function RankMovement($diff) {
 		$chtext = "lost ". get_dp($diff * -1) ." ranking points";
 	}
 	$moveimg = '';
-	if (file_exists("images/ranks/$chimg.png")) {
-		$infos = getimagesize("images/ranks/$chimg.png");
+	if (file_exists("assets/images/ranks/$chimg.png")) {
+		$infos = getimagesize("assets/images/ranks/$chimg.png");
 		$width = $infos[0];
 		$height = $infos[1];
-		$moveimg = '<img src="images/ranks/'. $chimg .'.png" width="'.$width.'" height="'.$height.'" style="border:0;" alt="" title="'. $chtext .'">';
+		$moveimg = '<img src="assets/images/ranks/'. $chimg .'.png" width="'.$width.'" height="'.$height.'" style="border:0;" alt="" title="'. $chtext .'">';
 	}
 	return($moveimg);
 }
@@ -343,10 +343,10 @@ function RankImageOrText($pid, $name, $rank, $gid, $gamename, $mini = true, $for
 	}
 
 	$ranktext = $rank.ordinal($rank);
-	if (file_exists("images/ranks/$rank.png")) {
+	if (file_exists("assets/images/ranks/$rank.png")) {
 		$width = ($mini) ? 15 : 15;
 		$height = ($mini) ? 12 : 12;
-		$img = '<img class="tooltip" src="images/ranks/'. $rank .'.png" width="17" height="17" style="border:0; margin-bottom: -4px;" alt="'. $rank .'" title="'. $ranktext .' in '. $gamename .'">';
+		$img = '<img class="tooltip" src="assets/images/ranks/'. $rank .'.png" width="17" height="17" style="border:0; margin-bottom: -4px;" alt="'. $rank .'" title="'. $ranktext .' in '. $gamename .'">';
 	} else {
 		$img = '';
 	}
@@ -601,14 +601,14 @@ function getMapImageName($mapname) {
 			$mapname = str_replace($mapVersions, "", $mapname);
 		}
 
-		$mappic = strtolower("images/maps/" . $mapname . "_large.jpg");
+		$mappic = strtolower("assets/images/maps/" . $mapname . "_large.jpg");
 
 		if(file_exists(dirname(dirname(__FILE__)) . "/" . $mappic)) {
 			return $mappic;
 		}
 	}
 
-	return "images/maps/blank_large.jpg";
+	return "assets/images/maps/blank_large.jpg";
 }
 
 ?>
diff --git a/html/includes/header.php b/html/includes/header.php
index 92e0dd1..1759a8b 100755
--- a/html/includes/header.php
+++ b/html/includes/header.php
@@ -33,7 +33,7 @@ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <head>
   <title>Unreal Tournament Stats - Powered by UTStats</title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-  <link rel="icon" href="images/favicon.ico" type="image/ico">
+  <link rel="icon" href="assets/images/favicon.ico" type="image/ico">
 
   <link rel="stylesheet" href="assets/lib/tooltipster/tooltipster.css">
   <link rel="stylesheet" href="assets/style.css">
diff --git a/html/includes/navbar.php b/html/includes/navbar.php
index 0e25a53..ef856db 100755
--- a/html/includes/navbar.php
+++ b/html/includes/navbar.php
@@ -2,7 +2,7 @@
   <ul>
     <li class="logo">
       <a href="./">
-        <img src="images/navbar-logo.png" alt="UTStats Logo">
+        <img src="assets/images/navbar-logo.png" alt="UTStats Logo">
       </a>
     </li>
     <li>
diff --git a/html/includes/weaponstats.php b/html/includes/weaponstats.php
index bccdd6d..80238b3 100644
--- a/html/includes/weaponstats.php
+++ b/html/includes/weaponstats.php
@@ -155,11 +155,11 @@ uts_weaponstats AS w
 
 function ws_header(&$wsort, &$weapons, $colspan, $one, $playercol) {
 	echo '<tr>';
-	if ($playercol and $playercol != -1) echo '<td class="smheading" align="center" width="220" '.(($one) ? 'rowspan="2"' : '') .'><img src="images/playersmall.png" style="max-width:50px; max-height:50px;"></td>';
+	if ($playercol and $playercol != -1) echo '<td class="smheading" align="center" width="220" '.(($one) ? 'rowspan="2"' : '') .'><img src="assets/images/playersmall.png" style="max-width:50px; max-height:50px;"></td>';
 	if ($playercol == -1) echo '<td class="smheading" align="center" width="220">&nbsp;</td>';
 	foreach($wsort as $wid => $bar) {
 		if (!empty($weapons[$wid]['image'])) {
-			$content = '<img border="0" class="tooltip" style="min-width: 15px; max-width:40px; max-height:50px;" src="images/weapons/'.$weapons[$wid]['image'].'" alt="'.$weapons[$wid]['name'].'" title="'.$weapons[$wid]['name'].'"></a>';
+			$content = '<img border="0" class="tooltip" style="min-width: 15px; max-width:40px; max-height:50px;" src="assets/images/weapons/'.$weapons[$wid]['image'].'" alt="'.$weapons[$wid]['name'].'" title="'.$weapons[$wid]['name'].'"></a>';
 		} else {
 			$content = '<span style="font-size: 60%;">'.$weapons[$wid]['name'].'</span>';
 		}
-- 
cgit