From b9ceb8639223913c0e4f5297c1347ac9585e1019 Mon Sep 17 00:00:00 2001 From: Vladyslav Date: Fri, 31 Aug 2018 17:15:53 +0300 Subject: [PATCH] Some improvements and changes +Added the ability to change the position of Direct links +Added the ability to Enable (Disable) veteran medals --- Admin/Templates/config.tpl | 12 ++++++++ Admin/Templates/editNewFunctions.tpl | 27 +++++++++++++++++ GameEngine/Admin/Mods/editAdminInfo.php | 6 ++++ GameEngine/Admin/Mods/editExtraSet.php | 6 ++++ GameEngine/Admin/Mods/editLogSet.php | 6 ++++ GameEngine/Admin/Mods/editNewFunctions.php | 3 ++ GameEngine/Admin/Mods/editNewsboxSet.php | 6 ++++ GameEngine/Admin/Mods/editPlusSet.php | 6 ++++ GameEngine/Admin/Mods/editServerSet.php | 6 ++++ Templates/Profile/medal.php | 35 +++++++++++----------- Templates/Profile/profile.tpl | 32 ++++++++++++-------- Templates/menu.tpl | 8 +++-- a2b.php | 4 +++ a2b2.php | 4 +++ allianz.php | 4 +++ banned.php | 4 +++ berichte.php | 4 +++ build.php | 4 +++ crop_finder.php | 4 +++ dorf1.php | 4 +++ dorf2.php | 4 +++ dorf3.php | 5 ++++ install/data/constant_format.tpl | 3 ++ install/process.php | 3 ++ install/templates/config.tpl | 27 +++++++++++++++++ karte.php | 4 +++ maintenance.php | 4 +++ nachrichten.php | 4 +++ packages.php | 4 +++ plus.php | 4 +++ rules.php | 4 +++ spieler.php | 4 +++ statistiken.php | 4 +++ support.php | 4 +++ version.php | 4 +++ warsim.php | 4 +++ winner.php | 4 +++ 37 files changed, 243 insertions(+), 32 deletions(-) diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index fd7560e0..ddb0b738 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -235,6 +235,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); Manual on Nature and Natars ?Enable (Disable) displaying information in the Manual about the troops of Nature and Natars Enabled" : "Disabled"; ?> + + + Direct links placement ?If Enabled, then the Direct links will be placed in the left menu, if Disabled then Direct links will be placed in the right menu as in the original Travian + Enabled" : "Disabled"; ?> + + + Medal Veteran Player ?Enable (Disable) medal achieved for playing 3 years of Travian + Enabled" : "Disabled"; ?> + + + Medal Veteran Player 5a ?Enable (Disable) medal achieved for playing 5 years of Travian + Enabled" : "Disabled"; ?> diff --git a/Admin/Templates/editNewFunctions.tpl b/Admin/Templates/editNewFunctions.tpl index 08339808..735763d7 100644 --- a/Admin/Templates/editNewFunctions.tpl +++ b/Admin/Templates/editNewFunctions.tpl @@ -123,6 +123,33 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); + + + + + + + + + + + +
Direct links placement ?If Enabled, then the Direct links will be placed in the left menu, if Disabled then Direct links will be placed in the right menu as in the original Travian + +
Medal Veteran Player ?Enable (Disable) medal achieved for playing 3 years of Travian + +
Medal Veteran Player 5a ?Enable (Disable) medal achieved for playing 5 years of Travian + +

