#554 Fixes and General fixes

+Fixed a bug that could have happened in the statistics if there were 0
users in the server
+Fixed a compatibility bug with PHP 7.0

GameEngine/Admin/function.php

@@ -111,7 +111,7 @@ class funct
                 if(!isset($selectedArtifact) || !isset($artifactQuantity) || !isset($playerId) || empty($selectedArtifact) ||
                           !is_numeric($artifactQuantity) || !is_numeric($playerId) || strpos($selectedArtifact, ':') === false ||
                           $database->getUserField($playerId, "username", 0) == "[?]"){
-                    header("location: admin.php");
+                    header("location: admin.php?p=artifacts&error=0");
                     exit;          
                 }
                 
@@ -125,7 +125,7 @@ class funct
 
                 //Check if the artifact has been found or if doesn't exist
                 if(empty($chosenArtifact)){
-                    header("location: admin.php");
+                    header("location: admin.php?p=artifacts&error=1");
                     exit; 
                 }
 

GameEngine/Artifacts.php

@@ -2,16 +2,16 @@
 class Artifacts
 {
 
-    public const 
+    const 
     
     /**
-     * @var integer Default Natars' uid
+     * @var int Default Natars' uid
      */
     
     NATARS_UID = 3,
     
     /**
-     * @var integer Default Natars' tribe
+     * @var int Default Natars' tribe
      */
     
     NATARS_TRIBE = 5,
@@ -128,7 +128,7 @@ class Artifacts
         "f2" => 6, "f8" => 6, "f9" => 6, "f12" => 6, "f13" => 6, "f15" => 6],
     
     /**
-     * @var integer The base amount of Natars' spying units, used when Natars account is created
+     * @var int The base amount of Natars' spying units, used when Natars account is created
      */
      
     NATARS_BASE_SPY = 1500;
@@ -178,7 +178,7 @@ class Artifacts
     }
     
     /**
-     * Called when Natars account need to be created, creates his account and capital village
+     * Called when Natars account needs to be created, creates his account and capital village
      *
      */
     

GameEngine/Lang/en.php

@@ -1031,6 +1031,7 @@ define("YOU_CONSTRUCT","You can construct ");
 define("CRANNY_INCREASED","Cranny capacity is increased by");
 define("CRANNY_DECRESE","Cranny capacity is decrese by");
 define("WW_BUILDING_PLAN","You can build the Wonder of the World");
+define("NO_WW","There are no Wonders of the World");
 define("NO_PREVIOUS_OWNERS","There are no previous owners.");
 define("TREASURY_DESC","The riches of your empire are kept in the treasury. The treasury has room for one treasure. After you have captured an artefact it takes 24 hours on a normal server or 12 hours on a thrice speed server to be effective.");
 

GameEngine/Ranking.php

