diff --git a/Admin/Templates/[]inactive.tpl b/Admin/Templates/[]inactive.tpl index 14ad4f2f..9a253efb 100644 --- a/Admin/Templates/[]inactive.tpl +++ b/Admin/Templates/[]inactive.tpl @@ -65,11 +65,11 @@ error_reporting(0); ".$active[$i]['username']." [".$active[$i]['access']."] ".date("H:i:s",$active[$i]['timestamp'])." - img/u/".$img."9.gif\" title=\"$tribe\" alt=\"$tribe\"> + \"$tribe\" ".$totalpop." ".count($varray)." \"Gold\" ".$active[$i]['gold']." - img/a/online1.gif\"> + "; } ?> diff --git a/Admin/Templates/alliance.tpl b/Admin/Templates/alliance.tpl index deb4a75a..3e1d41ac 100644 --- a/Admin/Templates/alliance.tpl +++ b/Admin/Templates/alliance.tpl @@ -271,8 +271,8 @@ if($_GET['aid']) if($row['type'] == 1) { $type = 'Confederation Pact'; } if($row['type'] == 2) { $type = 'Non Agression Pact'; } if($row['type'] == 3) { $type = 'Declaration of War'; } - if($row['accepted'] == 0) { $accepted = "img/a/del.gif\">"; } - if($row['accepted'] ==1) { $accepted = "img/a/acc.gif\">"; } + if($row['accepted'] == 0) { $accepted = ""; } + if($row['accepted'] ==1) { $accepted = ""; } $ally = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli2']."")); echo ' @@ -306,8 +306,8 @@ if($_GET['aid']) if($row['type'] == 1) { $type = 'Confederation Pact'; } if($row['type'] == 2) { $type = 'Non Agression Pact'; } if($row['type'] == 3) { $type = 'Declaration of War'; } - if($row['accepted'] == 0) { $accepted = "img/a/del.gif\">"; } - if($row['accepted'] ==1) { $accepted = "img/a/acc.gif\">"; } + if($row['accepted'] == 0) { $accepted = ""; } + if($row['accepted'] ==1) { $accepted = ""; } $ally = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli1']."")); echo ' @@ -342,8 +342,8 @@ if($_GET['aid']) if($row['type'] == 1) { $type = 'Confederation Pact'; } if($row['type'] == 2) { $type = 'Non Agression Pact'; } if($row['type'] == 3) { $type = 'Declaration of War'; } - if($row['accepted'] == 0) { $accepted = "img/a/del.gif\">"; } - if($row['accepted'] == 1) { $accepted = "img/a/acc.gif\">"; } + if($row['accepted'] == 0) { $accepted = ""; } + if($row['accepted'] == 1) { $accepted = ""; } $ally1 = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli1']."")); $ally2 = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli2']."")); @@ -351,7 +351,7 @@ if($_GET['aid']) '.$ally1['tag'].' & '.$ally2['tag'].' '.$type.' - + '; } ?> diff --git a/Admin/Templates/allymedals.tpl b/Admin/Templates/allymedals.tpl index f13937a3..9b5e9ce3 100644 --- a/Admin/Templates/allymedals.tpl +++ b/Admin/Templates/allymedals.tpl @@ -48,9 +48,9 @@ $rank $week $points - img/t/".$medal['img'].".jpg\"> + - img/a/del.gif'); height: 12px; width: 12px;\" src=\"../img/a/x.gif\"> + "; } @@ -80,7 +80,7 @@
- +
diff --git a/Admin/Templates/delallymedal.tpl b/Admin/Templates/delallymedal.tpl index 4d04532b..d80bba8b 100644 --- a/Admin/Templates/delallymedal.tpl +++ b/Admin/Templates/delallymedal.tpl @@ -80,7 +80,7 @@ $nummedals = mysql_num_rows($sql); echo " $newweek $tot - img/a/del.gif'); height: 12px; width: 12px;\" src=\"../img/a/x.gif\">"; + "; } ?> @@ -139,7 +139,7 @@ $nummedals = mysql_num_rows($sql); $i [#$bb] - img/t/".$row['img'].".jpg\"> + $alliance $rank $week diff --git a/Admin/Templates/delmedal.tpl b/Admin/Templates/delmedal.tpl index 5c90e3a9..34a02338 100644 --- a/Admin/Templates/delmedal.tpl +++ b/Admin/Templates/delmedal.tpl @@ -80,7 +80,7 @@ $nummedals = mysql_num_rows($sql); $sql = mysql_query("SELECT * FROM ".TB_PREFIX."medal WHERE week = $newweek"); $tot = mysql_num_rows($sql); - echo "$newweek$totimg/a/del.gif'); height: 12px; width: 12px;\" src=\"../img/a/x.gif\">"; + echo "$newweek$tot"; } ?> @@ -152,7 +152,7 @@ $nummedals = mysql_num_rows($sql); $i [#$bb] - img/t/".$row['img'].".jpg\"> + $player $rank $week diff --git a/Admin/Templates/maintenence.tpl b/Admin/Templates/maintenence.tpl index ce256a5d..b51be123 100644 --- a/Admin/Templates/maintenence.tpl +++ b/Admin/Templates/maintenence.tpl @@ -2,7 +2,7 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename maintenence.tpl ## +## Filename editVillage.tpl ## ## Developed by: aggenkeech ## ## License: TravianX Project ## ## Copyright: TravianX (c) 2010-2012. All rights reserved. ## @@ -22,11 +22,11 @@ Close Server for Maintenece, This will ban all players (Access 2) till you can fix bugs, or a crap version of a ceasefire lol -
+
Bring Server Back for Maintenece, This will unban all players (By Banning Reason) -
+
diff --git a/Admin/Templates/maintenenceBan.tpl b/Admin/Templates/maintenenceBan.tpl index 73c33d9b..b2770c74 100644 --- a/Admin/Templates/maintenenceBan.tpl +++ b/Admin/Templates/maintenenceBan.tpl @@ -2,7 +2,7 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename maintenenceBan.tpl ## +## Filename editVillage.tpl ## ## Developed by: aggenkeech ## ## License: TravianX Project ## ## Copyright: TravianX (c) 2010-2012. All rights reserved. ## diff --git a/Admin/Templates/maintenenceResetGold.tpl b/Admin/Templates/maintenenceResetGold.tpl index 19d774b4..775454c4 100644 --- a/Admin/Templates/maintenenceResetGold.tpl +++ b/Admin/Templates/maintenenceResetGold.tpl @@ -15,9 +15,9 @@ Reset All Players Gold - + - +
diff --git a/Admin/Templates/maintenenceResetPlus.tpl b/Admin/Templates/maintenenceResetPlus.tpl index b3b13c65..07db194e 100644 --- a/Admin/Templates/maintenenceResetPlus.tpl +++ b/Admin/Templates/maintenenceResetPlus.tpl @@ -15,9 +15,9 @@ Reset All Players Resource Bonus - + - +
diff --git a/Admin/Templates/maintenenceResetPlusBonus.tpl b/Admin/Templates/maintenenceResetPlusBonus.tpl index d19f613c..08a98564 100644 --- a/Admin/Templates/maintenenceResetPlusBonus.tpl +++ b/Admin/Templates/maintenenceResetPlusBonus.tpl @@ -15,9 +15,9 @@ Reset All Players Plus - + - +
diff --git a/Admin/Templates/maintenenceUnban.tpl b/Admin/Templates/maintenenceUnban.tpl index b342cece..30a0458a 100644 --- a/Admin/Templates/maintenenceUnban.tpl +++ b/Admin/Templates/maintenenceUnban.tpl @@ -2,7 +2,7 @@ ################################################################################# ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## -## Filename maintenenceUnban.tpl ## +## Filename editVillage.tpl ## ## Developed by: aggenkeech ## ## License: TravianX Project ## ## Copyright: TravianX (c) 2010-2012. All rights reserved. ## @@ -78,7 +78,7 @@ $bannedUsers = $admin->search_banned(); '.$link.' '.date("d.m.y H:i",$bannedUsers[$i]['time']).' - '.$end.' '.$bannedUsers[$i]['reason'].' - cancel + cancel '; } } diff --git a/Admin/Templates/playeradditionalinfo.tpl b/Admin/Templates/playeradditionalinfo.tpl index 7d7c3fd0..687decfe 100644 --- a/Admin/Templates/playeradditionalinfo.tpl +++ b/Admin/Templates/playeradditionalinfo.tpl @@ -50,7 +50,7 @@ Give how much Gold? - + getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } @@ -172,7 +172,7 @@ Add how many CP? - + diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl index 6d67043e..04db397c 100644 --- a/Admin/Templates/playerinfo.tpl +++ b/Admin/Templates/playerinfo.tpl @@ -172,6 +172,15 @@ elseif($quest ==20) {$questname = "Economy: Warehouse"; } elseif($quest ==21) {$questname = "Economy: Marketplace"; } elseif($quest ==22) {$questname = "Everything to 2!"; } + elseif($quest ==28) {$questname = "Alliance : Join to one"; } + elseif($quest ==29) {$questname = "Main Building to 5"; } + elseif($quest ==30) {$questname = "Granary to Level 3"; } + elseif($quest ==31) {$questname = "Warehouse to Level 7"; } + elseif($quest ==32) {$questname = "Everything to 5!"; } + elseif($quest ==33) {$questname = "Palace or Residence"; } + elseif($quest ==34) {$questname = "3 settlers"; } + elseif($quest ==35) {$questname = "New Village"; } + elseif($quest ==36) {$questname = "Build a Wall/Palisade"; } else { $questname = "Unknown"; } $quesst = $quest; if($quest > 18){ @@ -231,11 +240,11 @@ - » Edit Overall Off & Def + » Edit Overall Off & Def - » Edit Weekly Off, Def, Raid + » Edit Weekly Off, Def, Raid diff --git a/Admin/Templates/playermedals.tpl b/Admin/Templates/playermedals.tpl index 538be353..58c1cd12 100644 --- a/Admin/Templates/playermedals.tpl +++ b/Admin/Templates/playermedals.tpl @@ -53,9 +53,9 @@ $rank $week $points - img/t/".$medal['img'].".jpg\"> + - img/a/del.gif'); height: 12px; width: 12px;\" src=\"../img/a/x.gif\"> + "; } @@ -84,7 +84,7 @@
- +
diff --git a/Admin/Templates/playerplusbonus.tpl b/Admin/Templates/playerplusbonus.tpl index 836c1278..4881799f 100644 --- a/Admin/Templates/playerplusbonus.tpl +++ b/Admin/Templates/playerplusbonus.tpl @@ -19,7 +19,7 @@ { $tsdiffact = $datetime - $now; $timetoecho = $timeformat->getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } @@ -56,7 +56,7 @@ { $tsdiffact = $datetime - $now; $timetoecho = $timeformat->getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } @@ -93,7 +93,7 @@ { $tsdiffact = $datetime - $now; $timetoecho = $timeformat->getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } @@ -131,7 +131,7 @@ { $tsdiffact = $datetime - $now; $timetoecho = $timeformat->getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } @@ -169,7 +169,7 @@ { $tsdiffact = $datetime - $now; $timetoecho = $timeformat->getTimeFormat($tsdiffact); - echo ''; + echo ''; echo " $timetoecho"; } } diff --git a/Admin/Templates/results_villages.tpl b/Admin/Templates/results_villages.tpl index 7ab5f027..4e831934 100644 --- a/Admin/Templates/results_villages.tpl +++ b/Admin/Templates/results_villages.tpl @@ -63,7 +63,7 @@ $result = $admin->search_village($_POST['s']); - +
'.count($result).' Villages Found "'.$_POST['s'].'"
@@ -79,7 +79,7 @@ $result = $admin->search_village($_POST['s']); - +
No Villages Called '.$_POST['s'].'
diff --git a/Admin/Templates/troops.tpl b/Admin/Templates/troops.tpl index e98a1f2c..17d1db4e 100644 --- a/Admin/Templates/troops.tpl +++ b/Admin/Templates/troops.tpl @@ -207,16 +207,16 @@ echo ' -
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
'.$u31.' @@ -237,16 +237,16 @@ echo ' -
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index 80e854d9..1ac5336c 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -76,7 +76,7 @@ if(isset($id)) Village owner: -
+ Owner(uid): @@ -84,7 +84,7 @@ if(isset($id)) Village name: - + @@ -133,7 +133,7 @@ if(isset($id)) Resource - + Server Info Online Users Players Not Activated + Players Inactivate + Players Reported + Map
Search General Search @@ -132,7 +135,8 @@ $up_avl = $latest - $ver ; Give All Res Bonus Reset Res Bonus
- Natars + Natars&Oasis + Populate Oases Add WW Villages Add WW Building Plan Villages
diff --git a/GameEngine/Admin/Mods/mainteneceBan.php b/GameEngine/Admin/Mods/mainteneceBan.php index 8ed20b06..b45ad0e0 100644 --- a/GameEngine/Admin/Mods/mainteneceBan.php +++ b/GameEngine/Admin/Mods/mainteneceBan.php @@ -42,8 +42,8 @@ for($i = 0; $i < $loops + 1; $i++) $result = mysql_query($query); while($row = mysql_fetch_assoc($result)) { - ##mysql_query("INSERT INTO ".TB_PREFIX."banlist ".$row['id'].", ".$row['username'].", ".$reason.", ".$startts.", ".$endts.", ".$admin.", ".$active.""); - mysql_query("INSERT INTO ".TB_PREFIX."banlist (`uid`, `name`, `reason`, `time`, `end`, `admin`, `active`) VALUES (".$row['id'].", '".$row['username']."' , '$reason', '$startts', '$endts', '$admin', '1')"); + mysql_query("INSERT INTO ".TB_PREFIX."banlist ".$row['id'].", ".$row['username'].", ".$reason.", ".$startts.", ".$endts.", ".$admin.", ".$active.""); + ##mysql_query("INSERT INTO ".TB_PREFIX."banlist (`uid`, `name`, `reason`, `time`, `end`, `admin`, `active`) VALUES (".$row['id'].", '".$row['username']."' , '$reason', '$startts', '$endts', '$admin', '1')"); } } diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php index 92c3b551..dc35d3cd 100644 --- a/GameEngine/Admin/Mods/natarbuildingplan.php +++ b/GameEngine/Admin/Mods/natarbuildingplan.php @@ -41,7 +41,7 @@ for($i=1;$i<=$amt;$i++) { $myFile = "../../../Templates/text.tpl"; $fh = fopen($myFile, 'w') or die("


Can't open file: templates/text.tpl"); $text = file_get_contents("../../../Templates/text_format.tpl"); - $text = preg_replace("'%TEKST%'","World Wonder Construction Plans + $text = preg_replace("'%TEKST%'","World Wonder Construction Plans Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. diff --git a/GameEngine/Admin/admin.php b/GameEngine/Admin/admin.php index ad74c3c4..a335f609 100644 --- a/GameEngine/Admin/admin.php +++ b/GameEngine/Admin/admin.php @@ -1,4 +1,4 @@ - CheckLogin()){?> - ACP Home Homepage Server Info + ACP Home Homepage Server Info Online users Search Msg/Rep Ban Config - Config Editor + Config Editor Logout