diff --git a/GameEngine/Admin/Mods/editAdminInfo.php b/GameEngine/Admin/Mods/editAdminInfo.php index cf35e703..2252e69c 100755 --- a/GameEngine/Admin/Mods/editAdminInfo.php +++ b/GameEngine/Admin/Mods/editAdminInfo.php @@ -59,6 +59,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -145,6 +148,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editExtraSet.php b/GameEngine/Admin/Mods/editExtraSet.php index 7ead572e..9be94fc4 100755 --- a/GameEngine/Admin/Mods/editExtraSet.php +++ b/GameEngine/Admin/Mods/editExtraSet.php @@ -58,6 +58,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text); @@ -142,6 +145,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editLogSet.php b/GameEngine/Admin/Mods/editLogSet.php index a94ba938..84088de7 100755 --- a/GameEngine/Admin/Mods/editLogSet.php +++ b/GameEngine/Admin/Mods/editLogSet.php @@ -54,6 +54,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -142,6 +145,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editNewFunctions.php b/GameEngine/Admin/Mods/editNewFunctions.php index 9c6ed0c1..c74c90e8 100644 --- a/GameEngine/Admin/Mods/editNewFunctions.php +++ b/GameEngine/Admin/Mods/editNewFunctions.php @@ -116,6 +116,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $_POST['new_functions_vacation'], $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $_POST['new_functions_display_catapult_target'], $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $_POST['new_functions_manual_naturenatars'], $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $_POST['new_functions_display_links'], $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $_POST['new_functions_medal_3year'], $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $_POST['new_functions_medal_5year'], $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editNewsboxSet.php b/GameEngine/Admin/Mods/editNewsboxSet.php index 1882a7b8..92f7af9b 100755 --- a/GameEngine/Admin/Mods/editNewsboxSet.php +++ b/GameEngine/Admin/Mods/editNewsboxSet.php @@ -60,6 +60,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -148,6 +151,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editPlusSet.php b/GameEngine/Admin/Mods/editPlusSet.php index 99f403c3..e969e93b 100644 --- a/GameEngine/Admin/Mods/editPlusSet.php +++ b/GameEngine/Admin/Mods/editPlusSet.php @@ -42,6 +42,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); // SERVER SETTINGS - we need to keep these intact $text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text); @@ -126,6 +129,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS SETTINGS $text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text); diff --git a/GameEngine/Admin/Mods/editServerSet.php b/GameEngine/Admin/Mods/editServerSet.php index caa0cdfa..e4989dd1 100755 --- a/GameEngine/Admin/Mods/editServerSet.php +++ b/GameEngine/Admin/Mods/editServerSet.php @@ -53,6 +53,9 @@ $NEW_FUNCTIONS_VACATION = (NEW_FUNCTIONS_VACATION == false ? 'false' : 'true'); $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET = (NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET == false ? 'false' : 'true'); $NEW_FUNCTIONS_MANUAL_NATURENATARS = (NEW_FUNCTIONS_MANUAL_NATURENATARS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_DISPLAY_LINKS = (NEW_FUNCTIONS_DISPLAY_LINKS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_3YEAR = (NEW_FUNCTIONS_MEDAL_3YEAR == false ? 'false' : 'true'); + $NEW_FUNCTIONS_MEDAL_5YEAR = (NEW_FUNCTIONS_MEDAL_5YEAR == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text); @@ -137,6 +140,9 @@ $text = preg_replace("'%NEW_FUNCTIONS_VACATION%'", $NEW_FUNCTIONS_VACATION, $text); $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%'", $NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET, $text); $text = preg_replace("'%NEW_FUNCTIONS_MANUAL_NATURENATARS%'", $NEW_FUNCTIONS_MANUAL_NATURENATARS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_DISPLAY_LINKS%'", $NEW_FUNCTIONS_DISPLAY_LINKS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_3YEAR%'", $NEW_FUNCTIONS_MEDAL_3YEAR, $text); + $text = preg_replace("'%NEW_FUNCTIONS_MEDAL_5YEAR%'", $NEW_FUNCTIONS_MEDAL_5YEAR, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/Templates/Profile/medal.php b/Templates/Profile/medal.php index 88c188cd..75546ffc 100644 --- a/Templates/Profile/medal.php +++ b/Templates/Profile/medal.php @@ -100,9 +100,12 @@ } //veteran & veteran_5a IMAGES - - $profiel = preg_replace("/\[#g2300]/is",'', $profiel, 1); - $profiel = preg_replace("/\[#g2301]/is",'', $profiel, 1); +if(NEW_FUNCTIONS_MEDAL_3YEAR){ + $profiel = preg_replace("/\[#g2300]/is",'', $profiel, 1); +} +if(NEW_FUNCTIONS_MEDAL_5YEAR){ + $profiel = preg_replace("/\[#g2301]/is",'', $profiel, 1); +} //de lintjes @@ -139,56 +142,54 @@ $titel="Robbers of the week"; $woord="Resources"; break; - case "5": + case "5": $titel="Receiving this medal shows that you where in the top 10 of both Attackers and Defenders of the week."; $bonus[$medal['id']]=1; break; - case "6": + case "6": $titel="Receiving this medal shows that you were in the top 3 Attackers of the week ".$medal['points']." in a row"; $bonus[$medal['id']]=1; break; - case "7": + case "7": $titel="Receiving this medal shows that you were in the top 3 Defenders of the week ".$medal['points']." in a row"; $bonus[$medal['id']]=1; break; - case "8": + case "8": $titel="Receiving this medal shows that you were in the top 3 Pop Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "9": + case "9": $titel="Receiving this medal shows that you were in the top 3 Robbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "10": + case "10": $titel="Rank Climbers of the week."; $woord="Ranks"; break; - case "11": + case "11": $titel="Receiving this medal shows that you were in the top 3 Rank Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "12": + case "12": $titel="Receiving this medal shows that you were in the top 10 Attackers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "13": + case "13": $titel="Receiving this medal shows that you were in the top 10 Defenders of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "14": + case "14": $titel="Receiving this medal shows that you were in the top 10 Pop Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "15": + case "15": $titel="Receiving this medal shows that you were in the top 10 Robbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - case "16": + case "16": $titel="Receiving this medal shows that you were in the top 10 Rank Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - - } if(isset($bonus[$medal['id']])){ diff --git a/Templates/Profile/profile.tpl b/Templates/Profile/profile.tpl index 3d92eb67..6f9d1e34 100644 --- a/Templates/Profile/profile.tpl +++ b/Templates/Profile/profile.tpl @@ -166,19 +166,25 @@ MEDAL CATEGORY: [#0] - - veteran - - - [#g2300] - - - veteran_5a - - - [#g2301] - - + veteran + + + [#g2300] + "; + } + + if(NEW_FUNCTIONS_MEDAL_5YEAR){ + echo " + veteran_5a + + + [#g2301] + "; + } + // Added by Shadow - cata7007@gmail.com / Skype : cata7007 if(NEW_FUNCTIONS_TRIBE_IMAGES){ if($session->userinfo['tribe'] == 1){ diff --git a/Templates/menu.tpl b/Templates/menu.tpl index 1abc1da1..181a73ed 100644 --- a/Templates/menu.tpl +++ b/Templates/menu.tpl @@ -63,7 +63,7 @@ div.c1 {text-align: center}

