From 640ba673370f07041ed62d8214fb74c1f919368c Mon Sep 17 00:00:00 2001
From: iopietro <iopietro@hotmail.it>
Date: Sat, 9 Jun 2018 12:31:46 +0200
Subject: [PATCH] Admin panel fixes

+WW level is now showed in the village preview
+WW level can now be changed  in the building list
+Walls and their level are now showed in the village preview
---
 Admin/Templates/editVillage.tpl         | 126 ++++++++--------
 Admin/Templates/village.tpl             | 188 +++++++++---------------
 GameEngine/Admin/Mods/editBuildings.php |   4 +-
 3 files changed, 134 insertions(+), 184 deletions(-)

diff --git a/Admin/Templates/editVillage.tpl b/Admin/Templates/editVillage.tpl
index 7429bfcf..87f1e56d 100644
--- a/Admin/Templates/editVillage.tpl
+++ b/Admin/Templates/editVillage.tpl
@@ -29,8 +29,7 @@ if(isset($id))
 			<div id="content" class="village1" style="min-height: 264px;">
 				<div id="village_map" class="f<?php echo $database->getVillageType($village['wref']); ?>" style="float: left;">
 					<?php
-						for($f = 1; $f <19; $f++)
-						{
+						for($f = 1; $f < 19; $f++){
 							##$gid = $fdata['f'.($f).'t'];
 							##$level = $fdata['f'.($f)];
 							echo "<img src=\"../img/x.gif\" class=\"reslevel rf".$f." level".$f."\">";
@@ -42,16 +41,13 @@ if(isset($id))
 			<div id="content" class="village2" style="padding: 0; margin-left: -20px;">
 				<div id="village_map" class="d2_0">
 					<?php
-					for($b =1; $b <21; $b++)
-					{
-
+					for($b = 1; $b < 21; $b++){
 						echo "<img src=\"../img/x.gif\" class=\"building d".$b." iso\">";
 					}
 					?>
 					<div id="levels" class="on">
 						<?php
-							for($b =1; $b <21; $b++)
-							{
+							for($b = 1; $b < 21; $b++){
 								echo "<div class=\"d$b\">".($b + 18)."</div>";
 							}
 						?>
@@ -71,8 +67,7 @@ if(isset($id))
 				</thead>
 				<tbody>
 					<?php
-						for($i = 1; $i<=42; $i++)
-						{
+						for($i = 1; $i <= 42; $i++){
 							$bu = $funct->procResType($i);
 							echo '
 							<tr>
@@ -102,16 +97,12 @@ if(isset($id))
 			</thead>
 			<tbody>
 				<?php
-				for ($i = 1; $i <= 40; $i++)
-				{
-					if($fdata['f'.$i.'t'] == 0)
-					{
-						$bu = "-";
-					}
-					else
-					{
-						$bu = $funct->procResType($fdata['f'.$i.'t']);
-					}
+				for ($i = 1; $i <= 41; $i++){
+				    if($i == 41) $i = 99;
+				    
+				    if($fdata['f'.$i.'t'] == 0) $bu = "-";			
+				    else $bu = $funct->procResType($fdata['f'.$i.'t']);
+
 					echo '
 						<tr>
 							<td class="on">'.$i.'</td>
@@ -131,7 +122,7 @@ if(isset($id))
 		<div id="content" class="village1" style="min-height: 264px;">
 			<div id="village_map" class="f<?php echo $database->getVillageType($village['wref']); ?>" style="float: left;">
 				<?php
-					for($f = 1; $f <19; $f++)
+					for($f = 1; $f < 19; $f++)
 					{
 						$gid = $fdata['f'.($f).'t'];
 						$level = $fdata['f'.($f)];
@@ -144,64 +135,71 @@ if(isset($id))
 		<br />
 
 		<br /><br />
-
+	<?php 
+	
+	$WWLevel = $fdata['f99t'];
+	$wallLevel = $fdata['f40t'];
+	if($wallLevel == 0) $wallType = "d2_0";
+	else 
+	{
+	    switch($user['tribe']){
+	        case 1:
+	        case 5:
+	        default: $wallType = "d2_11"; break;
+	        
+	        case 2: $wallType = "d2_12"; break;
+	        case 3: $wallType = "d2_1"; break;
+	    }
+	}
+	
+	?>	
 		<div id="content" class="village2">
 		<h1><?php echo $village['name']; ?></h1>
-		<div id="village_map" class="d2_0">
+		<div id="village_map" class="<?php echo $wallType; ?>">
 			<?php
-			for($b =1; $b <21; $b++)
-			{
+			for($b =1; $b < 21; $b++){
 				$gid = $fdata['f'.($b + 18).'t'];
-				if($gid >0)
-				{
-					echo "<img src=\"../img/x.gif\" class=\"building d".$b." g".$gid."\">";
-				}
-				elseif($gid ==0)
-				{
-					echo "<img src=\"../img/x.gif\" class=\"building d".$b." iso\">";
-				}
-			}
-			$rp=16;
+				if($gid >0) echo "<img src=\"../img/x.gif\" class=\"building d".$b." g".$gid."\">";
+				elseif($gid == 0) echo "<img src=\"../img/x.gif\" class=\"building d".$b." iso\">";		
+			}		
+			
+			$rp = 16;
 			$rplevel = $fdata['f'.$rp];
-			if($rplevel > 0)
-			{
-				echo "<img src=\"../img/x.gif\" class=\"dx1 g16\">";
-			}
-			elseif($rplevel ==0)
-			{
-				echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
-			}
-
+			
+			if($rplevel > 0) echo "<img src=\"../img/x.gif\" class=\"dx1 g16\">";
+			elseif($rplevel == 0) echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
+			
             $resourcearray = $database->getResourceLevel($village['wref']);
             if($resourcearray['f99t'] == 40) {
                 if($resourcearray['f99'] >= 0 && $resourcearray['f99'] <= 19) {
-                    echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
-                    echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
-                    echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
-                    echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
-                    echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] == 100) {
-                    echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">'; }
+                    echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; 
+                }
+                elseif($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
+                    echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">';
+                }
+                elseif($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
+                    echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">';
+                }
+                elseif($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
+                    echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">'; 
+                }
+                elseif($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
+                    echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">';
+                }
+                elseif($resourcearray['f99'] == 100) {
+                    echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">';
+                }
             }
 			?>
 			<div id="levels" class="on">
 				<?php
-					for($b =1; $b <21; $b++)
-					{
+					for($b = 1; $b < 21; $b++){
 						$level = $fdata['f'.($b + 18)];
-						if($level >0)
-						{
-							echo "<div class=\"d$b\">$level</div>";
-						}
-					}
-					if($rplevel >0)
-					{
-						echo "<div class=\"l39\">".$fdata['f'.($b + 18)]."</div>";
+						if($level > 0) echo "<div class=\"d$b\">$level</div>";
 					}
+					if($rplevel > 0) echo "<div class=\"l39\">".$fdata['f39']."</div>";
+					if($wallLevel > 0) echo "<div class=\"l40\">".$fdata['f40']."</div>";
+					if($WWLevel > 0) echo "<div class=\"d40\">".$fdata['f99']."</div>";
 				?>
 			</div>
 		</div>
diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl
index 70003c86..6439b281 100644
--- a/Admin/Templates/village.tpl
+++ b/Admin/Templates/village.tpl
@@ -11,10 +11,10 @@
 ##  Improved:      aggenkeech                                                  ##
 #################################################################################
 if($_SESSION['access'] < 8) die("Access Denied: You are not Admin!");
-error_reporting(0);
+
 $id = $_GET['did'];
-if(isset($id))
-{
+if(isset($id)){
+
 	$coor = $database->getCoor($village['wref']);
 	$varray = $database->getProfileVillages($village['owner']);
 	$type = $database->getVillageType($village['wref']);
@@ -33,12 +33,11 @@ if(isset($id))
 	elseif($type == 10){ $typ = array(3,5,4,6); }
 	elseif($type == 11){ $typ = array(4,5,3,6); }
 	elseif($type == 12){ $typ = array(5,4,3,6); }
-	$ocounter = array();
+	$ocounter = [];
 	$wood = $clay = $iron =$crop = 0;
 	$q = "SELECT o.*, w.x, w.y FROM ".TB_PREFIX."odata AS o LEFT JOIN ".TB_PREFIX."wdata AS w ON o.wref=w.id WHERE conqured = ".(int) $village['wref'];
 	$result = $database->query_return($q);
-	if(count($result) >0)
-		{
+	if(!empty($result) > 0){
 		    $newResult = [];
 			foreach($result as $row)
 			{
@@ -96,13 +95,12 @@ if(isset($id))
 	{
 		public function getMapCheck($wref)
 		{
-			return substr(md5($wref),5,2);
+			return substr(md5($wref), 5, 2);
 		}
 	};
 	$generator = new MyGenerator;
 
-	if($village and $user)
-	{
+	if($village && $user){
 		include("search2.tpl"); ?>
 		<style>
 			.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);}
@@ -153,17 +151,10 @@ if(isset($id))
 					<td>Field type</td>
 					<td colspan="2">
 						<?php
-							for ($i = 0; $i <= 3; $i++)
-							{
-								$a = $i+1;
-								if($i != 3)
-								{
-									echo $typ[$i].'x <img src="../img/admin/r/'.$a.'.gif">| ';
-								}
-								else
-								{
-									echo $typ[$i].'x <img src="../img/admin/r/'.$a.'.gif"> ';
-								}
+							for ($i = 0; $i <= 3; $i++){
+								$a = $i + 1;
+								if($i != 3) echo $typ[$i].'x <img src="../img/admin/r/'.$a.'.gif">| ';	
+							    else echo $typ[$i].'x <img src="../img/admin/r/'.$a.'.gif"> ';
 							}
 						?>
 					</td>
@@ -223,20 +214,16 @@ if(isset($id))
 			</thead>
 			<tbody>
 				<?php
-					for($e=1; $e<4; $e++)
-					{
+					for($e = 1; $e < 4; $e++){
 						$exp = $village['exp'.$e.''];
-						if($exp == 0)
-						{
+						if($exp == 0){
 							echo '
 								<tr>
 									<td class="hab"><center> - </center></td>
 									<td class="hab"><center> - </center></td>
 									<td class="hab"><center> - </center></td>
 								</tr>';
-						}
-						else
-						{
+						}else{
 							$vill = $database->getVillage($exp);
 							$link = '<a href="admin.php?p=village&did='.$vill['wref'].'">'.$vill['name'].'</a>';
 							echo '
@@ -268,10 +255,8 @@ if(isset($id))
 			</thead>
 			<tbody>
 				<?php
-					if(count($newResult))
-					{
-						foreach($newResult as $row)
-						{
+					if(!empty($newResult)){
+						foreach($newResult as $row){
 							echo "
 							<tr>
 								<td><a href=\"?action=delOas&oid=".$row['wref']."\" onClick=\"return del('oas',".$row['wref'].")\"><img src=\"../img/admin/del.gif\"></a></td>
@@ -282,10 +267,7 @@ if(isset($id))
 							</tr>";
 						}
 					}
-					elseif($result ==0)
-					{
-						echo '<td colspan="5"><center>This village has no oases</center></td>';
-					}
+					else echo '<td colspan="5"><center>This village has no oases</center></td>';
 				?>
 			</tbody>
 		</table>
@@ -303,8 +285,7 @@ if(isset($id))
 		<div id="content" class="village1" style="min-height: 264px;">
 			<div id="village_map" class="f<?php echo $database->getVillageType($village['wref']); ?>" style="float: left;">
 				<?php
-					for($f = 1; $f <19; $f++)
-					{
+					for($f = 1; $f < 19; $f++){
 						$gid = $fdata['f'.($f).'t'];
 						$level = $fdata['f'.($f)];
 						echo "<img src=\"../img/x.gif\" class=\"reslevel rf".$f." level".$level."\">";
@@ -312,95 +293,68 @@ if(isset($id))
 
 				?>
 			</div>
-			<div id="map_details">
-			<!--	<table>
-					<tbody>
-						<tr>
-							<td class="ico"><img class="r1" src="../img/x.gif"></td>
-							<td class="res">Lumber:</td>
-							<td class="num">Coming</td>
-							<td class="per">/hr</td>
-						</tr>
-						<tr>
-							<td class="ico"><img class="r2" src="../img/x.gif"></td>
-							<td class="res">Clay:</td>
-							<td class="num">Coming</td>
-							<td class="per">/hr</td>
-						</tr>
-						<tr>
-							<td class="ico"><img class="r3" src="../img/x.gif"></td>
-							<td class="res">Iron:</td>
-							<td class="num">Coming</td>
-							<td class="per">/hr</td>
-						</tr>
-						<tr>
-							<td class="ico"><img class="r4" src="../img/x.gif"></td>
-							<td class="res">Crop:</td>
-							<td class="num">Coming</td>
-							<td class="per">/hr</td>
-						</tr>
-					</tbody>
-				</table> -->
-		</div>
 		</div></a>
+	<?php 
+	
+	$WWLevel = $fdata['f99t'];
+	$wallLevel = $fdata['f40t'];
+	if($wallLevel == 0) $wallType = "d2_0";
+	else 
+	{
+	    switch($user['tribe']){
+	        case 1:
+	        case 5:
+	        default: $wallType = "d2_11"; break;
+	        
+	        case 2: $wallType = "d2_12"; break;
+	        case 3: $wallType = "d2_1"; break;
+	    }
+	}
+	
+	?>	
 	<div id="content" class="village2" style="padding: 0; margin-left: -20px;">
 		<h1><?php echo $village['name']; ?></h1>
-		<div id="village_map" class="d2_0">
+		<div id="village_map" class="<?php echo $wallType; ?>">
 			<?php
-			for($b =1; $b <21; $b++)
-			{
+			for($b = 1; $b < 21; $b++){
 				$gid = $fdata['f'.($b + 18).'t'];
-				if($gid >0)
-				{
-					echo "<img src=\"../img/x.gif\" class=\"building d".$b." g".$gid."\">";
-				}
-				elseif($gid ==0)
-				{
-					echo "<img src=\"../img/x.gif\" class=\"building d".$b." iso\">";
-				}
+				if($gid > 0) echo "<img src=\"../img/x.gif\" class=\"building d".$b." g".$gid."\">";
+				elseif($gid == 0) echo "<img src=\"../img/x.gif\" class=\"building d".$b." iso\">";
 			}
-			$rp=16;
+			
+			$rp = 16;
 			$rplevel = $fdata['f'.$rp];
-			if($rplevel > 0)
-			{
-				echo "<img src=\"../img/x.gif\" class=\"dx1 g16\">";
-			}
-			elseif($rplevel ==0)
-			{
-				echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
-			}
+			
+			if($rplevel > 0) echo "<img src=\"../img/x.gif\" class=\"dx1 g16\">";
+			elseif($rplevel == 0) echo "<img src=\"../img/x.gif\" class=\"dx1 g16e\">";
 
             $resourcearray = $database->getResourceLevel($village['wref']);
-            if($resourcearray['f99t'] == 40) {
+            if($resourcearray['f99t'] == 40){
                 if($resourcearray['f99'] >= 0 && $resourcearray['f99'] <= 19) {
-                    echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
-                    echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
-                    echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
-                    echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
-                    echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">'; }
-                if($resourcearray['f99'] == 100) {
-                    echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">'; }
+                    echo '<img class="ww g40" src="img/x.gif" alt="Worldwonder">';
+                }elseif($resourcearray['f99'] >= 20 && $resourcearray['f99'] <= 39) {
+                    echo '<img class="ww g40_1" src="img/x.gif" alt="Worldwonder">'; 
+                }elseif($resourcearray['f99'] >= 40 && $resourcearray['f99'] <= 59) {
+                    echo '<img class="ww g40_2" src="img/x.gif" alt="Worldwonder">';
+                }elseif($resourcearray['f99'] >= 60 && $resourcearray['f99'] <= 79) {
+                    echo '<img class="ww g40_3" src="img/x.gif" alt="Worldwonder">';
+                }elseif($resourcearray['f99'] >= 80 && $resourcearray['f99'] <= 99) {
+                    echo '<img class="ww g40_4" src="img/x.gif" alt="Worldwonder">';
+                }elseif($resourcearray['f99'] == 100) {
+                    echo '<img class="ww g40_5" src="img/x.gif" alt="Worldwonder">';
+                }
             }
 
 			?>
 			<div id="levels" class="on">
 				<?php
-					for($b =1; $b <21; $b++)
-					{
+					for($b = 1; $b < 21; $b++){
 						$level = $fdata['f'.($b + 18)];
-						if($level >0)
-						{
-							echo "<div class=\"d$b\">$level</div>";
-						}
-					}
-					if($rplevel >0)
-					{
-						echo "<div class=\"l39\">".$fdata['f'.($b + 18)]."</div>";
+						if($level >0) echo "<div class=\"d$b\">$level</div>";
 					}
+					if($rplevel > 0) echo "<div class=\"l39\">".$fdata['f39']."</div>";
+					if($wallLevel > 0) echo "<div class=\"l40\">".$fdata['f40']."</div>";
+					if($WWLevel > 0) echo "<div class=\"d40\">".$fdata['f99']."</div>";
 				?>
 	</div>
 </div>
@@ -421,16 +375,12 @@ if(isset($id))
 	</thead>
 	<tbody>
 	<?php
-	for ($i = 1; $i <= 40; $i++)
-	{
-		if($fdata['f'.$i.'t'] == 0)
-		{
-			$bu = "-";
-		}
-		else
-		{
-			$bu = $funct->procResType($fdata['f'.$i.'t']);
-		}
+	for ($i = 1; $i <= 41; $i++){
+	    if($i == 41) $i = 99;
+	    
+	    if($fdata['f'.$i.'t'] == 0) $bu = "-";
+		else $bu = $funct->procResType($fdata['f'.$i.'t']);
+		
 		echo '
 			<tr>
 				<td class="on">'.$i.'</td>
diff --git a/GameEngine/Admin/Mods/editBuildings.php b/GameEngine/Admin/Mods/editBuildings.php
index c8a25a1c..f548688f 100755
--- a/GameEngine/Admin/Mods/editBuildings.php
+++ b/GameEngine/Admin/Mods/editBuildings.php
@@ -113,7 +113,9 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."fdata SET
 	f39  = '".$_POST['id39level']."', 
 	f39t = '".$_POST['id39gid']."', 
 	f40  = '".$_POST['id40level']."', 
-	f40t = '".$_POST['id40gid']."' 
+	f40t = '".$_POST['id40gid']."',
+    f99 = '".$_POST['id99level']."',
+    f99t = '".$_POST['id99gid']."' 
 	WHERE vref = $id") or die(mysqli_error($database->dblink));
 
 header("Location: ../../../Admin/admin.php?p=village&did=".$id."");