From 9391553dcb0839fe849c995687e974ad2ab53364 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Fri, 20 Oct 2017 18:17:42 +0200 Subject: [PATCH] feat: front-end page names --- GameEngine/Admin/admin.php | 2 +- a2b.php | 2 +- a2b2.php | 2 +- activate.php | 2 +- allianz.php | 29 +++++++++++++++++++++++++++-- anmelden.php | 2 +- banned.php | 2 +- berichte.php | 2 +- build.php | 6 +++++- create_account.php | 2 +- dorf1.php | 2 +- dorf2.php | 2 +- dorf3.php | 2 +- karte.php | 2 +- karte2.php | 2 +- login.php | 2 +- logout.php | 2 +- manual.php | 2 +- massmessage.php | 2 +- nachrichten.php | 2 +- packages.php | 2 +- password.php | 2 +- plus.php | 26 +++++++++++++++++++++++++- plus1.php | 2 +- rules.php | 2 +- statistiken.php | 32 +++++++++++++++++++++++++++++++- support.php | 2 +- sysmsg.php | 2 +- todo.txt | 2 -- version.php | 2 +- warsim.php | 2 +- winner.php | 2 +- 32 files changed, 115 insertions(+), 34 deletions(-) diff --git a/GameEngine/Admin/admin.php b/GameEngine/Admin/admin.php index 3363c633..41e4127b 100755 --- a/GameEngine/Admin/admin.php +++ b/GameEngine/Admin/admin.php @@ -25,7 +25,7 @@ include("../GameEngine/Admin/database.php"); - Admin Control Panel - TravianX + Admin Control Panel - TravianZ diff --git a/a2b.php b/a2b.php index d22d180f..a1961723 100644 --- a/a2b.php +++ b/a2b.php @@ -75,7 +75,7 @@ if(isset($_GET['o'])) { <?php - echo SERVER_NAME + echo SERVER_NAME . ' - Send Troops' ?> diff --git a/a2b2.php b/a2b2.php index 62ae0600..744f6db8 100644 --- a/a2b2.php +++ b/a2b2.php @@ -27,7 +27,7 @@ $automation->isWinner(); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME . ' - Account transactions' ?> diff --git a/activate.php b/activate.php index 47485c0c..d03db4eb 100644 --- a/activate.php +++ b/activate.php @@ -15,7 +15,7 @@ include('GameEngine/Account.php'); - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME . ' - Account Activation'; ?> diff --git a/allianz.php b/allianz.php index 0da26ef9..99850605 100644 --- a/allianz.php +++ b/allianz.php @@ -59,7 +59,33 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio <?php - echo SERVER_NAME + echo SERVER_NAME . ' » » » Alliance '; + + if (!empty($_GET['s'])) { + switch ($_GET['s']) { + case '2': + echo 'Forum ('.$alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name'].')'; + break; + + case '6': + echo 'Chat ('.$alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name'].')'; + break; + + case '3': + echo 'Attacks ('.$alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name'].')'; + break; + + case '4': + echo 'News ('.$alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name'].')'; + break; + + case '5': + echo 'Options ('.$alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name'].')'; + break; + } + } else { + echo $alliance->allianceArray['tag'] . ' - ' . $alliance->allianceArray['name']; + } ?> @@ -151,7 +177,6 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio
diff --git a/anmelden.php b/anmelden.php index 62832233..71ae9a97 100644 --- a/anmelden.php +++ b/anmelden.php @@ -16,7 +16,7 @@ $invited=(isset($_GET['uid'])) ? filter_var($_GET['uid'], FILTER_SANITIZE_NUMBER - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Registration diff --git a/banned.php b/banned.php index 4c6fa148..8b8dfe82 100644 --- a/banned.php +++ b/banned.php @@ -17,7 +17,7 @@ if($session->access == BANNED){ - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Player Banned diff --git a/berichte.php b/berichte.php index 46c64237..3fdd2550 100644 --- a/berichte.php +++ b/berichte.php @@ -30,7 +30,7 @@ if(isset($_GET['t'])) { - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Reports diff --git a/build.php b/build.php index a30df366..29706eca 100644 --- a/build.php +++ b/build.php @@ -389,5 +389,9 @@ echo round(($generator->pageLoadTimeEnd()-$pagestart)*1000);
+ - + \ No newline at end of file diff --git a/create_account.php b/create_account.php index c1400880..ed19ed90 100644 --- a/create_account.php +++ b/create_account.php @@ -35,7 +35,7 @@ $start = $generator->pageLoadTimeStart(); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Account Creation diff --git a/dorf1.php b/dorf1.php index b5c3f1c1..765a263e 100644 --- a/dorf1.php +++ b/dorf1.php @@ -25,7 +25,7 @@ if(isset($_GET['newdid'])) { - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME . ' - Village overview » ' . $village->vname; ?> diff --git a/dorf2.php b/dorf2.php index 67426fb6..1a7628b8 100644 --- a/dorf2.php +++ b/dorf2.php @@ -23,7 +23,7 @@ $building->procBuild($_GET); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME. ' - Village Centre » ' . $village->vname ?> diff --git a/dorf3.php b/dorf3.php index bd1740c4..a9666573 100644 --- a/dorf3.php +++ b/dorf3.php @@ -27,7 +27,7 @@ if(isset($_GET['newdid'])) { - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Cross-Village Totals diff --git a/karte.php b/karte.php index 113e6516..25012c05 100644 --- a/karte.php +++ b/karte.php @@ -31,7 +31,7 @@ else{ - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - World Map diff --git a/karte2.php b/karte2.php index 1076e558..ef320eee 100644 --- a/karte2.php +++ b/karte2.php @@ -15,7 +15,7 @@ if($session->plus){ - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - World Map diff --git a/login.php b/login.php index b10f14d3..21019e6d 100644 --- a/login.php +++ b/login.php @@ -32,7 +32,7 @@ $_SESSION[ 'csrf' ] = $key; - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Login diff --git a/logout.php b/logout.php index 232258b9..99d45fe0 100644 --- a/logout.php +++ b/logout.php @@ -17,7 +17,7 @@ $start = $generator->pageLoadTimeStart(); - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Logged Out diff --git a/manual.php b/manual.php index 5eeb0383..765dde50 100644 --- a/manual.php +++ b/manual.php @@ -16,7 +16,7 @@ include("GameEngine/config.php"); - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Manual diff --git a/massmessage.php b/massmessage.php index cd6f455f..ded3f0e5 100644 --- a/massmessage.php +++ b/massmessage.php @@ -79,7 +79,7 @@ if (isset($_GET['send']) && isset($_GET['from'])) - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Mass Message diff --git a/nachrichten.php b/nachrichten.php index b3fa00e6..d2fe8562 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -64,7 +64,7 @@ header("Location: ".$_SERVER['PHP_SELF']."?t=1"); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Messages diff --git a/packages.php b/packages.php index 5b0c746e..5953f14d 100644 --- a/packages.php +++ b/packages.php @@ -17,7 +17,7 @@ if($session->access != BANNED){ - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - PLUS packages diff --git a/password.php b/password.php index d1442774..d0f16ec3 100644 --- a/password.php +++ b/password.php @@ -27,7 +27,7 @@ if(!isset($_REQUEST['npw'])){ - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Forgotten Password diff --git a/plus.php b/plus.php index 831d8651..e61b2cf3 100644 --- a/plus.php +++ b/plus.php @@ -25,7 +25,31 @@ $automation->isWinner(); - <?php echo SERVER_NAME ?> + <?php + echo SERVER_NAME . ' » » » PLUS '; + + if (!empty($_GET['id'])) { + switch ($_GET['id']) { + case '2': + echo 'Advantages'; + break; + + case '3': + echo 'Gold'; + break; + + case '4': + echo 'FAQ'; + break; + + case '5': + echo 'Earn Gold'; + break; + } + } else { + echo 'Tariffs'; + } + ?> diff --git a/plus1.php b/plus1.php index b7151e12..20e35a0f 100644 --- a/plus1.php +++ b/plus1.php @@ -14,7 +14,7 @@ else { - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - PLUS Packages diff --git a/rules.php b/rules.php index dc90d583..219c8702 100644 --- a/rules.php +++ b/rules.php @@ -22,7 +22,7 @@ if(isset($_GET['newdid'])) { - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Game Rules diff --git a/statistiken.php b/statistiken.php index 148ba8d0..2c4cfb52 100644 --- a/statistiken.php +++ b/statistiken.php @@ -26,7 +26,37 @@ if(isset($_GET['newdid'])) { - <?php echo SERVER_NAME ?> + <?php + echo SERVER_NAME . ' » » » Statistics ('; + + if (!empty($_GET['id'])) { + switch ($_GET['id']) { + case '4': + echo 'Alliances'; + break; + + case '2': + echo 'Villages'; + break; + + case '8': + echo 'Heroes'; + break; + + case '0': + echo 'General'; + break; + + case '99': + echo 'WW'; + break; + } + } else { + echo 'Players'; + } + + echo ')'; + ?> diff --git a/support.php b/support.php index dfa27f85..d8c461b9 100644 --- a/support.php +++ b/support.php @@ -24,7 +24,7 @@ $automation->isWinner(); - <?php echo SERVER_NAME; ?> + <?php echo SERVER_NAME; ?> - Support Request diff --git a/sysmsg.php b/sysmsg.php index becc08ee..51dd42a1 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -60,7 +60,7 @@ if (@isset($_POST['confirm'])) - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - System Message diff --git a/todo.txt b/todo.txt index 35458bcf..f7084ea6 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,3 @@ -- change title for each page, so it fits with H1 (or history will always show a lot of "TravianZ" entries without a way to know where that history entry leads) - ... same in Admin panel - fix deleting users (need to delete their villages (+alliances/construction plans/...?) after a while) - check if defeating a player (destroying their village) removes that village from map after a while (as stated in FAQ) - add PayPal listener to verify gold transactions imediatelly diff --git a/version.php b/version.php index 84aa47fa..dfcdf9fe 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ $automation->isWinner(); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Game Version diff --git a/warsim.php b/warsim.php index 07ff43aa..67f1a762 100644 --- a/warsim.php +++ b/warsim.php @@ -18,7 +18,7 @@ $battle->procSim($_POST); - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Combat Simulator diff --git a/winner.php b/winner.php index 99606919..2743144d 100644 --- a/winner.php +++ b/winner.php @@ -157,7 +157,7 @@ $q = " - <?php echo SERVER_NAME ?> + <?php echo SERVER_NAME ?> - Game Over