@@ -102,7 +102,11 @@ div.c1 {text-align: center}


"; + include("Templates/links.tpl"); + } ?> diff --git a/a2b.php b/a2b.php index a240f590..0da57364 100644 --- a/a2b.php +++ b/a2b.php @@ -179,6 +179,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/a2b2.php b/a2b2.php index be03ee18..a1aad2fa 100644 --- a/a2b2.php +++ b/a2b2.php @@ -345,6 +345,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/allianz.php b/allianz.php index 79e05ce7..ab93434c 100644 --- a/allianz.php +++ b/allianz.php @@ -294,6 +294,10 @@ function med_showDescription(coords, desc_string){ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/banned.php b/banned.php index 981e2560..7fd9c756 100644 --- a/banned.php +++ b/banned.php @@ -68,6 +68,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/berichte.php b/berichte.php index add05dbf..6aed74a1 100644 --- a/berichte.php +++ b/berichte.php @@ -122,6 +122,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/build.php b/build.php index 6a5239af..77fccc0f 100644 --- a/build.php +++ b/build.php @@ -317,6 +317,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/crop_finder.php b/crop_finder.php index 7b4b6780..c940cfa6 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -210,6 +210,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/dorf1.php b/dorf1.php index 1fc4137b..81c9bf55 100644 --- a/dorf1.php +++ b/dorf1.php @@ -90,6 +90,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/dorf2.php b/dorf2.php index 656a422f..8f43dbc6 100644 --- a/dorf2.php +++ b/dorf2.php @@ -80,6 +80,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/dorf3.php b/dorf3.php index 58db23a2..73a1d1d9 100644 --- a/dorf3.php +++ b/dorf3.php @@ -99,6 +99,11 @@


