diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php index 7137a5c5..bcc24afe 100755 --- a/GameEngine/Admin/function.php +++ b/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; } diff --git a/GameEngine/Artifacts.php b/GameEngine/Artifacts.php index d078a4cf..a4415ffa 100644 --- a/GameEngine/Artifacts.php +++ b/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 * */ diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 9c58b1c6..b162a603 100755 --- a/GameEngine/Lang/en.php +++ b/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."); diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index 761f8bc6..c5727e86 100755 --- a/GameEngine/Ranking.php +++ b/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;$keyrankarray);$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) { diff --git a/Templates/Ranking/alliance.tpl b/Templates/Ranking/alliance.tpl index f48e3bcd..610f81e6 100644 --- a/Templates/Ranking/alliance.tpl +++ b/Templates/Ranking/alliance.tpl @@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) { @@ -19,36 +17,34 @@ $search = $_SESSION['search']; 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 ""; + $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 ""; } } } - else { - echo ""; - } + else echo ""; ?>
AlliancePlayerØPoints
"; - } - else { - echo "
"; - } - echo $i.".".$ranking[$i]['tag'].""; - echo $ranking[$i]['players']."".$ranking[$i]['avg']."".$ranking[$i]['totalpop']."
"; + else echo "
"; + + echo $i.".".$rankArray[$i]['tag'].""; + echo $rankArray[$i]['players']."".$rankArray[$i]['avg']."".$rankArray[$i]['totalpop']."
No alliance's foundNo alliances found
diff --git a/Templates/Ranking/alliance_attack.tpl b/Templates/Ranking/alliance_attack.tpl index f029cadf..f99f46b8 100644 --- a/Templates/Ranking/alliance_attack.tpl +++ b/Templates/Ranking/alliance_attack.tpl @@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) { @@ -19,36 +17,34 @@ $search = $_SESSION['search']; 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 ""; + $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 ""; } } } - else { - echo ""; - } + else echo ""; ?>
AlliancePlayerPoints
"; - } - else { - echo "
"; - } - echo $i.".".$ranking[$i]['tag'].""; - echo $ranking[$i]['players']."".$ranking[$i]['Aap']."
"; + else echo "
"; + + echo $i.".".$rankArray[$i]['tag'].""; + echo $rankArray[$i]['players']."".$rankArray[$i]['Aap']."
No users foundNo alliances found
diff --git a/Templates/Ranking/alliance_defend.tpl b/Templates/Ranking/alliance_defend.tpl index 4972b113..c198b215 100644 --- a/Templates/Ranking/alliance_defend.tpl +++ b/Templates/Ranking/alliance_defend.tpl @@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) { @@ -19,36 +17,34 @@ $search = $_SESSION['search']; 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 ""; + $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 ""; } } } - else { - echo ""; - } + else echo ""; ?>
AlliancePlayerPoints
"; - } - else { - echo "
"; - } - echo $i.".".$ranking[$i]['tag'].""; - echo $ranking[$i]['players']."".$ranking[$i]['Adp']."
"; + else echo "
"; + + echo $i.".".$rankArray[$i]['tag'].""; + echo $rankArray[$i]['players']."".$rankArray[$i]['Adp']."
No users foundNo alliances found
diff --git a/Templates/Ranking/general.tpl b/Templates/Ranking/general.tpl index ee5afa32..d8e67656 100644 --- a/Templates/Ranking/general.tpl +++ b/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']; ?> diff --git a/Templates/Ranking/heroes.tpl b/Templates/Ranking/heroes.tpl index 1470ed5f..3a5ab615 100644 --- a/Templates/Ranking/heroes.tpl +++ b/Templates/Ranking/heroes.tpl @@ -26,44 +26,40 @@ HeroPlayerLevelExperience 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 ""; - } else { - echo ""; - } + 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 ""; + else echo ""; + echo $i . ". - \"\" " . $ranking[$i]['name'] . " -
" . $ranking[$i]['owner'] . "
- " . $ranking[$i]['level'] . " - " . $ranking[$i]['experience'] . " + \"\" " . $rankArray[$i]['name'] . " +
" . $rankArray[$i]['owner'] . "
+ " . $rankArray[$i]['level'] . " + " . $rankArray[$i]['experience'] . " "; } } - } else { - echo "No heros found"; } + else echo "No heros found"; ?> diff --git a/Templates/Ranking/overview.tpl b/Templates/Ranking/overview.tpl index 55258dc7..3689c977 100644 --- a/Templates/Ranking/overview.tpl +++ b/Templates/Ranking/overview.tpl @@ -19,48 +19,43 @@ $search = $_SESSION['search']; PlayerAlliancePopulationVillages 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 ""; - } - else { - echo ""; - } + $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 ""; + else echo ""; + echo $i."."; - if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; - } else { - echo"".$ranking[$i]['username'].""; - } - echo""; - if($ranking[$i]['aname'] != "") { - echo "".$ranking[$i]['aname'].""; + if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; + } else { + echo"".$rankArray[$i]['username'].""; } - else { - echo "-"; + echo""; + if($rankArray[$i]['aname'] != "") { + echo "".$rankArray[$i]['aname'].""; } - echo "".$ranking[$i]['totalpop']."".$ranking[$i]['totalvillage'].""; + else echo "-"; + echo "".$rankArray[$i]['totalpop']."".$rankArray[$i]['totalvillage'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> diff --git a/Templates/Ranking/player_1.tpl b/Templates/Ranking/player_1.tpl index 050fb297..9ea63d52 100644 --- a/Templates/Ranking/player_1.tpl +++ b/Templates/Ranking/player_1.tpl @@ -19,48 +19,44 @@ $search = $_SESSION['search']; PlayerAlliancePopulationVillages 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 ""; - } - else { - echo ""; - } + for($i = $start; $i< $start + 20; $i++) { + if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") { + if($i == $search) echo ""; + else echo ""; + echo $i."."; - if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; + if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; } else { - echo"".$ranking[$i]['username'].""; + echo"".$rankArray[$i]['username'].""; } echo""; - if($ranking[$i]['alliance'] != 0) { - echo "".$ranking[$i]['aname'].""; + if($rankArray[$i]['alliance'] > 0) { + echo "".$rankArray[$i]['aname'].""; } - else { - echo "-"; - } - echo "".$ranking[$i]['totalpop']."".$ranking[$i]['totalvillage'].""; + else echo "-"; + + echo "".$rankArray[$i]['totalpop']."".$rankArray[$i]['totalvillage'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> diff --git a/Templates/Ranking/player_2.tpl b/Templates/Ranking/player_2.tpl index 4808d978..cb0d84da 100644 --- a/Templates/Ranking/player_2.tpl +++ b/Templates/Ranking/player_2.tpl @@ -19,48 +19,44 @@ $search = $_SESSION['search']; PlayerAlliancePopulationVillages 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 ""; - } - else { - echo ""; - } + for($i = $start; $i< $start + 20; $i++) { + if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") { + if($i == $search) echo ""; + else echo ""; + echo $i."."; - if($ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; - } else { - echo"".$ranking[$i]['username'].""; - } - echo""; - if($ranking[$i]['alliance'] != 0) { - echo "".$ranking[$i]['aname'].""; + if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; + } else { + echo"".$rankArray[$i]['username'].""; } - else { - echo "-"; + echo""; + if($rankArray[$i]['alliance'] > 0) { + echo "".$rankArray[$i]['aname'].""; } - echo "".$ranking[$i]['totalpop']."".$ranking[$i]['totalvillage'].""; + else echo "-"; + + echo "".$rankArray[$i]['totalpop']."".$rankArray[$i]['totalvillage'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> diff --git a/Templates/Ranking/player_3.tpl b/Templates/Ranking/player_3.tpl index f48365b9..4b8f1360 100644 --- a/Templates/Ranking/player_3.tpl +++ b/Templates/Ranking/player_3.tpl @@ -19,48 +19,44 @@ $search = $_SESSION['search']; PlayerAlliancePopulationVillages 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 ""; - } - else { - echo ""; - } + for($i = $start; $i< $start + 20; $i++) { + if(isset($rankArray[$i]['username']) && $rankArray[$i] != "pad") { + if($i == $search) echo ""; + else echo ""; + echo $i."."; - if($ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; - } else { - echo"".$ranking[$i]['username'].""; - } - echo""; - if($ranking[$i]['alliance'] != 0) { - echo "".$ranking[$i]['aname'].""; + if(isset($rankArray[$i]['access']) && $rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; + } else { + echo"".$rankArray[$i]['username'].""; } - else { - echo "-"; + echo""; + if($rankArray[$i]['alliance'] > 0) { + echo "".$rankArray[$i]['aname'].""; } - echo "".$ranking[$i]['totalpop']."".$ranking[$i]['totalvillage'].""; + else echo "-"; + + echo "".$rankArray[$i]['totalpop']."".$rankArray[$i]['totalvillage'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> diff --git a/Templates/Ranking/player_attack.tpl b/Templates/Ranking/player_attack.tpl index 0f77afb8..a5e1bfd8 100644 --- a/Templates/Ranking/player_attack.tpl +++ b/Templates/Ranking/player_attack.tpl @@ -19,43 +19,42 @@ $search = $_SESSION['search']; PlayerPopulationVillagesPoints 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 ""; - } - else { - echo ""; - } + $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 ""; + else echo ""; + echo $i."."; - if($ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; - } else { - echo"".$ranking[$i]['username'].""; - } - echo"".$ranking[$i]['totalpop'].""; - echo "".$ranking[$i]['totalvillages']."".$ranking[$i]['apall'].""; + if($rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; + } else { + echo"".$rankArray[$i]['username'].""; + } + echo"".$rankArray[$i]['totalpop'].""; + echo "".$rankArray[$i]['totalvillages']."".$rankArray[$i]['apall'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> - + + diff --git a/Templates/Ranking/player_defend.tpl b/Templates/Ranking/player_defend.tpl index 21e942d2..a4a3aaf7 100644 --- a/Templates/Ranking/player_defend.tpl +++ b/Templates/Ranking/player_defend.tpl @@ -19,42 +19,39 @@ $search = $_SESSION['search']; PlayerPopulationVillagesPoints 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 ""; - } - else { - echo ""; - } + $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 ""; + else echo ""; + echo $i."."; - if($ranking[$i]['access'] > 2){ - echo"".$ranking[$i]['username'].""; - } else { - echo"".$ranking[$i]['username'].""; - } - echo"".$ranking[$i]['totalpop']; - echo "".$ranking[$i]['totalvillages']."".$ranking[$i]['dpall'].""; + if($rankArray[$i]['access'] > 2){ + echo"".$rankArray[$i]['username'].""; + } else { + echo"".$rankArray[$i]['username'].""; + } + echo"".$rankArray[$i]['totalpop'].""; + echo "".$rankArray[$i]['totalvillages']."".$rankArray[$i]['dpall'].""; } } } - else { - echo "No users found"; - } + else echo "No users found"; ?> diff --git a/Templates/Ranking/ranksearch.tpl b/Templates/Ranking/ranksearch.tpl index e7d421bb..f8870b92 100644 --- a/Templates/Ranking/ranksearch.tpl +++ b/Templates/Ranking/ranksearch.tpl @@ -15,16 +15,13 @@ if(!isset($_GET['id'])){ $_GET['id']='1'; }
« back | forward »"; +if(count($rankArray) < 22){ + echo "« back | forward »"; +}else if($start != 1 && $start + 20 < count($rankArray)) { + echo "« back | forward »"; +}else if($start == 1 && $start + 20 < count($rankArray)) { + echo "« back | forward »"; +}else if($start != 1 && $start - 20 < count($rankArray)) { + echo "« back | forward »"; } -else if($start == 1 && $start+20 < count($ranking)) { - echo "« back | forward »"; - } - else if($start != 1 && $start-20 < count($ranking)) { - echo "« back | forward »"; - } - else { - echo "« back | forward »"; - } - ?> +?> diff --git a/Templates/Ranking/villages.tpl b/Templates/Ranking/villages.tpl index 975c8bf4..9ef86e62 100644 --- a/Templates/Ranking/villages.tpl +++ b/Templates/Ranking/villages.tpl @@ -5,9 +5,7 @@ if(!is_numeric($_SESSION['search'])) { @@ -19,38 +17,35 @@ else { 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 ""; - echo ""; - echo ""; - } - } - } - else { - echo ""; - } - ?> - 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 ""; + echo ""; + echo ""; + } + } + } + else echo ""; include("ranksearch.tpl"); -?> \ No newline at end of file +?> +
VillagePlayerInhabitantsCoordinates
"; - } - else { - echo "
"; - } - echo $i.".getMapCheck($ranking[$i]['wref'])."\">".$ranking[$i]['name']."".$ranking[$i]['user']."".$ranking[$i]['pop']."
(".$ranking[$i]['x']."
|
".$ranking[$i]['y'].")
No villages found
"; + else echo "
"; + + echo $i.".getMapCheck($rankArray[$i]['wref'])."\">".$rankArray[$i]['name']."".$rankArray[$i]['user']."".$rankArray[$i]['pop']."
(".$rankArray[$i]['x']."
|
".$rankArray[$i]['y'].")
No villages found
\ No newline at end of file diff --git a/Templates/Ranking/ww.tpl b/Templates/Ranking/ww.tpl index 5d0a5638..3a64d08a 100644 --- a/Templates/Ranking/ww.tpl +++ b/Templates/Ranking/ww.tpl @@ -14,16 +14,16 @@ if (WW == True) - Player - Name - Alliance - Level + + + + getAlliance($row['alliance']); @@ -31,7 +31,7 @@ if (WW == True) $row2 = @mysqli_fetch_assoc($query); ?> - . + . getMapCheck($row['vref']) . "\">"; ?> @@ -44,10 +44,18 @@ if (WW == True) \ No newline at end of file + + if($count == 0){ + ?> + + + + \ No newline at end of file