diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index 3751ed9a..76b50512 100644 --- a/Admin/Templates/Newmessage.tpl +++ b/Admin/Templates/Newmessage.tpl @@ -15,7 +15,6 @@ error_reporting(E_ALL ^ E_NOTICE); $id = $_GET['uid']; if(isset($id)) { - $user = $database->getUserArray($id,1); $varray = $database->getProfileVillages($id); $varmedal = $database->getProfileMedal($id); ?> diff --git a/Admin/Templates/addABTroops.tpl b/Admin/Templates/addABTroops.tpl index 2b63d97a..121a2b10 100644 --- a/Admin/Templates/addABTroops.tpl +++ b/Admin/Templates/addABTroops.tpl @@ -14,8 +14,6 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); $id = $_GET['did']; if(isset($id)) { - $village = $database->getVillage($id); - $user = $database->getUserArray($village['owner'],1); $abtech = $database->getABTech($id); // Armory/blacksmith level $units = $database->getUnit($village['wref']); $coor = $database->getCoor($village['wref']); diff --git a/Admin/Templates/addTroops.tpl b/Admin/Templates/addTroops.tpl index d1be5e96..e1c7ebb4 100644 --- a/Admin/Templates/addTroops.tpl +++ b/Admin/Templates/addTroops.tpl @@ -14,8 +14,6 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); $id = $_GET['did']; if(isset($id)) { - $village = $database->getVillage($id); - $user = $database->getUserArray($village['owner'],1); $units = $database->getUnit($village['wref']); $coor = $database->getCoor($village['wref']); $tribe = $user['tribe']; diff --git a/Admin/Templates/deletion.tpl b/Admin/Templates/deletion.tpl index 4a71760f..362a7c65 100644 --- a/Admin/Templates/deletion.tpl +++ b/Admin/Templates/deletion.tpl @@ -11,7 +11,6 @@ include_once("../GameEngine/Ranking.php"); if($_GET['uid']) { - $user = $database->getUserArray($_GET['uid'],1); $varray = $database->getProfileVillages($_GET['uid']); if($user) { diff --git a/Admin/Templates/editAdditional.tpl b/Admin/Templates/editAdditional.tpl index 75c3fe1f..fa50a9ad 100644 --- a/Admin/Templates/editAdditional.tpl +++ b/Admin/Templates/editAdditional.tpl @@ -13,7 +13,6 @@ if (!isset($_SESSION)) { } if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!"); $id = $_GET['uid']; -$user = $database->getUserArray($id,1); $dur=$user['protect']-time(); $protect=0; if($dur>43200) { diff --git a/Admin/Templates/editHero.tpl b/Admin/Templates/editHero.tpl index 2616e3c1..9b8f20c2 100644 --- a/Admin/Templates/editHero.tpl +++ b/Admin/Templates/editHero.tpl @@ -12,7 +12,6 @@ if(isset($_GET['uid'])){ $id = (int) $_GET['uid']; include_once("../GameEngine/Data/hero_full.php"); include_once("../GameEngine/Units.php"); - $user = $database->getUserArray($id,1); $result = mysqli_query($GLOBALS["link"], "SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = ".$id); $hero_info = mysqli_fetch_array($result); $hero = $units->Hero($id,1); diff --git a/Admin/Templates/editOverall.tpl b/Admin/Templates/editOverall.tpl index 08a8f544..64e552dc 100644 --- a/Admin/Templates/editOverall.tpl +++ b/Admin/Templates/editOverall.tpl @@ -11,7 +11,6 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editPlus.tpl b/Admin/Templates/editPlus.tpl index 0e349bab..72092eb8 100644 --- a/Admin/Templates/editPlus.tpl +++ b/Admin/Templates/editPlus.tpl @@ -11,7 +11,6 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editResources.tpl b/Admin/Templates/editResources.tpl index f71c1522..aaf3917c 100644 --- a/Admin/Templates/editResources.tpl +++ b/Admin/Templates/editResources.tpl @@ -12,8 +12,6 @@ $id = $_GET['did']; if(isset($id)) { - $village = $database->getVillage($id); - $user = $database->getUserArray($village['owner'],1); $coor = $database->getCoor($village['wref']); //$varray = $database->getProfileVillages($village['owner']); //$type = $database->getVillageType($village['wref']); diff --git a/Admin/Templates/editSitter.tpl b/Admin/Templates/editSitter.tpl index c71da7ad..adc55051 100644 --- a/Admin/Templates/editSitter.tpl +++ b/Admin/Templates/editSitter.tpl @@ -11,7 +11,6 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editUser.tpl b/Admin/Templates/editUser.tpl index f8c6d496..612edf88 100644 --- a/Admin/Templates/editUser.tpl +++ b/Admin/Templates/editUser.tpl @@ -13,7 +13,6 @@ $id = $_GET['uid']; if(isset($id)) { - $user = $database->getUserArray($id,1); $varray = $database->getProfileVillages($id); $varmedal = $database->getProfileMedal($id); ?> diff --git a/Admin/Templates/editVillage.tpl b/Admin/Templates/editVillage.tpl index 206c6204..b39ffc94 100644 --- a/Admin/Templates/editVillage.tpl +++ b/Admin/Templates/editVillage.tpl @@ -10,8 +10,6 @@ ################################################################################# $id = $_GET['did']; -$village = $database->getVillage($id); -$user = $database->getUserArray($village['owner'],1); $coor = $database->getCoor($village['wref']); $varray = $database->getProfileVillages($village['owner']); $type = $database->getVillageType($village['wref']); diff --git a/Admin/Templates/editWeek.tpl b/Admin/Templates/editWeek.tpl index 3bc4c380..52b660bb 100644 --- a/Admin/Templates/editWeek.tpl +++ b/Admin/Templates/editWeek.tpl @@ -11,7 +11,6 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/player.tpl b/Admin/Templates/player.tpl index c24e6c0f..d282948d 100644 --- a/Admin/Templates/player.tpl +++ b/Admin/Templates/player.tpl @@ -14,8 +14,6 @@ if(isset($id)) { include_once("../GameEngine/Ranking.php"); $varmedal = $database->getProfileMedal($id); - $displayarray = $database->getUserArray($id,1); - $user=$displayarray; $profiel="".$user['desc1']."".md5('skJkev3')."".$user['desc2'].""; $separator="../"; require("../Templates/Profile/medal.php"); diff --git a/Admin/Templates/userillegallog.tpl b/Admin/Templates/userillegallog.tpl index e7623731..dd726d69 100644 --- a/Admin/Templates/userillegallog.tpl +++ b/Admin/Templates/userillegallog.tpl @@ -2,7 +2,6 @@ $id = (int) $_GET['uid']; if(isset($id)) { - $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = $id")); ?> diff --git a/Admin/Templates/userlogin.tpl b/Admin/Templates/userlogin.tpl index 9e569dcb..21744636 100644 --- a/Admin/Templates/userlogin.tpl +++ b/Admin/Templates/userlogin.tpl @@ -2,7 +2,6 @@ $id = (int) $_GET['uid']; if(isset($id)) { - $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = $id")); ?>
diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index fb3403b6..9d9b4292 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -15,8 +15,6 @@ error_reporting(0); $id = $_GET['did']; if(isset($id)) { - $village = $database->getVillage($id); - $user = $database->getUserArray($village['owner'],1); $coor = $database->getCoor($village['wref']); $varray = $database->getProfileVillages($village['owner']); $type = $database->getVillageType($village['wref']); diff --git a/Admin/Templates/villagelog.tpl b/Admin/Templates/villagelog.tpl index 152afcb4..244e51c7 100644 --- a/Admin/Templates/villagelog.tpl +++ b/Admin/Templates/villagelog.tpl @@ -2,7 +2,6 @@ $id = $_GET['did']; if(isset($id)) { - $village = $database->getVillage($id); ?>

diff --git a/Admin/admin.php b/Admin/admin.php index 2d8fb5ba..d953d0fe 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -50,12 +50,316 @@ $timeformat = new timeFormatGenerator; include('Templates/ver.tpl'); include('Templates/update_latest.tpl'); $up_avl = $latest - $ver ; + +$subpage = 'Login'; + +if (!empty($_GET['p'])) { + switch ($_GET['p']) { + case 'server_info': + $subpage = 'Server Info'; + break; + + case 'online': + $subpage = 'Online Users'; + break; + + case 'notregistered': + $subpage = 'Players Not Activated'; + break; + + case 'inactive': + $subpage = 'Players Inactivate'; + break; + + case 'report': + $subpage = 'Players Reported'; + break; + + case 'map': + $subpage = 'Map'; + break; + + case 'search': + $subpage = 'General Search'; + break; + + case 'message': + $subpage = 'Search IGMs/Reports'; + break; + + case 'ban': + $subpage = 'Ban/Unban Players'; + break; + + case 'maintenence': + $subpage = 'Server Maintenence'; + break; + + case 'cleanban': + $subpage = 'Clean Banlist Data'; + break; + + case 'gold': + $subpage = 'Give All Free Gold'; + break; + + case 'usergold': + $subpage = 'Give Free Gold To Specific User'; + break; + + case 'maintenenceResetGold': + $subpage = 'Reset Gold'; + break; + + case 'delmedal': + $subpage = 'Delete Player Medals'; + break; + + case 'delallymedal': + $subpage = 'Delete Ally Medals'; + break; + + case 'givePlus': + $subpage = 'Give All Plus'; + break; + + case 'maintenenceResetPlus': + $subpage = 'Reset Plus'; + break; + + case 'givePlusRes': + $subpage = 'Give All Res Bonus'; + break; + + case 'maintenenceResetPlusBonus': + $subpage = 'Reset Res Bonus'; + break; + + case 'addUsers': + $subpage = 'Create Users'; + break; + + case 'natarend': + $subpage = 'Add WW Villages'; + break; + + case 'natarbuildingplan': + $subpage = 'Add WW Building Plan Villages'; + break; + + case 'admin_log': + $subpage = 'Admin Log'; + break; + + case 'config': + $subpage = 'Server Settings'; + break; + + case 'editServerSet': + $subpage = 'Server Configuration'; + break; + + case 'editPlusSet': + $subpage = 'PLUS Settings'; + break; + + case 'editLogSet': + $subpage = 'Log Settings'; + break; + + case 'editNewsboxSet': + $subpage = 'NewsBox Settings'; + break; + + case 'editExtraSet': + $subpage = 'Extra Settings'; + break; + + case 'editAdminInfo': + $subpage = 'Edit Admin Information'; + break; + + case 'resetServer': + $subpage = 'Server Resetting'; + break; + + case 'player': + if (!empty($_GET['uid'])) { + $displayarray = $database->getUserArray($_GET['uid'],1); + $user=$displayarray; + $subpage = 'Player Details ('.$user['username'].')'; + } else { + $subpage = 'Player Details (no player)'; + } + break; + + case 'editUser': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Player ('.$user['username'].')'; + } else { + $subpage = 'Edit Player (no player)'; + } + break; + + case 'deletion': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Delete Player ('.$user['username'].')'; + } else { + $subpage = 'Delete Player (no player)'; + } + break; + + case 'Newmessage': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Compose Message ('.$user['username'].')'; + } else { + $subpage = 'Compose Message'; + } + break; + + case 'editPlus': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Plus & Resources ('.$user['username'].')'; + } else { + $subpage = 'Edit Plus & Resources'; + } + break; + + case 'editSitter': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Sitters ('.$user['username'].')'; + } else { + $subpage = 'Edit Sitters '; + } + break; + + case 'editOverall': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Off & Def ('.$user['username'].')'; + } else { + $subpage = 'Edit Off & Def'; + } + break; + + case 'editWeek': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Weekly Off & Def ('.$user['username'].')'; + } else { + $subpage = 'Edit Weekly Off & Def'; + } + break; + + case 'userlogin': + if (!empty($_GET['uid'])) { + $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid'])); + $subpage = 'User Logins ('.$player['username'].')'; + } else { + $subpage = 'User Logins (no player)'; + } + break; + + case 'userillegallog': + if (!empty($_GET['uid'])) { + $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $_GET['uid'])); + $subpage = 'User Illegals Log ('.$player['username'].')'; + } else { + $subpage = 'User Illegals Log (no player)'; + } + break; + + case 'editHero': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Hero ('.$user['username'].')'; + } else { + $subpage = 'Edit Hero'; + } + break; + + case 'editAdditional': + if (!empty($_GET['uid'])) { + $user = $database->getUserArray($_GET['uid'],1); + $subpage = 'Edit Additional Info ('.$user['username'].')'; + } else { + $subpage = 'Edit Additional Info'; + } + break; + + case 'village': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Edit Village ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Edit Village (no village)'; + } + break; + + case 'editResources': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Edit Resources ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Edit Resources (no village)'; + } + break; + + case 'addTroops': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Edit Troops ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Edit Troops (no village)'; + } + break; + + case 'addABTroops': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Upgrade Troops ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Upgrade Troops (no village)'; + } + break; + + case 'editVillage': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Edit Village ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Edit Village (no village)'; + } + break; + + case 'villagelog': + if (!empty($_GET['did'])) { + $village = $database->getVillage($_GET['did']); + $user = $database->getUserArray($village['owner'],1); + $subpage = 'Build Log ('.$village['name'].' » '.$user['username'].')'; + } else { + $subpage = 'Build Log (no village)'; + } + break; + } +} + ?> - Admin Panel + Admin Panel - <?php echo $subpage; ?> diff --git a/todo.txt b/todo.txt index ee69b00c..35458bcf 100644 --- a/todo.txt +++ b/todo.txt @@ -25,4 +25,5 @@ - task 1 => construct woodcutter will not reload the page when finished, so it would still seem that woodcutter build is in progress - it's possible to train 2 senators - when 1 is trained, another one is possible to be trained - add registered date into user details in Admin -- npc shop button is missing from settlers training (palace) \ No newline at end of file +- npc shop button is missing from settlers training (palace) +- logs don't seem to work \ No newline at end of file