"; + include("Templates/links.tpl"); +} ?>
diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl index f39b3f29..6f45ce89 100644 --- a/install/data/constant_format.tpl +++ b/install/data/constant_format.tpl @@ -311,6 +311,9 @@ define("NEW_FUNCTIONS_DISPLAY_WONDER", %NEW_FUNCTIONS_DISPLAY_WONDER%); define("NEW_FUNCTIONS_VACATION", %NEW_FUNCTIONS_VACATION%); define("NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET", %NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%); define("NEW_FUNCTIONS_MANUAL_NATURENATARS", %NEW_FUNCTIONS_MANUAL_NATURENATARS%); +define("NEW_FUNCTIONS_DISPLAY_LINKS", %NEW_FUNCTIONS_DISPLAY_LINKS%); +define("NEW_FUNCTIONS_MEDAL_3YEAR", %NEW_FUNCTIONS_MEDAL_3YEAR%); +define("NEW_FUNCTIONS_MEDAL_5YEAR", %NEW_FUNCTIONS_MEDAL_5YEAR%); ////////////////////////////////////////// diff --git a/install/process.php b/install/process.php index 1c95c88f..9fc40c24 100644 --- a/install/process.php +++ b/install/process.php @@ -154,6 +154,9 @@ private function constForm() { $findReplace["%NEW_FUNCTIONS_VACATION%"] = $_POST['new_functions_vacation']; $findReplace["%NEW_FUNCTIONS_DISPLAY_CATAPULT_TARGET%"] = $_POST['new_functions_display_catapult_target']; $findReplace["%NEW_FUNCTIONS_MANUAL_NATURENATARS%"] = $_POST['new_functions_manual_naturenatars']; + $findReplace["%NEW_FUNCTIONS_DISPLAY_LINKS%"] = $_POST['new_functions_display_links']; + $findReplace["%NEW_FUNCTIONS_MEDAL_3YEAR%"] = $_POST['new_functions_medal_3year']; + $findReplace["%NEW_FUNCTIONS_MEDAL_5YEAR%"] = $_POST['new_functions_medal_5year']; fwrite($gameConfig, str_replace(array_keys($findReplace), array_values($findReplace), $text)); diff --git a/install/templates/config.tpl b/install/templates/config.tpl index ad13e2f0..b8e0fda2 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -371,6 +371,33 @@ echo "
Error creating constant.php + + + Direct links placement: + + + + + + Medal Veteran Player: + + + + + + Medal Veteran Player 5a: + + +

diff --git a/karte.php b/karte.php index 72252678..d974e813 100644 --- a/karte.php +++ b/karte.php @@ -95,6 +95,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/maintenance.php b/maintenance.php index 341062d4..3e586666 100644 --- a/maintenance.php +++ b/maintenance.php @@ -95,6 +95,10 @@ function mysqli_result($res, $row, $field = 0) { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); + if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); + } ?>
diff --git a/nachrichten.php b/nachrichten.php index 74271174..e44eab14 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -159,6 +159,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/packages.php b/packages.php index 523b331a..6d448f7f 100644 --- a/packages.php +++ b/packages.php @@ -85,6 +85,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/plus.php b/plus.php index eb19f837..f95c2e17 100644 --- a/plus.php +++ b/plus.php @@ -156,6 +156,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/rules.php b/rules.php index 7bddde5e..8e469d62 100644 --- a/rules.php +++ b/rules.php @@ -74,6 +74,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/spieler.php b/spieler.php index 1f5b0f10..201e8aea 100644 --- a/spieler.php +++ b/spieler.php @@ -166,6 +166,10 @@ function med_showDescription(coords, desc_string){ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/statistiken.php b/statistiken.php index 1a08cdef..ccef3161 100644 --- a/statistiken.php +++ b/statistiken.php @@ -176,6 +176,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/support.php b/support.php index 00655677..2d681101 100644 --- a/support.php +++ b/support.php @@ -146,6 +146,10 @@ function chkFormular () { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/version.php b/version.php index 91ffbce9..efd227f8 100644 --- a/version.php +++ b/version.php @@ -113,6 +113,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/warsim.php b/warsim.php index d8b069c8..b9de15fe 100644 --- a/warsim.php +++ b/warsim.php @@ -170,6 +170,10 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); +if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); +} ?>
diff --git a/winner.php b/winner.php index bddb0184..52c4bfc7 100644 --- a/winner.php +++ b/winner.php @@ -230,6 +230,10 @@ function mysqli_result($res, $row, $field = 0) { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); + if(!NEW_FUNCTIONS_DISPLAY_LINKS) { + echo "



"; + include("Templates/links.tpl"); + } ?>