@@ -11,7 +11,7 @@
 
 		class Ranking {
 
-			public $rankarray = array();
+			public $rankarray = [];
 			private $rlastupdate;
 
 			public function getRank() {
@@ -20,14 +20,15 @@
 
 			public function getUserRank($id) {
 			    global $database;
+			    
 				$ranking = $this->getRank();
 				$users = "SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8");
 				$users2 = mysqli_fetch_array(mysqli_query($database->dblink,$users), MYSQLI_ASSOC);
 				$users2 = $users2['Total'];
-				$users3 = $users2+1;
+				$users3 = $users2 + 1;
 				$myrank = 0;
 				if(count($ranking) > 0) {
-					for($i=0;$i<($users3);$i++) {
+					for($i = 0;$i < $users3; $i++) {
 						if( isset( $ranking[$i]['userid'] ) ) {
 							if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
 								$myrank = $i;
@@ -197,31 +198,25 @@
 			}
 
 			public function searchRank($name, $field) {
-				while(1) {
-    //$key = key($this->rankarray);
-       for($key=0;$key<count($this->rankarray);$key++){
-        if($this->rankarray[$key]!="pad") {
-        if($this->rankarray[$key][$field] == $name) {
-            return $key;
-            break;
-        }
-       }
-      }
-						if(!next($this->rankarray)) {
-						if($field != "userid"){
-							return $name;
-							break;
-						}else{
-							return 0;
-							break;
-						}
-						}
-
-				}
+			    
+			    while(1) {
+			        //$key = key($this->rankarray);
+			        for($key = 0; $key < count($this->rankarray); $key++){
+			            if($this->rankarray[$key]!="pad") {
+			                if($this->rankarray[$key][$field] == $name) return $key;
+			            }
+			        }
+			        if(!next($this->rankarray)) {
+			            if($field != "userid") return $name;    
+			            else return 0;
+			        }
+			        
+			    }
 			}
 
 			public function procRankArray() {
 				global $multisort, $database;
+				
 				if($GLOBALS['db']->countUser() > 0){
 				$holder = array();
 				if(SHOW_NATARS == True){
@@ -272,12 +267,10 @@
                     ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
 				}
 
-				$datas = array();
+				$datas = [];
 
 				$result = (mysqli_query($database->dblink,$q));
-				while($row = mysqli_fetch_assoc($result)) {
-					$datas[] = $row;
-				}
+				while($row = mysqli_fetch_assoc($result)) $datas[] = $row;
 
 				if (count($datas)) {
 					foreach($datas as $result) {
@@ -292,12 +285,12 @@
 					}
 				}
 
-				$newholder = array("pad");
-				foreach($holder as $key) {
-					array_push($newholder, $key);
-				}
+				$newholder = ["pad"];
+				foreach($holder as $key) array_push($newholder, $key);
+				
 				$this->rankarray = $newholder;
-			}
+				
+			    }
 			}
 
 			public function procRankRaceArray($race) {

Templates/Ranking/alliance.tpl

@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
 <?php
     $search = 0;
 }
-else {
-$search = $_SESSION['search'];
-}
+else $search = $_SESSION['search'];
 ?>
 <table cellpadding="1" cellspacing="1" id="alliance" class="row_table_data">
 			<thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Alliance</td><td>Player</td><td>&Oslash;</td><td>Points</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
-                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >";
-                    echo $ranking[$i]['players']."</td><td class=\"av \" >".$ranking[$i]['avg']."</td><td class=\"po \">".$ranking[$i]['totalpop']."</td></tr>";
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                
+                while($_GET['rank'] > (20*$multiplier))  $multiplier++;
+
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        } 
+        else $start = ($_SESSION['start'] + 1);
+
+        if(count($rankArray) > 1) {
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+
+                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$rankArray[$i]['id']."\">".$rankArray[$i]['tag']."</a></td><td class=\"pla \" >";
+                    echo $rankArray[$i]['players']."</td><td class=\"av \" >".$rankArray[$i]['avg']."</td><td class=\"po \">".$rankArray[$i]['totalpop']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No alliance's found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/alliance_attack.tpl

@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
 <?php
     $search = 0;
 }
-else {
-$search = $_SESSION['search'];
-}
+else $search = $_SESSION['search'];
 ?>
 <table cellpadding="1" cellspacing="1" id="alliance_off" class="row_table_data">
 			<thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr>
 		</thead><tbody>
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
-                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >";
-                    echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Aap']."</td></tr>";
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                
+                while($_GET['rank'] > (20*$multiplier))  $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+        
+        if(count($rankArray) > 1) {
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                    
+                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$rankArray[$i]['id']."\">".$rankArray[$i]['tag']."</a></td><td class=\"pla \" >";
+                    echo $rankArray[$i]['players']."</td><td class=\"po \">".$rankArray[$i]['Aap']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/alliance_defend.tpl

@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
 <?php
     $search = 0;
 }
-else {
-$search = $_SESSION['search'];
-}
+else $search = $_SESSION['search'];
 ?>
 <table cellpadding="1" cellspacing="1" id="alliance_def" class="row_table_data">
 			<thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr>
 		</thead><tbody>
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
-                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >";
-                    echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Adp']."</td></tr>";
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                
+                while($_GET['rank'] > (20*$multiplier))  $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+  
+        if(count($rankArray) > 1) {
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
+            	    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                               
+                    echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$rankArray[$i]['id']."\">".$rankArray[$i]['tag']."</a></td><td class=\"pla \" >";
+                    echo $rankArray[$i]['players']."</td><td class=\"po \">".$rankArray[$i]['Adp']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/general.tpl

@@ -12,7 +12,7 @@
    $tribe1 = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE tribe = 1"), MYSQLI_ASSOC);
    $tribe2 = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE tribe = 2"), MYSQLI_ASSOC);
    $tribe3 = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE tribe = 3"), MYSQLI_ASSOC);
-   $tribes = array($tribe1['Total'], $tribe2['Total'], $tribe3['Total']);
+   $tribes = [$tribe1['Total'], $tribe2['Total'], $tribe3['Total']];
    $users = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE tribe > 0 AND tribe < 4"), MYSQLI_ASSOC);
    $users = $users['Total'];
 ?>

Templates/Ranking/heroes.tpl

@@ -26,44 +26,40 @@
 		<tr><td></td><td>Hero</td><td>Player</td><td>Level</td><td>Experience</td></tr>
 		</thead><tbody>
         <?php
-        if(isset($_GET['rank'])) {
-        	$multiplier = 1;
-        	if(is_numeric($_GET['rank'])) {
-        		if($_GET['rank'] > count($ranking->getRank())) {
-        			$_GET['rank'] = count($ranking->getRank()) - 1;
-        		}
-        		while($_GET['rank'] > (20 * $multiplier)) {
-        			$multiplier += 1;
-        		}
-        		$start = 20 * $multiplier - 19;
-        	} else {
-        		$start = ($_SESSION['start'] + 1);
-        	}
-        } else {
-        	$start = ($_SESSION['start'] + 1);
+        $rankArray = $ranking->getRank();
+        if(isset($_GET['rank'])){
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                
+                while($_GET['rank'] > (20 * $multiplier))  $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
         }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-        	for($i = $start; $i < ($start + 20); $i++) {
-        		if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") {
-        			if($i == $search) {
-        				echo "<tr class=\"hl \"><td class=\"ra  fc\" >";
-        			} else {
-        				echo "<tr><td class=\"ra \" >";
-        			}
+        else $start = ($_SESSION['start'] + 1);
+        
+        if(count($rankArray) > 1) {
+        	for($i = $start; $i < $start + 20; $i++) {
+        	    if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
+        			if($i == $search) echo "<tr class=\"hl \"><td class=\"ra  fc\" >";
+        			else echo "<tr><td class=\"ra \" >";
+
         			echo $i . ".</td>
 					<td class=\"hero \">
-					<img class=\"unit u" . $ranking[$i]['unit'] . "\" alt=\"\" title=\"\" src=\"img/x.gif\"> " . $ranking[$i]['name'] . "</td>
-					<td class=\"pla \"><center><a href=\"spieler.php?uid=" . $ranking[$i]['uid'] . "\">" . $ranking[$i]['owner'] . "</a></center></td>
-					<td class=\"lev \">" . $ranking[$i]['level'] . "</td>
-					<td class=\"xp \">" . $ranking[$i]['experience'] . "</td>
+					<img class=\"unit u" . $rankArray[$i]['unit'] . "\" alt=\"\" title=\"\" src=\"img/x.gif\"> " . $rankArray[$i]['name'] . "</td>
+					<td class=\"pla \"><center><a href=\"spieler.php?uid=" . $rankArray[$i]['uid'] . "\">" . $rankArray[$i]['owner'] . "</a></center></td>
+					<td class=\"lev \">" . $rankArray[$i]['level'] . "</td>
+					<td class=\"xp \">" . $rankArray[$i]['experience'] . "</td>
 					</tr>
 					";
         		}
         	}
-        } else {
-        	echo "<td class=\"none\" colspan=\"5\">No heros found</td>";
         }
+        else echo "<td class=\"none\" colspan=\"5\">No heros found</td>";
 
 ?>
  </tbody>

Templates/Ranking/overview.tpl

@@ -19,48 +19,43 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            } 
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+ 
+        if(count($rankArray) > 1) { 
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                                           
                     echo $i.".</td><td class=\"pla \" >";
-						if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>";
-						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a>";
-						}
-					echo"</td><td class=\"al\" >";
-                    if($ranking[$i]['aname'] != "") {
-                    echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>";
+                    if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
+                    } else {
+                        echo"<a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a>";
                     }
-                    else {
-                    echo "-";
+                    echo"</td><td class=\"al\" >";
+                    if($rankArray[$i]['aname'] != "") {
+                        echo "<a href=\"allianz.php?aid=".$rankArray[$i]['alliance']."\">".$rankArray[$i]['aname']."</a>";
                     }
-                    echo "</td><td class=\"pop\" >".$ranking[$i]['totalpop']."</td><td class=\"vil\">".$ranking[$i]['totalvillage']."</td></tr>";
+                    else echo "-";
+                    echo "</td><td class=\"pop\" >".$rankArray[$i]['totalpop']."</td><td class=\"vil\">".$rankArray[$i]['totalvillage']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/player_1.tpl

@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+		
         if(count($database->getUserByTribe(1)) > 0) {
-        	$ranking = $ranking->getRank(); 
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username'])  && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            for($i = $start; $i< $start + 20; $i++) {
+                if(isset($rankArray[$i]['username'])  && $rankArray[$i] != "pad") {
+                	if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";                   
+                    else echo "<tr><td class=\"ra \" >";
+                    
                     echo $i.".</td><td class=\"pla \" >";
-						if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>";
+                    if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
 						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a>";
+						    echo"<a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a>";
 						}
 					echo"</td><td class=\"al\" >";
-                    if($ranking[$i]['alliance'] != 0) {
-                    echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>";
+					if($rankArray[$i]['alliance'] > 0) {
+					    echo "<a href=\"allianz.php?aid=".$rankArray[$i]['alliance']."\">".$rankArray[$i]['aname']."</a>";
                     }
-                    else {
-                    echo "-";
-                    }
-                    echo "</td><td class=\"pop\" >".$ranking[$i]['totalpop']."</td><td class=\"vil\">".$ranking[$i]['totalvillage']."</td></tr>";
+                    else echo "-";
+        
+                    echo "</td><td class=\"pop\" >".$rankArray[$i]['totalpop']."</td><td class=\"vil\">".$rankArray[$i]['totalvillage']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>";       
         ?>
  </tbody>
 </table>

Templates/Ranking/player_2.tpl

@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+        
         if(count($database->getUserByTribe(2)) > 0) {
-        	$ranking = $ranking->getRank(); 
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username'])  && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            for($i = $start; $i< $start + 20; $i++) {
+                if(isset($rankArray[$i]['username'])  && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                    
                     echo $i.".</td><td class=\"pla \" >";
-						if($ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>";
-						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a>";
-						}
-					echo"</td><td class=\"al\" >";
-                    if($ranking[$i]['alliance'] != 0) {
-                    echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>";
+                    if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
+                    } else {
+                        echo"<a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a>";
                     }
-                    else {
-                    echo "-";
+                    echo"</td><td class=\"al\" >";
+                    if($rankArray[$i]['alliance'] > 0) {
+                        echo "<a href=\"allianz.php?aid=".$rankArray[$i]['alliance']."\">".$rankArray[$i]['aname']."</a>";
                     }
-                    echo "</td><td class=\"pop\" >".$ranking[$i]['totalpop']."</td><td class=\"vil\">".$ranking[$i]['totalvillage']."</td></tr>";
+                    else echo "-";
+                    
+                    echo "</td><td class=\"pop\" >".$rankArray[$i]['totalpop']."</td><td class=\"vil\">".$rankArray[$i]['totalvillage']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/player_3.tpl

@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+        
         if(count($database->getUserByTribe(3)) > 0) {
-        	$ranking = $ranking->getRank(); 
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username'])  && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            for($i = $start; $i< $start + 20; $i++) {
+                if(isset($rankArray[$i]['username'])  && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                    
                     echo $i.".</td><td class=\"pla \" >";
-						if($ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>";
-						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a>";
-						}
-					echo"</td><td class=\"al\" >";
-                    if($ranking[$i]['alliance'] != 0) {
-                    echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>";
+                    if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
+                    } else {
+                        echo"<a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a>";
                     }
-                    else {
-                    echo "-";
+                    echo"</td><td class=\"al\" >";
+                    if($rankArray[$i]['alliance'] > 0) {
+                        echo "<a href=\"allianz.php?aid=".$rankArray[$i]['alliance']."\">".$rankArray[$i]['aname']."</a>";
                     }
-                    echo "</td><td class=\"pop\" >".$ranking[$i]['totalpop']."</td><td class=\"vil\">".$ranking[$i]['totalvillage']."</td></tr>";
+                    else echo "-";
+                    
+                    echo "</td><td class=\"pop\" >".$rankArray[$i]['totalpop']."</td><td class=\"vil\">".$rankArray[$i]['totalvillage']."</td></tr>";
                 }
             }
         }
-        else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
         ?>
  </tbody>
 </table>

Templates/Ranking/player_attack.tpl

@@ -19,43 +19,42 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") {
-                	if($i == $search){
-					echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+        
+        if(count($rankArray) > 1) {
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
+                	if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";                   
+                    else echo "<tr><td class=\"ra \" >";
+                    
                     echo $i.".</td><td class=\"pla \" >";
-						if($ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a></u>";
-						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a>";
-						}	
-					echo"</td><td class=\"pop \" >".$ranking[$i]['totalpop']."";
-                    echo "</td><td class=\"vil\">".$ranking[$i]['totalvillages']."</td><td class=\"po \" >".$ranking[$i]['apall']."</td></tr>";
+                    if($rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a></u>";
+				    } else {
+				        echo"<a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a>";
+					}	
+					echo"</td><td class=\"pop \" >".$rankArray[$i]['totalpop']."";
+					echo "</td><td class=\"vil\">".$rankArray[$i]['totalvillages']."</td><td class=\"po \" >".$rankArray[$i]['apall']."</td></tr>";
                 }
             }
         }
-         else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>";      
         ?>
-        <?php
+</tbody>
+</table>
+<?php 
 include("ranksearch.tpl");
 ?>

Templates/Ranking/player_defend.tpl

@@ -19,42 +19,39 @@ $search = $_SESSION['search'];
 		<tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr>
 		</thead><tbody>  
         <?php
+        $rankArray = $ranking->getRank();
         if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            	if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") {
-					if($i == $search){
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
+            $multiplier = 1;
+            if(is_numeric($_GET['rank'])) {
+                if($_GET['rank'] > count($rankArray)) {
+                    $_GET['rank'] = count($rankArray) - 1;
+                }
+                while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
+                
+                $start = 20 * $multiplier - 19;
+            }
+            else $start = ($_SESSION['start'] + 1);
+        }
+        else $start = ($_SESSION['start'] + 1);
+        
+        if(count($rankArray) > 1) {
+            for($i = $start; $i < $start + 20; $i++) {
+                if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
+                    if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                    else echo "<tr><td class=\"ra \" >";
+                    
                     echo $i.".</td><td class=\"pla \" >";
-						if($ranking[$i]['access'] > 2){
-						echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a></u>";
-						} else {
-						echo"<a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a>";
-						}
-					echo"</td><td class=\"pop \" >".$ranking[$i]['totalpop'];
-                    echo "</td><td class=\"vil\">".$ranking[$i]['totalvillages']."</td><td class=\"po \" >".$ranking[$i]['dpall']."</td></tr>";
+                    if($rankArray[$i]['access'] > 2){
+                        echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a></u>";
+                    } else {
+                        echo"<a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a>";
+                    }
+                    echo"</td><td class=\"pop \" >".$rankArray[$i]['totalpop']."";
+                    echo "</td><td class=\"vil\">".$rankArray[$i]['totalvillages']."</td><td class=\"po \" >".$rankArray[$i]['dpall']."</td></tr>";
                 }
             }
         }
-         else {
-        	echo "<td class=\"none\" colspan=\"5\">No users found</td>";
-        }
+        else echo "<td class=\"none\" colspan=\"5\">No users found</td>"; 
         ?>
  </tbody>
 </table>

Templates/Ranking/ranksearch.tpl

@@ -15,16 +15,13 @@ if(!isset($_GET['id'])){ $_GET['id']='1'; }
 							</form>
 							<div class="navi">
 <?php
-if($start != 1 && $start+20 < count($ranking)) {
-echo "<a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start-20)."\">&laquo; back</a> | <a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start+20)."\">forward &raquo;</a>";
+if(count($rankArray) < 22){
+    echo "&laquo; back | forward &raquo;";
+}else if($start != 1 && $start + 20 < count($rankArray)) {
+    echo "<a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start - 20)."\">&laquo; back</a> | <a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start + 20)."\">forward &raquo;</a>";
+}else if($start == 1 && $start + 20 < count($rankArray)) {
+    echo "&laquo; back | <a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start + 20)."\">forward &raquo;</a>";
+}else if($start != 1 && $start - 20 < count($rankArray)) {
+    echo "<a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start - 20)."\">&laquo; back</a> | forward &raquo;";
 }
-else if($start == 1 && $start+20 < count($ranking)) {
-    	echo "&laquo; back | <a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start+20)."\">forward &raquo;</a>";
-    }
-    else if($start != 1 && $start-20 < count($ranking)) {
-    	echo "<a href=\"statistiken.php?id=".$_GET['id']."&amp;rank=".($start-20)."\">&laquo; back</a> | forward &raquo;";
-    }
-    else {
-    	echo "&laquo; back | forward &raquo;";
-    }
-    ?>
+?>

Templates/Ranking/villages.tpl

@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
 <?php
     $search = 0;
 }
-else {
-	$search = $_SESSION['search'];
-}
+else $search = $_SESSION['search'];
 ?>
 <table cellpadding="1" cellspacing="1" id="villages" class="row_table_data">
 			<thead>
@@ -19,38 +17,35 @@ else {
 		<tr><td></td><td>Village</td><td>Player</td><td>Inhabitants</td><td>Coordinates</td></tr>
 		</thead><tbody>  
          <?php
-        if(isset($_GET['rank'])){
-		$multiplier = 1;
-			if(is_numeric($_GET['rank'])) {
-				if($_GET['rank'] > count($ranking->getRank())) {
-				$_GET['rank'] = count($ranking->getRank())-1;
-				}
-				while($_GET['rank'] > (20*$multiplier)) {
-					$multiplier +=1;
-				}
-			$start = 20*$multiplier-19;
-			} else { $start = ($_SESSION['start']+1); }
-		} else { $start = ($_SESSION['start']+1); }
-        if(count($ranking->getRank()) > 0) {
-        	$ranking = $ranking->getRank();
-            for($i=$start;$i<($start+20);$i++) {
-            if(isset($ranking[$i]['wref']) && $ranking[$i] != "pad") {
-                	if($i == $search) {
-                    echo "<tr class=\"hl\"><td class=\"ra fc\" >";
-                    }
-                    else {
-                    echo "<tr><td class=\"ra \" >";
-                    }
-                    echo $i.".</td><td class=\"vil \" ><a href=\"karte.php?d=".$ranking[$i]['wref']."&amp;c=".$generator->getMapCheck($ranking[$i]['wref'])."\">".$ranking[$i]['name']."</a></td>";
-                    echo "<td class=\"pla \" ><a href=\"spieler.php?uid=".$ranking[$i]['owner']."\">".$ranking[$i]['user']."</a></td>";
-                    echo "<td class=\"hab\">".$ranking[$i]['pop']."</td><td class=\"aligned_coords \" ><div class=\"cox\">(".$ranking[$i]['x']."</div><div class=\"pi\">|</div><div class=\"coy\">".$ranking[$i]['y'].")</div></td></tr>";
-                }
-            }
-        }
-         else {
-        	echo "<td class=\"none\" colspan=\"5\">No villages found</td>";
-        }
-            ?>
-            <?php
+         $rankArray = $ranking->getRank();
+         if(isset($_GET['rank'])){
+             $multiplier = 1;
+             if(is_numeric($_GET['rank'])) {
+                 if($_GET['rank'] > count($rankArray)) {
+                     $_GET['rank'] = count($rankArray) - 1;
+                 }
+                 
+                 while($_GET['rank'] > (20*$multiplier)) $multiplier++;
+                 
+                 $start = 20 * $multiplier - 19;
+             } 
+             else $start = ($_SESSION['start'] + 1);
+         } 
+         else $start = ($_SESSION['start'] + 1);         
+         
+         if(count($rankArray) > 1) {
+             for($i = $start; $i < $start + 20; $i++) {
+                 if(isset($rankArray[$i]['wref']) && $rankArray[$i] != "pad") {
+                     if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
+                     else echo "<tr><td class=\"ra \" >";
+                     
+                     echo $i.".</td><td class=\"vil \" ><a href=\"karte.php?d=".$rankArray[$i]['wref']."&amp;c=".$generator->getMapCheck($rankArray[$i]['wref'])."\">".$rankArray[$i]['name']."</a></td>";
+                     echo "<td class=\"pla \" ><a href=\"spieler.php?uid=".$rankArray[$i]['owner']."\">".$rankArray[$i]['user']."</a></td>";
+                     echo "<td class=\"hab\">".$rankArray[$i]['pop']."</td><td class=\"aligned_coords \" ><div class=\"cox\">(".$rankArray[$i]['x']."</div><div class=\"pi\">|</div><div class=\"coy\">".$rankArray[$i]['y'].")</div></td></tr>";
+                 }
+             }
+         }
+         else echo "<td class=\"none\" colspan=\"5\">No villages found</td>";
 include("ranksearch.tpl");
-?>
+?>
+</tbody></table>

Templates/Ranking/ww.tpl

@@ -14,16 +14,16 @@ if (WW == True)
         </tr> 
         <tr> 
             <td></td> 
-            <td>Player</td> 
-            <td>Name</td> 
-            <td>Alliance</td> 
-            <td>Level</td> 
+            <td><?php echo PLAYER; ?></td> 
+            <td><?php echo NAME; ?></td> 
+            <td><?php echo ALLIANCE; ?></td> 
+            <td><?php echo LEVEL; ?></td> 
             <td></td> 
         </tr> 
     </thead> 
     <tbody>  
         <?php 
-        $cont = 1; 
+        $count = 0; 
         while ($row = mysqli_fetch_array($result)) 
         { 
             $ally = $database->getAlliance($row['alliance']); 
@@ -31,7 +31,7 @@ if (WW == True)
             $row2 = @mysqli_fetch_assoc($query); 
         ?> 
         <tr> 
-              <td><?php echo $cont; $cont++; ?>.</td> 
+              <td><?php echo $count++; ?>.</td> 
             <td><?php echo "<a href=\"karte.php?d=" . $row['vref'] . "&amp;c=" . $generator->getMapCheck($row['vref']) . "\">"; ?><?php echo $row['username']; ?></a></td> 
               <td><?php echo $row['wwname']; ?></td> 
             <td><a href="allianz.php?aid=<?php echo $ally['id']; ?>"><?php echo $ally['tag']; ?></a></td> 
@@ -44,10 +44,18 @@ if (WW == True)
            </tr> 
         <?php 
         } 
-} 
-else 
-{ 
-    header("Location: statistiken.php");
-	exit; 
-} 
-?>
+        
+            if($count == 0){        
+        ?>
+        <tr>
+        <td class="none" colspan="7"><?php echo NO_WW; ?></td>
+        </tr>    
+		<?php
+            }
+        }
+        else
+        {
+            header("Location: statistiken.php");
+            exit;
+        } 
+        ?>