xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-23 02:17:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

#554 Fixes and General fixes

Browse Source 
+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
This commit is contained in:
iopietro
2018-07-24 18:19:44 +02:00
parent 81dcd16e3d
commit ee0b4984c2
18 changed files with 375 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Admin/function.php
+2 -2
View File
@@ -111,7 +111,7 @@ class funct
if(!isset($selectedArtifact) || !isset($artifactQuantity) || !isset($playerId) || empty($selectedArtifact) || if(!isset($selectedArtifact) || !isset($artifactQuantity) || !isset($playerId) || empty($selectedArtifact) ||
!is_numeric($artifactQuantity) || !is_numeric($playerId) || strpos($selectedArtifact, ':') === false || !is_numeric($artifactQuantity) || !is_numeric($playerId) || strpos($selectedArtifact, ':') === false ||
$database->getUserField($playerId, "username", 0) == "[?]"){ $database->getUserField($playerId, "username", 0) == "[?]"){
header("location: admin.php"); header("location: admin.php?p=artifacts&error=0");
exit; exit;
} }
@@ -125,7 +125,7 @@ class funct
//Check if the artifact has been found or if doesn't exist //Check if the artifact has been found or if doesn't exist
if(empty($chosenArtifact)){ if(empty($chosenArtifact)){
header("location: admin.php"); header("location: admin.php?p=artifacts&error=1");
exit; exit;
} }
GameEngine/Artifacts.php
+5 -5
View File
@@ -2,16 +2,16 @@
class Artifacts class Artifacts
{ {
public const const
/** /**
* @var integer Default Natars' uid * @var int Default Natars' uid
*/ */
NATARS_UID = 3, NATARS_UID = 3,
/** /**
* @var integer Default Natars' tribe * @var int Default Natars' tribe
*/ */
NATARS_TRIBE = 5, NATARS_TRIBE = 5,
@@ -128,7 +128,7 @@ class Artifacts
"f2" => 6, "f8" => 6, "f9" => 6, "f12" => 6, "f13" => 6, "f15" => 6], "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; 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
+1
View File
@@ -1031,6 +1031,7 @@ define("YOU_CONSTRUCT","You can construct ");
define("CRANNY_INCREASED","Cranny capacity is increased by"); define("CRANNY_INCREASED","Cranny capacity is increased by");
define("CRANNY_DECRESE","Cranny capacity is decrese by"); define("CRANNY_DECRESE","Cranny capacity is decrese by");
define("WW_BUILDING_PLAN","You can build the Wonder of the World"); 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("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."); 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
+25 -32
View File
@@ -11,7 +11,7 @@
class Ranking { class Ranking {
public $rankarray = array(); public $rankarray = [];
private $rlastupdate; private $rlastupdate;
public function getRank() { public function getRank() {
@@ -20,14 +20,15 @@
public function getUserRank($id) { public function getUserRank($id) {
global $database; global $database;
$ranking = $this->getRank(); $ranking = $this->getRank();
$users = "SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8"); $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 = mysqli_fetch_array(mysqli_query($database->dblink,$users), MYSQLI_ASSOC);
$users2 = $users2['Total']; $users2 = $users2['Total'];
$users3 = $users2+1; $users3 = $users2 + 1;
$myrank = 0; $myrank = 0;
if(count($ranking) > 0) { if(count($ranking) > 0) {
for($i=0;$i<($users3);$i++) { for($i = 0;$i < $users3; $i++) {
if( isset( $ranking[$i]['userid'] ) ) { if( isset( $ranking[$i]['userid'] ) ) {
if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") { if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
$myrank = $i; $myrank = $i;
@@ -197,31 +198,25 @@
} }
public function searchRank($name, $field) { 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() { public function procRankArray() {
global $multisort, $database; global $multisort, $database;
if($GLOBALS['db']->countUser() > 0){ if($GLOBALS['db']->countUser() > 0){
$holder = array(); $holder = array();
if(SHOW_NATARS == True){ if(SHOW_NATARS == True){
@@ -272,12 +267,10 @@
ORDER BY totalpop DESC, totalvillages DESC, userid DESC"; ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
} }
$datas = array(); $datas = [];
$result = (mysqli_query($database->dblink,$q)); $result = (mysqli_query($database->dblink,$q));
while($row = mysqli_fetch_assoc($result)) { while($row = mysqli_fetch_assoc($result)) $datas[] = $row;
$datas[] = $row;
}
if (count($datas)) { if (count($datas)) {
foreach($datas as $result) { foreach($datas as $result) {
@@ -292,12 +285,12 @@
} }
} }
$newholder = array("pad"); $newholder = ["pad"];
foreach($holder as $key) { foreach($holder as $key) array_push($newholder, $key);
array_push($newholder, $key);
}
$this->rankarray = $newholder; $this->rankarray = $newholder;
}
}
} }
public function procRankRaceArray($race) { public function procRankRaceArray($race) {
Templates/Ranking/alliance.tpl
+25 -29
View File
@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
<?php <?php
$search = 0; $search = 0;
} }
else { else $search = $_SESSION['search'];
$search = $_SESSION['search'];
}
?> ?>
<table cellpadding="1" cellspacing="1" id="alliance" class="row_table_data"> <table cellpadding="1" cellspacing="1" id="alliance" class="row_table_data">
<thead> <thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
<tr><td></td><td>Alliance</td><td>Player</td><td>&Oslash;</td><td>Points</td></tr> <tr><td></td><td>Alliance</td><td>Player</td><td>&Oslash;</td><td>Points</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) {
$multiplier +=1; while($_GET['rank'] > (20*$multiplier)) $multiplier++;
}
$start = 20*$multiplier-19; $start = 20 * $multiplier - 19;
} else { $start = ($_SESSION['start']+1); } }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
if(count($ranking->getRank()) > 0) { }
$ranking = $ranking->getRank(); else $start = ($_SESSION['start'] + 1);
for($i=$start;$i<($start+20);$i++) {
if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") { if(count($rankArray) > 1) {
if($i == $search) { for($i = $start; $i < $start + 20; $i++) {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
} if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
else { else echo "<tr><td class=\"ra \" >";
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 $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$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>";
echo $ranking[$i]['players']."</td><td class=\"av \" >".$ranking[$i]['avg']."</td><td class=\"po \">".$ranking[$i]['totalpop']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
echo "<td class=\"none\" colspan=\"5\">No alliance's found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/alliance_attack.tpl
+25 -29
View File
@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
<?php <?php
$search = 0; $search = 0;
} }
else { else $search = $_SESSION['search'];
$search = $_SESSION['search'];
}
?> ?>
<table cellpadding="1" cellspacing="1" id="alliance_off" class="row_table_data"> <table cellpadding="1" cellspacing="1" id="alliance_off" class="row_table_data">
<thead> <thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
<tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr> <tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) {
$multiplier +=1; while($_GET['rank'] > (20*$multiplier)) $multiplier++;
}
$start = 20*$multiplier-19; $start = 20 * $multiplier - 19;
} else { $start = ($_SESSION['start']+1); } }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
if(count($ranking->getRank()) > 0) { }
$ranking = $ranking->getRank(); else $start = ($_SESSION['start'] + 1);
for($i=$start;$i<($start+20);$i++) {
if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") { if(count($rankArray) > 1) {
if($i == $search) { for($i = $start; $i < $start + 20; $i++) {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
} if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
else { else echo "<tr><td class=\"ra \" >";
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 $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >"; echo $rankArray[$i]['players']."</td><td class=\"po \">".$rankArray[$i]['Aap']."</td></tr>";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Aap']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/alliance_defend.tpl
+25 -29
View File
@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
<?php <?php
$search = 0; $search = 0;
} }
else { else $search = $_SESSION['search'];
$search = $_SESSION['search'];
}
?> ?>
<table cellpadding="1" cellspacing="1" id="alliance_def" class="row_table_data"> <table cellpadding="1" cellspacing="1" id="alliance_def" class="row_table_data">
<thead> <thead>
@@ -19,36 +17,34 @@ $search = $_SESSION['search'];
<tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr> <tr><td></td><td>Alliance</td><td>Player</td><td>Points</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) {
$multiplier +=1; while($_GET['rank'] > (20*$multiplier)) $multiplier++;
}
$start = 20*$multiplier-19; $start = 20 * $multiplier - 19;
} else { $start = ($_SESSION['start']+1); } }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
if(count($ranking->getRank()) > 0) { }
$ranking = $ranking->getRank(); else $start = ($_SESSION['start'] + 1);
for($i=$start;$i<($start+20);$i++) {
if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") { if(count($rankArray) > 1) {
if($i == $search) { for($i = $start; $i < $start + 20; $i++) {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
} if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
else { else echo "<tr><td class=\"ra \" >";
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 $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >"; echo $rankArray[$i]['players']."</td><td class=\"po \">".$rankArray[$i]['Adp']."</td></tr>";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Adp']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No alliances found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/general.tpl
+1 -1
View File
@@ -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); $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); $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); $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 = 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']; $users = $users['Total'];
?> ?>
Templates/Ranking/heroes.tpl
+26 -30
View File
@@ -26,44 +26,40 @@
<tr><td></td><td>Hero</td><td>Player</td><td>Level</td><td>Experience</td></tr> <tr><td></td><td>Hero</td><td>Player</td><td>Level</td><td>Experience</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
if(isset($_GET['rank'])) { $rankArray = $ranking->getRank();
$multiplier = 1; if(isset($_GET['rank'])){
if(is_numeric($_GET['rank'])) { $multiplier = 1;
if($_GET['rank'] > count($ranking->getRank())) { if(is_numeric($_GET['rank'])) {
$_GET['rank'] = count($ranking->getRank()) - 1; if($_GET['rank'] > count($rankArray)) {
} $_GET['rank'] = count($rankArray) - 1;
while($_GET['rank'] > (20 * $multiplier)) { }
$multiplier += 1;
} while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$start = 20 * $multiplier - 19;
} else { $start = 20 * $multiplier - 19;
$start = ($_SESSION['start'] + 1); }
} else $start = ($_SESSION['start'] + 1);
} else {
$start = ($_SESSION['start'] + 1);
} }
if(count($ranking->getRank()) > 0) { else $start = ($_SESSION['start'] + 1);
$ranking = $ranking->getRank();
for($i = $start; $i < ($start + 20); $i++) { if(count($rankArray) > 1) {
if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") { for($i = $start; $i < $start + 20; $i++) {
if($i == $search) { if(isset($rankArray[$i]['name']) && $rankArray[$i] != "pad") {
echo "<tr class=\"hl \"><td class=\"ra fc\" >"; if($i == $search) echo "<tr class=\"hl \"><td class=\"ra fc\" >";
} else { else echo "<tr><td class=\"ra \" >";
echo "<tr><td class=\"ra \" >";
}
echo $i . ".</td> echo $i . ".</td>
<td class=\"hero \"> <td class=\"hero \">
<img class=\"unit u" . $ranking[$i]['unit'] . "\" alt=\"\" title=\"\" src=\"img/x.gif\"> " . $ranking[$i]['name'] . "</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=" . $ranking[$i]['uid'] . "\">" . $ranking[$i]['owner'] . "</a></center></td> <td class=\"pla \"><center><a href=\"spieler.php?uid=" . $rankArray[$i]['uid'] . "\">" . $rankArray[$i]['owner'] . "</a></center></td>
<td class=\"lev \">" . $ranking[$i]['level'] . "</td> <td class=\"lev \">" . $rankArray[$i]['level'] . "</td>
<td class=\"xp \">" . $ranking[$i]['experience'] . "</td> <td class=\"xp \">" . $rankArray[$i]['experience'] . "</td>
</tr> </tr>
"; ";
} }
} }
} else {
echo "<td class=\"none\" colspan=\"5\">No heros found</td>";
} }
else echo "<td class=\"none\" colspan=\"5\">No heros found</td>";
?> ?>
</tbody> </tbody>
Templates/Ranking/overview.tpl
+30 -35
View File
@@ -19,48 +19,43 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr> <tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
if(count($ranking->getRank()) > 0) { else $start = ($_SESSION['start'] + 1);
$ranking = $ranking->getRank();
for($i=$start;$i<($start+20);$i++) { if(count($rankArray) > 1) {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { for($i = $start; $i < $start + 20; $i++) {
if($i == $search) { if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
} else echo "<tr><td class=\"ra \" >";
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){ if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
} else { } 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]['aname'] != "") {
echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>";
} }
else { echo"</td><td class=\"al\" >";
echo "-"; 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 { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/player_1.tpl
+28 -32
View File
@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr> <tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
else $start = ($_SESSION['start'] + 1);
if(count($database->getUserByTribe(1)) > 0) { if(count($database->getUserByTribe(1)) > 0) {
$ranking = $ranking->getRank(); for($i = $start; $i< $start + 20; $i++) {
for($i=$start;$i<($start+20);$i++) { if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
if($i == $search) { else echo "<tr><td class=\"ra \" >";
echo "<tr class=\"hl\"><td class=\"ra fc\" >";
}
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){ if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
} else { } 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\" >"; echo"</td><td class=\"al\" >";
if($ranking[$i]['alliance'] != 0) { if($rankArray[$i]['alliance'] > 0) {
echo "<a href=\"allianz.php?aid=".$ranking[$i]['alliance']."\">".$ranking[$i]['aname']."</a>"; echo "<a href=\"allianz.php?aid=".$rankArray[$i]['alliance']."\">".$rankArray[$i]['aname']."</a>";
} }
else { else echo "-";
echo "-";
} echo "</td><td class=\"pop\" >".$rankArray[$i]['totalpop']."</td><td class=\"vil\">".$rankArray[$i]['totalvillage']."</td></tr>";
echo "</td><td class=\"pop\" >".$ranking[$i]['totalpop']."</td><td class=\"vil\">".$ranking[$i]['totalvillage']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/player_2.tpl
+30 -34
View File
@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr> <tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
else $start = ($_SESSION['start'] + 1);
if(count($database->getUserByTribe(2)) > 0) { if(count($database->getUserByTribe(2)) > 0) {
$ranking = $ranking->getRank(); for($i = $start; $i< $start + 20; $i++) {
for($i=$start;$i<($start+20);$i++) { if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
if($i == $search) { else echo "<tr><td class=\"ra \" >";
echo "<tr class=\"hl\"><td class=\"ra fc\" >";
}
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if($ranking[$i]['access'] > 2){ if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
} else { } 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>";
} }
else { echo"</td><td class=\"al\" >";
echo "-"; 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 { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/player_3.tpl
+30 -34
View File
@@ -19,48 +19,44 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr> <tr><td></td><td>Player</td><td>Alliance</td><td>Population</td><td>Villages</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
else $start = ($_SESSION['start'] + 1);
if(count($database->getUserByTribe(3)) > 0) { if(count($database->getUserByTribe(3)) > 0) {
$ranking = $ranking->getRank(); for($i = $start; $i< $start + 20; $i++) {
for($i=$start;$i<($start+20);$i++) { if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
if($i == $search) { else echo "<tr><td class=\"ra \" >";
echo "<tr class=\"hl\"><td class=\"ra fc\" >";
}
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if($ranking[$i]['access'] > 2){ if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['userid']."\">".$rankArray[$i]['username']."</a></u>";
} else { } 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>";
} }
else { echo"</td><td class=\"al\" >";
echo "-"; 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 { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/player_attack.tpl
+31 -32
View File
@@ -19,43 +19,42 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr> <tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
if(count($ranking->getRank()) > 0) { else $start = ($_SESSION['start'] + 1);
$ranking = $ranking->getRank();
for($i=$start;$i<($start+20);$i++) { if(count($rankArray) > 1) {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { for($i = $start; $i < $start + 20; $i++) {
if($i == $search){ if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
} else echo "<tr><td class=\"ra \" >";
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if($ranking[$i]['access'] > 2){ if($rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a></u>";
} else { } else {
echo"<a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a>"; echo"<a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a>";
} }
echo"</td><td class=\"pop \" >".$ranking[$i]['totalpop'].""; echo"</td><td class=\"pop \" >".$rankArray[$i]['totalpop']."";
echo "</td><td class=\"vil\">".$ranking[$i]['totalvillages']."</td><td class=\"po \" >".$ranking[$i]['apall']."</td></tr>"; echo "</td><td class=\"vil\">".$rankArray[$i]['totalvillages']."</td><td class=\"po \" >".$rankArray[$i]['apall']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
<?php </tbody>
</table>
<?php
include("ranksearch.tpl"); include("ranksearch.tpl");
?> ?>
Templates/Ranking/player_defend.tpl
+28 -31
View File
@@ -19,42 +19,39 @@ $search = $_SESSION['search'];
<tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr> <tr><td></td><td>Player</td><td>Population</td><td>Villages</td><td>Points</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
$rankArray = $ranking->getRank();
if(isset($_GET['rank'])){ if(isset($_GET['rank'])){
$multiplier = 1; $multiplier = 1;
if(is_numeric($_GET['rank'])) { if(is_numeric($_GET['rank'])) {
if($_GET['rank'] > count($ranking->getRank())) { if($_GET['rank'] > count($rankArray)) {
$_GET['rank'] = count($ranking->getRank())-1; $_GET['rank'] = count($rankArray) - 1;
} }
while($_GET['rank'] > (20*$multiplier)) { while($_GET['rank'] > (20 * $multiplier)) $multiplier++;
$multiplier +=1;
} $start = 20 * $multiplier - 19;
$start = 20*$multiplier-19; }
} else { $start = ($_SESSION['start']+1); } else $start = ($_SESSION['start'] + 1);
} else { $start = ($_SESSION['start']+1); } }
if(count($ranking->getRank()) > 0) { else $start = ($_SESSION['start'] + 1);
$ranking = $ranking->getRank();
for($i=$start;$i<($start+20);$i++) { if(count($rankArray) > 1) {
if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { for($i = $start; $i < $start + 20; $i++) {
if($i == $search){ if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
} else echo "<tr><td class=\"ra \" >";
else {
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >"; echo $i.".</td><td class=\"pla \" >";
if($ranking[$i]['access'] > 2){ if($rankArray[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a></u>"; echo"<u><a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a></u>";
} else { } else {
echo"<a href=\"spieler.php?uid=".$ranking[$i]['id']."\">".$ranking[$i]['username']."</a>"; echo"<a href=\"spieler.php?uid=".$rankArray[$i]['id']."\">".$rankArray[$i]['username']."</a>";
} }
echo"</td><td class=\"pop \" >".$ranking[$i]['totalpop']; echo"</td><td class=\"pop \" >".$rankArray[$i]['totalpop']."";
echo "</td><td class=\"vil\">".$ranking[$i]['totalvillages']."</td><td class=\"po \" >".$ranking[$i]['dpall']."</td></tr>"; echo "</td><td class=\"vil\">".$rankArray[$i]['totalvillages']."</td><td class=\"po \" >".$rankArray[$i]['dpall']."</td></tr>";
} }
} }
} }
else { else echo "<td class=\"none\" colspan=\"5\">No users found</td>";
echo "<td class=\"none\" colspan=\"5\">No users found</td>";
}
?> ?>
</tbody> </tbody>
</table> </table>
Templates/Ranking/ranksearch.tpl
+9 -12
View File
@@ -15,16 +15,13 @@ if(!isset($_GET['id'])){ $_GET['id']='1'; }
</form> </form>
<div class="navi"> <div class="navi">
<?php <?php
if($start != 1 && $start+20 < count($ranking)) { if(count($rankArray) < 22){
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>"; 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
+31 -36
View File
@@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) {
<?php <?php
$search = 0; $search = 0;
} }
else { else $search = $_SESSION['search'];
$search = $_SESSION['search'];
}
?> ?>
<table cellpadding="1" cellspacing="1" id="villages" class="row_table_data"> <table cellpadding="1" cellspacing="1" id="villages" class="row_table_data">
<thead> <thead>
@@ -19,38 +17,35 @@ else {
<tr><td></td><td>Village</td><td>Player</td><td>Inhabitants</td><td>Coordinates</td></tr> <tr><td></td><td>Village</td><td>Player</td><td>Inhabitants</td><td>Coordinates</td></tr>
</thead><tbody> </thead><tbody>
<?php <?php
if(isset($_GET['rank'])){ $rankArray = $ranking->getRank();
$multiplier = 1; if(isset($_GET['rank'])){
if(is_numeric($_GET['rank'])) { $multiplier = 1;
if($_GET['rank'] > count($ranking->getRank())) { if(is_numeric($_GET['rank'])) {
$_GET['rank'] = count($ranking->getRank())-1; if($_GET['rank'] > count($rankArray)) {
} $_GET['rank'] = count($rankArray) - 1;
while($_GET['rank'] > (20*$multiplier)) { }
$multiplier +=1;
} while($_GET['rank'] > (20*$multiplier)) $multiplier++;
$start = 20*$multiplier-19;
} else { $start = ($_SESSION['start']+1); } $start = 20 * $multiplier - 19;
} else { $start = ($_SESSION['start']+1); } }
if(count($ranking->getRank()) > 0) { else $start = ($_SESSION['start'] + 1);
$ranking = $ranking->getRank(); }
for($i=$start;$i<($start+20);$i++) { else $start = ($_SESSION['start'] + 1);
if(isset($ranking[$i]['wref']) && $ranking[$i] != "pad") {
if($i == $search) { if(count($rankArray) > 1) {
echo "<tr class=\"hl\"><td class=\"ra fc\" >"; for($i = $start; $i < $start + 20; $i++) {
} if(isset($rankArray[$i]['wref']) && $rankArray[$i] != "pad") {
else { if($i == $search) echo "<tr class=\"hl\"><td class=\"ra fc\" >";
echo "<tr><td class=\"ra \" >"; 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 $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=".$ranking[$i]['owner']."\">".$ranking[$i]['user']."</a></td>"; echo "<td class=\"pla \" ><a href=\"spieler.php?uid=".$rankArray[$i]['owner']."\">".$rankArray[$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>"; 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 { else echo "<td class=\"none\" colspan=\"5\">No villages found</td>";
echo "<td class=\"none\" colspan=\"5\">No villages found</td>";
}
?>
<?php
include("ranksearch.tpl"); include("ranksearch.tpl");
?> ?>
</tbody></table>
Templates/Ranking/ww.tpl
+21 -13
View File
@@ -14,16 +14,16 @@ if (WW == True)
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td>Player</td> <td><?php echo PLAYER; ?></td>
<td>Name</td> <td><?php echo NAME; ?></td>
<td>Alliance</td> <td><?php echo ALLIANCE; ?></td>
<td>Level</td> <td><?php echo LEVEL; ?></td>
<td></td> <td></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
$cont = 1; $count = 0;
while ($row = mysqli_fetch_array($result)) while ($row = mysqli_fetch_array($result))
{ {
$ally = $database->getAlliance($row['alliance']); $ally = $database->getAlliance($row['alliance']);
@@ -31,7 +31,7 @@ if (WW == True)
$row2 = @mysqli_fetch_assoc($query); $row2 = @mysqli_fetch_assoc($query);
?> ?>
<tr> <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 "<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><?php echo $row['wwname']; ?></td>
<td><a href="allianz.php?aid=<?php echo $ally['id']; ?>"><?php echo $ally['tag']; ?></a></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> </tr>
<?php <?php
} }
}
else if($count == 0){
{ ?>
header("Location: statistiken.php"); <tr>
exit; <td class="none" colspan="7"><?php echo NO_WW; ?></td>
} </tr>
?> <?php
}
}
else
{
header("Location: statistiken.php");
exit;
}
?>