From 786cbf1f8eb8fd5d88b93639278fc7e27a81d63f Mon Sep 17 00:00:00 2001 From: Neranjen Date: Mon, 18 Jun 2012 05:06:05 +0530 Subject: [PATCH] Big Cleanup 1) Removed unnecessary files 2) Trailling spaces (no all though) 3) Some space to tab conversion --- .htaccess | 8 +- AC_OETags.js | 24 +- Admin/Mods/addTroops.php | 10 +- Admin/Templates/404.tpl | 2 +- Admin/Templates/Newmessage.tpl | 22 +- Admin/Templates/[]inactive.tpl | 18 +- Admin/Templates/addTroops.tpl | 342 +- Admin/Templates/add_village.tpl | 8 +- Admin/Templates/admin_log.tpl | 13 +- Admin/Templates/alliance.tpl | 56 +- Admin/Templates/allymedals.tpl | 14 +- Admin/Templates/backup/admin_menu.tpl | 9 +- Admin/Templates/backup/bug_report.tpl | 52 +- Admin/Templates/backup/config.tpl | 48 +- Admin/Templates/backup/edit_ally.tpl | 58 +- Admin/Templates/backup/edit_user.tpl | 82 +- Admin/Templates/backup/online_players.tpl | 74 +- Admin/Templates/backup/results.tpl | 176 +- Admin/Templates/backup/search.tpl | 6 +- Admin/Templates/backup/show_user.tpl | 228 +- Admin/Templates/backup/show_village.tpl | 194 +- Admin/Templates/backup/user_log_login.tpl | 42 +- Admin/Templates/ban.tpl | 32 +- Admin/Templates/ban_msg.tpl | 6 +- Admin/Templates/config.tpl | 324 +- Admin/Templates/delallymedal.tpl | 14 +- Admin/Templates/deletion.tpl | 26 +- Admin/Templates/delmedal.tpl | 18 +- Admin/Templates/editAccess.tpl | 6 +- Admin/Templates/editOverall.tpl | 2 +- Admin/Templates/editPassword.tpl | 4 +- Admin/Templates/editPlus.tpl | 4 +- Admin/Templates/editProtection.tpl | 2 +- Admin/Templates/editResources.tpl | 16 +- Admin/Templates/editSitter.tpl | 2 +- Admin/Templates/editUser.tpl | 22 +- Admin/Templates/editVillage.tpl | 36 +- Admin/Templates/editWeek.tpl | 2 +- Admin/Templates/givePlus.tpl | 4 +- Admin/Templates/givePlusRes.tpl | 10 +- Admin/Templates/gold.tpl | 4 +- Admin/Templates/home.tpl | 20 +- Admin/Templates/login.tpl | 2 +- Admin/Templates/maintenenceResetGold.tpl | 4 +- Admin/Templates/maintenenceResetPlus.tpl | 4 +- Admin/Templates/maintenenceResetPlusBonus.tpl | 4 +- Admin/Templates/map.tpl | 22 +- Admin/Templates/message.tpl | 28 +- Admin/Templates/msg.tpl | 10 +- Admin/Templates/natarbuildingplan.tpl | 4 +- Admin/Templates/natarend.tpl | 4 +- Admin/Templates/notregistered.tpl | 2 +- Admin/Templates/oasis.tpl | 4 +- Admin/Templates/online.tpl | 64 +- Admin/Templates/player.tpl | 14 +- Admin/Templates/playeradditionalinfo.tpl | 40 +- Admin/Templates/playerinfo.tpl | 46 +- Admin/Templates/playermedals.tpl | 14 +- Admin/Templates/playerplusbonus.tpl | 8 +- Admin/Templates/punish.tpl | 8 +- Admin/Templates/renameVillage.tpl | 14 +- Admin/Templates/report.tpl | 4 +- Admin/Templates/resetPlus.tpl | 4 +- Admin/Templates/resetPlusBonus.tpl | 4 +- Admin/Templates/results_alliances.tpl | 56 +- Admin/Templates/results_email.tpl | 52 +- Admin/Templates/results_ip.tpl | 74 +- Admin/Templates/results_player.tpl | 56 +- Admin/Templates/results_villages.tpl | 12 +- Admin/Templates/search.tpl | 6 +- Admin/Templates/search2.tpl | 22 +- Admin/Templates/server_info.tpl | 354 +- Admin/Templates/troops.tpl | 28 +- Admin/Templates/usergold.tpl | 4 +- Admin/Templates/userillegallog.tpl | 2 +- Admin/Templates/userlogin.tpl | 2 +- Admin/Templates/village.tpl | 70 +- Admin/Templates/villages.tpl | 50 +- Admin/_notes/dwsync.xml | 4 - Admin/admin.php | 44 +- Admin/database.php | 356 +- Admin/function.php | 176 +- Admin/welcome.tpl | 2 +- GameEngine/Account.php | 460 +- GameEngine/Admin/Mods/addTroops.php | 2 +- GameEngine/Admin/Mods/natarbuildingplan.php | 36 +- GameEngine/Admin/Mods/natarend.php | 36 +- GameEngine/Admin/Mods/populateOases.php | 4 +- GameEngine/Admin/Mods/recalcWH.php | 162 +- GameEngine/Admin/_notes/dwsync.xml | 4 - GameEngine/Admin/admin.php | 90 +- GameEngine/Admin/database.php | 326 +- GameEngine/Admin/function.php | 176 +- GameEngine/Admin/welcome.tpl | 2 +- GameEngine/Alliance.php | 700 +- GameEngine/Automation.php | 5784 +++--- GameEngine/Battle.php | 1714 +- GameEngine/Building.php | 84 +- GameEngine/Chat.php | 142 +- GameEngine/Data/buidata.php | 2 +- GameEngine/Data/hero_full.php | 132 +- GameEngine/Data/hunitdata.php | 8 +- GameEngine/Data/resdata.php | 8 +- GameEngine/Data/unitdata.php | 4 +- GameEngine/Database/db_MYSQL.php | 6237 +++--- GameEngine/Form.php | 20 +- GameEngine/Game/WorldWonderName.php | 6 +- GameEngine/Generator.php | 116 +- GameEngine/Lang/en.php | 58 +- GameEngine/Lang/es.php | 4 +- GameEngine/Lang/ru.php | 70 +- GameEngine/Logging.php | 18 +- GameEngine/Market.php | 506 +- GameEngine/Message.php | 878 +- GameEngine/Multisort.php | 10 +- .../53038fc5cf739e9208444d036d8233c0.txt | 1 - GameEngine/Profile.php | 2 +- GameEngine/Protection.php | 2 +- GameEngine/Ranking.php | 932 +- GameEngine/Session.php | 273 +- GameEngine/Technology.php | 274 +- GameEngine/Units.php | 320 +- GameEngine/Village.php | 66 +- GameEngine/functions.php | 4 +- a2b.php | 134 +- activate.php | 146 +- ajax.php | 2 +- allianz.php | 302 +- anleitung.php | 84 +- anmelden.php | 20 +- banned.php | 12 +- berichte.php | 22 +- build.php | 262 +- create_account.php | 552 +- crop_finder.php | 256 +- dorf1.php | 14 +- dorf2.php | 14 +- dorf3.php | 46 +- img/admin/Thumbs.db | Bin 31744 -> 46592 bytes img/admin/b/Thumbs.db | Bin 12800 -> 12800 bytes img/admin/icon/Thumbs.db | Bin 6144 -> 6144 bytes img/admin/r/Thumbs.db | Bin 23040 -> 23040 bytes index.php | 364 +- install/data/constant_format.tpl | 2 +- install/include/database.php | 32 +- install/include/multihunter.php | 46 +- install/include/oasis.php | 28 +- install/include/wdata.php | 4 +- install/index.php | 148 +- install/process.php | 228 +- install/templates/config.tpl | 32 +- install/templates/end.tpl | 2 +- install/templates/greet.tpl | 16 +- install/templates/menu.tpl | 8 +- install/templates/multihunter.tpl | 8 +- install/templates/script.tpl | 260 +- karte.php | 18 +- karte2.php | 94 +- login.php | 32 +- logout.php | 10 +- manual.php | 12 +- massmessage.php | 124 +- medals.php | 672 +- mt-full.js | 2 +- nachrichten.php | 18 +- new.js | 718 +- new2.js | 178 +- .../notification_v1_zzjhons/img/Thumbs.db | Bin 0 -> 6656 bytes .../img/layout/Thumbs.db | Bin 0 -> 6656 bytes .../img/round/bg/Thumbs.db | Bin 0 -> 8704 bytes .../img/round/boxes/Thumbs.db | Bin 0 -> 4096 bytes .../img/round/boxes/gray/Thumbs.db | Bin 0 -> 5120 bytes .../img/round/boxes/green/Thumbs.db | Bin 0 -> 5632 bytes .../img/round/boxes/lightGreen/Thumbs.db | Bin 0 -> 5632 bytes .../img/round/boxes/orange/Thumbs.db | Bin 0 -> 5632 bytes .../img/round/boxes/red/Thumbs.db | Bin 0 -> 5632 bytes .../img/screens/Thumbs.db | Bin 0 -> 7680 bytes .../lang/en/b/Thumbs.db | Bin 0 -> 4608 bytes .../lang/en/f/Thumbs.db | Bin 0 -> 24576 bytes notification/img/Thumbs.db | Bin 0 -> 3072 bytes notification/index.php | 208 +- oasis_populate.php | 22 +- password.php | 14 +- plus.php | 14 +- rules.php | 14 +- spieler.php | 16 +- statistiken.php | 110 +- sysmsg.php | 102 +- terms.php | 6 +- testmysql.php | 14 +- tutorial.php | 86 +- uncrypt.js | 15662 ++++++++-------- unx.js | 4 +- warsim.php | 174 +- winner.php | 2300 +-- 195 files changed, 23522 insertions(+), 23537 deletions(-) delete mode 100644 Admin/_notes/dwsync.xml delete mode 100644 GameEngine/Admin/_notes/dwsync.xml delete mode 100644 GameEngine/Notes/53038fc5cf739e9208444d036d8233c0.txt create mode 100644 notification/gpack/notification_v1_zzjhons/img/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/layout/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/bg/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/gray/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/green/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/lightGreen/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/orange/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/round/boxes/red/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/img/screens/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/lang/en/b/Thumbs.db create mode 100644 notification/gpack/notification_v1_zzjhons/lang/en/f/Thumbs.db create mode 100644 notification/img/Thumbs.db diff --git a/.htaccess b/.htaccess index 8869ae3a..a63010c1 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ - - Order Deny,Allow - Deny from all - \ No newline at end of file + + Order Deny,Allow + Deny from all + \ No newline at end of file diff --git a/AC_OETags.js b/AC_OETags.js index 8329e72e..a19118c0 100644 --- a/AC_OETags.js +++ b/AC_OETags.js @@ -25,15 +25,15 @@ function ControlVersion() try { // version will be set for 6.X players only axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6"); - + // installed player is some revision of 6.0 // GetVariable("$version") crashes for versions 6.0.22 through 6.0.29, - // so we have to be careful. - + // so we have to be careful. + // default to the first public version version = "WIN 6,0,21,0"; - // throws if AllowScripAccess does not exist (introduced in 6.0r47) + // throws if AllowScripAccess does not exist (introduced in 6.0r47) axo.AllowScriptAccess = "always"; // safe to call for 6.0r47 or greater @@ -73,7 +73,7 @@ function ControlVersion() version = -1; } } - + return version; } @@ -81,13 +81,13 @@ function ControlVersion() function GetSwfVer(id){ // NS/Opera version >= 3 check for Flash plugin in plugin array var flashVer = -1; - + if (navigator.plugins != null && navigator.plugins.length > 0) { if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) { var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : ""; var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description; var descArray = flashDescription.split(" "); - var tempArrayMajor = descArray[2].split("."); + var tempArrayMajor = descArray[2].split("."); var versionMajor = tempArrayMajor[0]; var versionMinor = tempArrayMajor[1]; var versionRevision = descArray[3]; @@ -114,11 +114,11 @@ function GetSwfVer(id){ else if ( isIE && isWin && !isOpera ) { flashVer = ControlVersion(); } - + if(flashVer != -1) { writeFlashTags(id); } - + return flashVer; } @@ -127,15 +127,15 @@ function writeFlashTags(id) { var swfFilename = "stats.swf"; var swfUrlWithGetParameters = swfFilename + "?id=" + id; - + document.writeln("
"); document.writeln(""); document.writeln(""); document.writeln(""); document.writeln(""); document.writeln(" "); document.writeln("
"); -} +} \ No newline at end of file diff --git a/Admin/Mods/addTroops.php b/Admin/Mods/addTroops.php index bf9f4f43..ff81a2d0 100644 --- a/Admin/Mods/addTroops.php +++ b/Admin/Mods/addTroops.php @@ -19,10 +19,10 @@ mysql_select_db(SQL_DB); if ($session->access < ADMIN) die("Access Denied: You are not Admin!"); $id = $_POST['id']; -$village = $database->getVillage($id); -$user = $database->getUserArray($village['owner'],1); -$coor = $database->getCoor($village['wref']); -$varray = $database->getProfileVillages($village['owner']); +$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']); $fdata = $database->getResourceLevel($village['wref']); $units = $database->getUnit($village['wref']); @@ -103,4 +103,4 @@ mysql_query("Insert into ".TB_PREFIX."admin_log values (0,".$_SESSION['id'].",'C header("Location: ../../../Admin/admin.php?p=addTroops&did=".$id."&d"); -?> +?> \ No newline at end of file diff --git a/Admin/Templates/404.tpl b/Admin/Templates/404.tpl index b039f094..076def4b 100644 --- a/Admin/Templates/404.tpl +++ b/Admin/Templates/404.tpl @@ -1,4 +1,4 @@ -getUserArray($id,1); +{ + $user = $database->getUserArray($id,1); $varray = $database->getProfileVillages($id); $varmedal = $database->getProfileMedal($id); ?> - +

Compose New Message to

- +
- +
@@ -53,8 +53,8 @@ if(isset($id))
-
-
+
+
diff --git a/Admin/Templates/[]inactive.tpl b/Admin/Templates/[]inactive.tpl index d537d6b7..14ad4f2f 100644 --- a/Admin/Templates/[]inactive.tpl +++ b/Admin/Templates/[]inactive.tpl @@ -1,4 +1,4 @@ - + .del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} + - +
@@ -33,10 +33,10 @@ error_reporting(0); getUserField($active[$i]['username'],'id',1); @@ -70,8 +70,8 @@ error_reporting(0); - "; - } - ?> + "; + } + ?>
Inactive users
".count($varray)." \"Gold\" ".$active[$i]['gold']." img/a/online1.gif\">
\ No newline at end of file diff --git a/Admin/Templates/addTroops.tpl b/Admin/Templates/addTroops.tpl index f1e94a42..954c0d12 100644 --- a/Admin/Templates/addTroops.tpl +++ b/Admin/Templates/addTroops.tpl @@ -1,11 +1,11 @@ -getVillage($id); - $user = $database->getUserArray($village['owner'],1); - $coor = $database->getCoor($village['wref']); - $varray = $database->getProfileVillages($village['owner']); + $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']); $fdata = $database->getResourceLevel($village['wref']); $units = $database->getUnit($village['wref']); ?> @@ -27,269 +27,269 @@ if(isset($id)) - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Edit troops
Edit troops
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:
   Currently:

diff --git a/Admin/Templates/add_village.tpl b/Admin/Templates/add_village.tpl index cc07c358..100a4a07 100644 --- a/Admin/Templates/add_village.tpl +++ b/Admin/Templates/add_village.tpl @@ -10,17 +10,17 @@ ################################################################################# ?> + .del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} + - +
- + diff --git a/Admin/Templates/admin_log.tpl b/Admin/Templates/admin_log.tpl index 87424b29..9879ab08 100644 --- a/Admin/Templates/admin_log.tpl +++ b/Admin/Templates/admin_log.tpl @@ -3,7 +3,7 @@ - <?php if($_SESSION['access'] == ADMIN){ echo 'Admin Control Panel - TravianX'; } else if($_SESSION['access'] == MULTIHUNTER){ echo 'Multihunter Control Panel - TravianX'; } ?> + <?php if($_SESSION['access'] == ADMIN){ echo 'Admin Control Panel - TravianX'; } else if($_SESSION['access'] == MULTIHUNTER){ echo 'Multihunter Control Panel - TravianX'; } ?> @@ -22,7 +22,7 @@ -getAdminLog()); $log = $database->getAdminLog(); for($i=0;$i<$no;$i++) { @@ -50,7 +50,6 @@ if($_SESSION['access'] < ADMIN) die("Access Denied: You are not Admin!"); ?> ?>
Log:
Date:
- - - - + + + \ No newline at end of file diff --git a/Admin/Templates/alliance.tpl b/Admin/Templates/alliance.tpl index 90ff2e9b..deb4a75a 100644 --- a/Admin/Templates/alliance.tpl +++ b/Admin/Templates/alliance.tpl @@ -1,4 +1,4 @@ -getVSumField($member['id'],"pop"); } ?> - +
Add Village
Coordinates (X|Y)
@@ -65,7 +65,7 @@ if($_GET['aid']) - + @@ -74,7 +74,7 @@ if($_GET['aid']) - + @@ -111,7 +111,7 @@ if($_GET['aid']) '; } ?> - +
Alliance Founder
Alliance Positions
Position:
Capacity @@ -167,8 +167,8 @@ if($_GET['aid'])
- - + + @@ -188,11 +188,11 @@ if($_GET['aid']) $TotalVillages = $database->getProfileVillages($user['id']); echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; echo ""; if($aid == $session->alliance) - { + { if ((time()-600) < $user['timestamp']) { // 0 Min - 10 Min @@ -201,29 +201,29 @@ if($_GET['aid']) elseif ((time()-86400) < $user['timestamp'] && (time()-600) > $user['timestamp']) { // 10 Min - 1 Days - echo ""; + echo ""; } elseif ((time()-259200) < $user['timestamp'] && (time()-86400) > $user['timestamp']) - { + { // 1-3 Days - echo ""; + echo ""; } elseif ((time()-604800) < $user['timestamp'] && (time()-259200) > $user['timestamp']) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } - echo " "; + echo " "; } - ?> + ?>
".$rank.".".$user['username']."".$TotalUserPop."".$user['username']."".$TotalUserPop."".count($TotalVillages)."nownownownownownownownow


- + @@ -249,7 +249,7 @@ if($_GET['aid'])


- +

Not Sure this Diplomacy is correct, but I think it is


@@ -273,7 +273,7 @@ if($_GET['aid']) 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\">"; } - + $ally = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli2']."")); echo ' @@ -286,7 +286,7 @@ if($_GET['aid'])


- + @@ -308,7 +308,7 @@ if($_GET['aid']) 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\">"; } - + $ally = mysql_fetch_assoc(mysql_query("SELECT * FROM ".TB_PREFIX."alidata WHERE id = ".$row['alli1']."")); echo ' @@ -320,9 +320,9 @@ if($_GET['aid']) ?>
- +

- + @@ -344,7 +344,7 @@ if($_GET['aid']) 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\">"; } - + $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']."")); echo ' @@ -357,9 +357,9 @@ if($_GET['aid']) ?>
- +

- + - +
@@ -21,14 +21,14 @@ -
This alliance has no medals yet
0) { - foreach($varmedal as $medal) + foreach($varmedal as $medal) { $titel="Bonus"; - switch ($medal['categorie']) + switch ($medal['categorie']) { case "1": $titel="Attackers"; break; case "2": $titel="Defenders"; break; @@ -41,7 +41,7 @@ $week = $medal['week']; $points = $medal['points']; if($points == '') { $points = "

Bonus

"; } else { $points = $points; } - + echo" @@ -54,7 +54,7 @@ "; } - + $averagerank = 0; foreach($varmedal as $medal) { @@ -73,7 +73,7 @@ } } $average = $averagerank / $i; - echo ""; + echo ""; } ?> - - BugReport(); - - if(count($bug)>0) { - for ($i = 0; $i < count($bug); $i++) { - if($bug[$i]==0){ - $del = ""; - }else{ - $del = ''; - } - $id = $i+1; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo $del; - echo ""; - } + + BugReport(); - } - else { - echo ""; - } - ?> + if(count($bug)>0) { + for ($i = 0; $i < count($bug); $i++) { + if($bug[$i]==0){ + $del = ""; + }else{ + $del = ''; + } + $id = $i+1; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo $del; + echo ""; + } + + } + else { + echo ""; + } + ?>
Alliance Medals ()
This alliance has no medals yet
$title
Average Rank$averageDelete All
Average Rank$averageDelete All diff --git a/Admin/Templates/backup/admin_menu.tpl b/Admin/Templates/backup/admin_menu.tpl index e1815969..4bae4e4f 100644 --- a/Admin/Templates/backup/admin_menu.tpl +++ b/Admin/Templates/backup/admin_menu.tpl @@ -1,8 +1,7 @@

Homepage - Configuration - Search + Configuration + Search Online players - Bug report -

- + Bug report +

\ No newline at end of file diff --git a/Admin/Templates/backup/bug_report.tpl b/Admin/Templates/backup/bug_report.tpl index 919bbe5f..5a123867 100644 --- a/Admin/Templates/backup/bug_report.tpl +++ b/Admin/Templates/backup/bug_report.tpl @@ -7,33 +7,33 @@ $database->BugReportSetViewed(); 		Bug report
PlayerPageReportTimeIP
cancel
".$id.".".$database->getUserField($bug[$i]['user'],'username',0)."".$bug[$i]['page']."".$bug[$i]['report']."".date("H:i d.m.y",$bug[$i]['time'])."".$bug[$i]['ip']."
No bug report
cancel
".$id.".".$database->getUserField($bug[$i]['user'],'username',0)."".$bug[$i]['page']."".$bug[$i]['report']."".date("H:i d.m.y",$bug[$i]['time'])."".$bug[$i]['ip']."
No bug report
diff --git a/Admin/Templates/backup/config.tpl b/Admin/Templates/backup/config.tpl index 9af69ca3..75948858 100644 --- a/Admin/Templates/backup/config.tpl +++ b/Admin/Templates/backup/config.tpl @@ -7,7 +7,7 @@ $database->reload('admin.php?page=1');
- + @@ -20,18 +20,18 @@ $database->reload('admin.php?page=1'); @@ -54,7 +54,7 @@ closedir($handle); - @@ -62,8 +62,8 @@ closedir($handle); @@ -72,63 +72,63 @@ closedir($handle); - - - - - - - - - diff --git a/Admin/Templates/backup/edit_ally.tpl b/Admin/Templates/backup/edit_ally.tpl index c378bb2b..e3ac20ba 100644 --- a/Admin/Templates/backup/edit_ally.tpl +++ b/Admin/Templates/backup/edit_ally.tpl @@ -1,7 +1,7 @@ The user ".$_SESSION['search']." does not exist.

"; - $search = 0; + $search = 0; } else { $search = $_SESSION['search']; @@ -13,35 +13,35 @@ $search = $_SESSION['search']; - - getUsersAll(); - for ($i = 0; $i < count($users); $i++) { - - if(count($users)>0) { - $users[$i]['totalvillage'] = count($database->getVillagesID($users[$i]['id'])); - $users[$i]['totalpop'] = $database->getVSumField($users[$i]['id'],"pop"); - $users[$i]['aname'] = $database->getAllianceName($users[$i]['alliance']); - $id = $i+1; - echo ""; - - echo ""; - echo ""; - echo ""; - echo ""; - - echo ""; + + getUsersAll(); + for ($i = 0; $i < count($users); $i++) { - echo ""; - - - } - - else { - echo ""; - } - } - ?> + if(count($users)>0) { + $users[$i]['totalvillage'] = count($database->getVillagesID($users[$i]['id'])); + $users[$i]['totalpop'] = $database->getVSumField($users[$i]['id'],"pop"); + $users[$i]['aname'] = $database->getAllianceName($users[$i]['alliance']); + $id = $i+1; + echo ""; + + echo ""; + echo ""; + echo ""; + echo ""; + + echo ""; + + echo ""; + + + } + + else { + echo ""; + } + } + ?> diff --git a/Admin/Templates/backup/edit_user.tpl b/Admin/Templates/backup/edit_user.tpl index a8c7776c..9b75286c 100644 --- a/Admin/Templates/backup/edit_user.tpl +++ b/Admin/Templates/backup/edit_user.tpl @@ -19,57 +19,57 @@ $database->reload('?uid='.$uid); ?>
- - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + - + - + - - - - + + - - - + + + + getProfileVillages($uid); - for($i=0;$i<=count($varray)-1;$i++) { - echo ""; - } - ?> - + for($i=0;$i<=count($varray)-1;$i++) { + echo ""; + } + ?> + - -
Player
DetailsDescription
Player
DetailsDescription
Birthday Birthday
Gender - - - -
Location
Gender + + + +
Location
Village name
Village name

- + +

+ diff --git a/Admin/Templates/backup/online_players.tpl b/Admin/Templates/backup/online_players.tpl index 1f5ad37e..73302464 100644 --- a/Admin/Templates/backup/online_players.tpl +++ b/Admin/Templates/backup/online_players.tpl @@ -3,59 +3,59 @@ $ranking->procRankReq($_GET); $ranking->procRank($_POST); if(!is_numeric($_SESSION['search'])) { echo "

The user ".$_SESSION['search']." does not exist.

"; - $search = 0; + $search = 0; } else { $search = $_SESSION['search']; } -?> +?> - - getUsersAll(); - - $holder = array(); - foreach($users as $value) { + + getUsersAll(); + + $holder = array(); + foreach($users as $value) { $value['totalvillage'] = count($database->getVillagesID($value['id'])); $value['totalpop'] = $database->getVSumField($value['id'],"pop"); $value['aname'] = $database->getAllianceName($value['alliance']); array_push($holder,$value); - } - $users = $multisort->sorte($holder, "'totalvillage'", false, 2, "'totalpop'", false, 2); + } + $users = $multisort->sorte($holder, "'totalvillage'", false, 2, "'totalpop'", false, 2); - - for ($i = 0; $i < count($users); $i++) { - - if(count($users)>0) { - /* - $users[$i]['totalvillage'] = count($database->getVillagesID($users[$i]['id'])); - $users[$i]['totalpop'] = $database->getVSumField($users[$i]['id'],"pop"); - $users[$i]['aname'] = $database->getAllianceName($users[$i]['alliance']); - */ - $id = $i+1; - echo ""; - - echo ""; - echo ""; - echo ""; - echo ""; - - echo ""; - echo ""; - - } - - else { - echo ""; - } - } - ?> + for ($i = 0; $i < count($users); $i++) { + + if(count($users)>0) { + /* + $users[$i]['totalvillage'] = count($database->getVillagesID($users[$i]['id'])); + $users[$i]['totalpop'] = $database->getVSumField($users[$i]['id'],"pop"); + $users[$i]['aname'] = $database->getAllianceName($users[$i]['alliance']); + */ + $id = $i+1; + echo ""; + + echo ""; + echo ""; + echo ""; + echo ""; + + echo ""; + + echo ""; + + } + + else { + echo ""; + } + } + ?>
Online players
PlayerAccessGoldEmailAlliancePopulationVillagesTribe
".$id.".".$users[$i]['username']." [".$users[$i]['id']."]".$users[$i]['access']."".$users[$i]['gold']."".$users[$i]['email']."".$users[$i]['aname']."".$users[$i]['totalpop']."".$users[$i]['totalvillage']."".$users[$i]['tribe']."
No users found
".$id.".".$users[$i]['username']." [".$users[$i]['id']."]".$users[$i]['access']."".$users[$i]['gold']."".$users[$i]['email']."".$users[$i]['aname']."".$users[$i]['totalpop']."".$users[$i]['totalvillage']."".$users[$i]['tribe']."
No users found
diff --git a/Admin/Templates/backup/results.tpl b/Admin/Templates/backup/results.tpl index 159478e0..341da51e 100644 --- a/Admin/Templates/backup/results.tpl +++ b/Admin/Templates/backup/results.tpl @@ -4,101 +4,101 @@ Results in - + - PlayerAccessGoldEmailAlliancePopulation - VillagesTribeLast activity'; - - $holder = array(); - foreach($search as $value) { + PlayerAccessGoldEmailAlliancePopulation + VillagesTribeLast activity'; + + $holder = array(); + foreach($search as $value) { $value['totalvillage'] = count($database->getVillagesID($value['id'])); $value['totalpop'] = $database->getVSumField($value['id'],"pop"); $value['aname'] = $database->getAllianceName($value['alliance']); array_push($holder,$value); - } - $search = $multisort->sorte($holder, "'totalvillage'", false, 2, "'totalpop'", false, 2); + } + $search = $multisort->sorte($holder, "'totalvillage'", false, 2, "'totalpop'", false, 2); - - for ($i = 0; $i <= count($search)-1; $i++) { - if($search[$i]['id']==0 or $search[$i]['id']==1){ - $del = ""; - }else{ - $del = 'cancel'; - } - - echo' - '.($i+1).'. - '.$search[$i]['username'].' - '.$search[$i]['access'].' - '.$search[$i]['gold'].' - '.$search[$i]['email'].' - '.$search[$i]['aname'].' - '.$search[$i]['totalpop'].' - '.$search[$i]['totalvillage'].' - '.$search[$i]['tribe'].' - '.date("H:i d.m.y",$search[$i]['timestamp']).' - '.$del.' - - '; - } - } - - if($_GET['search_in']=="village"){ - - foreach ($_GET as $value=>$el) { - if($value!="sort"){ - $page .= $value."=".$el."&"; - } - } - echo ' - Village - Owner - Wood - Clay - Iron - Max store - Crop - Max Crop - Pop - Capital - - '; - - $sort = $_GET['sort']; - if(!$sort){ - $search = $multisort->sorte($search, "'pop'", false, 2); - } - else{ - $search = $multisort->sorte($search, "'$sort'", true, 2); - } - - - for ($i = 0; $i <= count($search)-1; $i++) { - $owner = $database->getUserField($search[$i]['owner'],'username',0); - $owner_id = $database->getUserField($search[$i]['owner'],'id',0); - echo ' - '.($i+1).'. - '.$search[$i]['name'].' - '.$owner.' - '.$search[$i]['wood'].' - '.$search[$i]['clay'].' - '.$search[$i]['iron'].' - '.$search[$i]['maxstore'].' - '.$search[$i]['crop'].' - '.$search[$i]['maxcrop'].' - '.$search[$i]['pop'].' - '.$search[$i]['capital'].' - '; - } - } - - ?> - + for ($i = 0; $i <= count($search)-1; $i++) { + + if($search[$i]['id']==0 or $search[$i]['id']==1){ + $del = ""; + }else{ + $del = 'cancel'; + } + + echo' + '.($i+1).'. + '.$search[$i]['username'].' + '.$search[$i]['access'].' + '.$search[$i]['gold'].' + '.$search[$i]['email'].' + '.$search[$i]['aname'].' + '.$search[$i]['totalpop'].' + '.$search[$i]['totalvillage'].' + '.$search[$i]['tribe'].' + '.date("H:i d.m.y",$search[$i]['timestamp']).' + '.$del.' + + '; + } + } + + if($_GET['search_in']=="village"){ + + foreach ($_GET as $value=>$el) { + if($value!="sort"){ + $page .= $value."=".$el."&"; + } + } + echo ' + Village + Owner + Wood + Clay + Iron + Max store + Crop + Max Crop + Pop + Capital + + '; + + $sort = $_GET['sort']; + if(!$sort){ + $search = $multisort->sorte($search, "'pop'", false, 2); + } + else{ + $search = $multisort->sorte($search, "'$sort'", true, 2); + } + + + for ($i = 0; $i <= count($search)-1; $i++) { + $owner = $database->getUserField($search[$i]['owner'],'username',0); + $owner_id = $database->getUserField($search[$i]['owner'],'id',0); + echo ' + '.($i+1).'. + '.$search[$i]['name'].' + '.$owner.' + '.$search[$i]['wood'].' + '.$search[$i]['clay'].' + '.$search[$i]['iron'].' + '.$search[$i]['maxstore'].' + '.$search[$i]['crop'].' + '.$search[$i]['maxcrop'].' + '.$search[$i]['pop'].' + '.$search[$i]['capital'].' + '; + } + } + + ?> + diff --git a/Admin/Templates/backup/search.tpl b/Admin/Templates/backup/search.tpl index 162f31de..49f03c71 100644 --- a/Admin/Templates/backup/search.tpl +++ b/Admin/Templates/backup/search.tpl @@ -1,4 +1,4 @@ - - - + + - + Reason - - + Duration @@ -61,10 +61,10 @@ echo ''; ?> - + - + @@ -75,7 +75,7 @@ $bannedUsers = $admin->search_banned(); ?> - + @@ -101,7 +101,7 @@ $bannedUsers = $admin->search_banned(); { $name = $database->getUserField($bannedUsers[$i]['uid'],'username',0); $link = ''.$name.''; - } + } if($bannedUsers[$i]['end']) { $end = date("d.m.y H:i",$bannedUsers[$i]['end']); @@ -124,5 +124,5 @@ $bannedUsers = $admin->search_banned(); echo ''; } ?> - +
Bannned Players ()
No Players are Banned
\ No newline at end of file diff --git a/Admin/Templates/ban_msg.tpl b/Admin/Templates/ban_msg.tpl index 53dd1bfd..4818cc90 100644 --- a/Admin/Templates/ban_msg.tpl +++ b/Admin/Templates/ban_msg.tpl @@ -1,4 +1,4 @@ -Stick to the truth and do not make excuses to justify your violation of the rules.
â— Be cooperative and insightful, this might reduce the punishment. -
+
â— If the Multihunter does not answer immediately, then he/she is probably not online. The issue will not be resolved any faster by sending multiple messages, especially if he/she did not even read the first one yet. -
+
â— If you have really been banned unjustly, try to stay calm and polite while talking to the Multihunter and telling him/her about your point of view.

\ No newline at end of file diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index 894aeeca..3e35eba4 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -1,4 +1,4 @@ -




?> + .del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} +

Made by Dzoki

- +
~ Server Settings ~
- - - - - - - - - +
VariableValue
Server Name
- - - - - - - - - - - - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + - - - + + + + + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + +
Server Started
Language
Server Speed
Map Sizex
VariableValue
Troop Speedx
Server Name
Server Started
Language
Server Speed
Map Sizex
Troop Speedx
Village Expanding Speed
Beginners Protection hour/s
Activation MailEnabled"; } else if(AUTH_EMAIL == false){ echo "Disabled"; } ?>
Beginners Protection hour/s
Activation MailEnabled"; } else if(AUTH_EMAIL == false){ echo "Disabled"; } ?>
QuestEnabled"; } else if(QUEST == false) { echo "Disabled"; } ?>
Enabled"; } else if(QUEST == false) { echo "Disabled"; } ?>
Demolish - Level required
Demolish - Level required
World Wonder - StatisticsEnabled"; } else if(WW == false) { echo "Disabled"; } ?>
World Wonder - StatisticsEnabled"; } else if(WW == false) { echo "Disabled"; } ?>
Plus account duration= 86400){ echo ''.(PLUS_TIME/86400).' Days'; } else if(PLUS_TIME < 86400){ echo ''.(PLUS_TIME/3600).' Hours'; } ?>
Plus account duration= 86400){ echo ''.(PLUS_TIME/86400).' Days'; } else if(PLUS_TIME < 86400){ echo ''.(PLUS_TIME/3600).' Hours'; } ?>
+25% production duration= 86400){ echo ''.(PLUS_PRODUCTION/86400).' Days'; } else if(PLUS_PRODUCTION < 86400){ echo ''.(PLUS_PRODUCTION/3600).' Hours'; } ?>
+25% production duration= 86400){ echo ''.(PLUS_PRODUCTION/86400).' Days'; } else if(PLUS_PRODUCTION < 86400){ echo ''.(PLUS_PRODUCTION/3600).' Hours'; } ?>
@@ -96,60 +96,60 @@ if ($_SESSON['access'] == MULTIHUNTER) die("





-
~ Log Settings ~
- - +
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariableValue
Log BuildEnabled"; } else if(LOG_BUILD == false){ echo "Disabled"; } ?>
Log TechnologyEnabled"; } else if(LOG_TECH == false){ echo "Disabled"; } ?>
Log LoginEnabled"; } else if(LOG_LOGIN == false){ echo "Disabled"; } ?>
Log GoldEnabled"; } else if(ALOG_GOLD_FIN == false){ echo "Disabled"; } ?>
Log AdminEnabled"; } else if(LOG_ADMIN == false){ echo "Disabled"; } ?>
Log WarEnabled"; } else if(LOG_WAR == false){ echo "Disabled"; } ?>
Log MarketEnabled"; } else if(LOG_MARKET == false){ echo "Disabled"; } ?>
Log IllegalEnabled"; } else if(LOG_ILLEGAL == false){ echo "Disabled"; } ?>
VariableValue
Log BuildEnabled"; } else if(LOG_BUILD == false){ echo "Disabled"; } ?>
Log TechnologyEnabled"; } else if(LOG_TECH == false){ echo "Disabled"; } ?>
Log LoginEnabled"; } else if(LOG_LOGIN == false){ echo "Disabled"; } ?>
Log GoldEnabled"; } else if(ALOG_GOLD_FIN == false){ echo "Disabled"; } ?>
Log AdminEnabled"; } else if(LOG_ADMIN == false){ echo "Disabled"; } ?>
Log WarEnabled"; } else if(LOG_WAR == false){ echo "Disabled"; } ?>
Log MarketEnabled"; } else if(LOG_MARKET == false){ echo "Disabled"; } ?>
Log IllegalEnabled"; } else if(LOG_ILLEGAL == false){ echo "Disabled"; } ?>
- + -
~ Newsbox Settings ~
- - +
+ + - - - + + + @@ -168,14 +168,14 @@ if ($_SESSON['access'] == MULTIHUNTER) die("





- + - +
VariableValue
VariableValue
Newsbox 1 Enabled"; } else if(NEWSBOX1 == false){ echo "Disabled"; } ?>
Home 2Enabled"; } else if(HOME2 == false){ echo "Disabled"; } ?> Enabled"; } else if(HOME2 == false){ echo "Disabled"; } ?>
Home 3Enabled"; } else if(HOME3 == false){ echo "Disabled"; } ?> Enabled"; } else if(HOME3 == false){ echo "Disabled"; } ?>
- + @@ -183,38 +183,38 @@ if ($_SESSON['access'] == MULTIHUNTER) die("
- - + +
- - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + +
VariableValue
Hostname
VariableValue
DB Username
Hostname
DB Password*********
DB Username
DB Name
DB Password*********
Table Prefix
DB Name
DB Type
Table Prefix
DB Type
- + @@ -223,23 +223,23 @@ if ($_SESSON['access'] == MULTIHUNTER) die("
- +
- - - - - - + + - - - + + + - - - + + + + + + +
VariableValue
Limit MailboxEnabled"; } else if(LIMIT_MAILBOX == false){ echo "Disabled"; } ?>
Value
Max number of mailsLimit mailbox disabled"; } ?>
Limit MailboxEnabled"; } else if(LIMIT_MAILBOX == false){ echo "Disabled"; } ?>
Include Admin in rankEnabled"; } else if(INCLUDE_ADMIN == false){ echo "Disabled"; } ?>
Max number of mailsLimit mailbox disabled"; } ?>
Include Admin in rankEnabled"; } else if(INCLUDE_ADMIN == false){ echo "Disabled"; } ?>
@@ -249,32 +249,32 @@ if ($_SESSON['access'] == MULTIHUNTER) die("





- +
- - - - - - - + + + - - - -
VariableValue
Admin EmailNo admin email defined!"; } else if(ADMIN_EMAIL != ''){ echo ADMIN_EMAIL; } ?>
VariableValue
Admin NameNo admin name defined!"; } else if(ADMIN_NAME != ''){ echo ADMIN_NAME; } ?>
- + Admin Email + No admin email defined!"; } else if(ADMIN_EMAIL != ''){ echo ADMIN_EMAIL; } ?> + + + Admin Name + No admin name defined!"; } else if(ADMIN_NAME != ''){ echo ADMIN_NAME; } ?> + + + $value ) - { - $keyname = ($keys ? $keys . "_" : "") . $key; - if( is_array( $array[$key] ) ) - define_array( $array[$key], $keyname ); - else - define( $keyname, $value ); - } + foreach( $array as $key => $value ) + { + $keyname = ($keys ? $keys . "_" : "") . $key; + if( is_array( $array[$key] ) ) + define_array( $array[$key], $keyname ); + else + define( $keyname, $value ); + } } //define_array($array); -?> +?> \ No newline at end of file diff --git a/Admin/Templates/delallymedal.tpl b/Admin/Templates/delallymedal.tpl index 2f662fcd..4d04532b 100644 --- a/Admin/Templates/delallymedal.tpl +++ b/Admin/Templates/delallymedal.tpl @@ -1,4 +1,4 @@ - Medal Information - + @@ -60,7 +60,7 @@ $nummedals = mysql_num_rows($sql); - +
Medal Week by Week
@@ -94,7 +94,7 @@ $nummedals = mysql_num_rows($sql); - +
All Medals ()
@@ -116,7 +116,7 @@ $nummedals = mysql_num_rows($sql); { $i = $i + 1; $titel="Bonus"; - switch ($row['categorie']) + switch ($row['categorie']) { case "1": $titel="Attackers"; break; case "2": $titel="Defenders"; break; @@ -129,11 +129,11 @@ $nummedals = mysql_num_rows($sql); $points = $row['points']; $bb = $row['id']; $allyid = $row['allyid']; - + $unq = "SELECT name FROM ".TB_PREFIX."alidata WHERE id = ".$allyid.""; $user = mysql_result(mysql_query($unq), 0); $allyname = $user; - + $alliance = ''.$allyname.''; echo" diff --git a/Admin/Templates/deletion.tpl b/Admin/Templates/deletion.tpl index ea9e611c..5176333c 100644 --- a/Admin/Templates/deletion.tpl +++ b/Admin/Templates/deletion.tpl @@ -1,4 +1,4 @@ -getUserArray($_GET['uid'],1); - $varray = $database->getProfileVillages($_GET['uid']); + $user = $database->getUserArray($_GET['uid'],1); + $varray = $database->getProfileVillages($_GET['uid']); if($user) { $totalpop = 0; @@ -21,13 +21,13 @@ if($_GET['uid']) $totalpop += $vil['pop']; } ?> + .del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} + -
+
@@ -57,12 +57,12 @@ if($_GET['uid']) - + @@ -80,7 +80,7 @@ if($_GET['uid'])
Delete player Plus: -
Alliance: getAllianceName($user['alliance']);?>


NOTICE: DELETE ALL PLAYER VILLAGES BELLOW BEFORE DELETING PLAYER!

- + @@ -89,7 +89,7 @@ if($_GET['uid']) - getCoor($varray[$i]['wref']); @@ -108,8 +108,8 @@ if($_GET['uid']) - '; - } + '; + } ?>
Coordinates
'.$varray[$i]['pop'].' Check ('.$coorproc['x'].'|'.$coorproc['y'].') '.$delLink.'
@@ -120,4 +120,4 @@ else { include("404.tpl"); } -?> +?> \ No newline at end of file diff --git a/Admin/Templates/delmedal.tpl b/Admin/Templates/delmedal.tpl index b1eb88d9..5c90e3a9 100644 --- a/Admin/Templates/delmedal.tpl +++ b/Admin/Templates/delmedal.tpl @@ -1,4 +1,4 @@ - Medal Information - + @@ -61,7 +61,7 @@ $nummedals = mysql_num_rows($sql); - +
Medal Week by Week
@@ -76,10 +76,10 @@ $nummedals = mysql_num_rows($sql); for($j = 0; $j<$week; $j++) { $newweek = $j+1; - + $sql = mysql_query("SELECT * FROM ".TB_PREFIX."medal WHERE week = $newweek"); $tot = mysql_num_rows($sql); - + echo ""; } ?> @@ -99,7 +99,7 @@ $nummedals = mysql_num_rows($sql); - +
$newweek$totimg/a/del.gif'); height: 12px; width: 12px;\" src=\"../img/a/x.gif\">
All Medals ()
@@ -121,7 +121,7 @@ $nummedals = mysql_num_rows($sql); { $i = $i + 1; $titel="Bonus"; - switch ($row['categorie']) + switch ($row['categorie']) { case "1": $titel="Attackers"; break; case "2": $titel="Defenders"; break; @@ -142,11 +142,11 @@ $nummedals = mysql_num_rows($sql); $points = $row['points']; $bb = $row['id']; $playerid = $row['userid']; - + $unq = "SELECT username FROM ".TB_PREFIX."users where id = $playerid"; $user = mysql_result(mysql_query($unq), 0); $username = $user; - + $player = "$username"; echo" diff --git a/Admin/Templates/editAccess.tpl b/Admin/Templates/editAccess.tpl index ce010c7e..22359877 100644 --- a/Admin/Templates/editAccess.tpl +++ b/Admin/Templates/editAccess.tpl @@ -1,4 +1,4 @@ -

Players Access Changed'; } diff --git a/Admin/Templates/editOverall.tpl b/Admin/Templates/editOverall.tpl index 0af72057..08a8f544 100644 --- a/Admin/Templates/editOverall.tpl +++ b/Admin/Templates/editOverall.tpl @@ -11,7 +11,7 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); +$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editPassword.tpl b/Admin/Templates/editPassword.tpl index fc86d0c6..9bdc14a3 100644 --- a/Admin/Templates/editPassword.tpl +++ b/Admin/Templates/editPassword.tpl @@ -5,12 +5,12 @@ if(isset($_GET['uid']))
- + - + diff --git a/Admin/Templates/editPlus.tpl b/Admin/Templates/editPlus.tpl index b5d92f1c..0e349bab 100644 --- a/Admin/Templates/editPlus.tpl +++ b/Admin/Templates/editPlus.tpl @@ -11,7 +11,7 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); +$user = $database->getUserArray($id,1); if(isset($id)) { ?> @@ -20,7 +20,7 @@ if(isset($id))

- +
Player
New Password
- + - + - + diff --git a/Admin/Templates/online.tpl b/Admin/Templates/online.tpl index 1d1536bd..035eeb39 100644 --- a/Admin/Templates/online.tpl +++ b/Admin/Templates/online.tpl @@ -1,4 +1,4 @@ -getUserActive(); +$active = $admin->getUserActive(); ?> +.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} + -
diff --git a/Admin/Templates/editProtection.tpl b/Admin/Templates/editProtection.tpl index 0d9d6cde..f59c6dea 100644 --- a/Admin/Templates/editProtection.tpl +++ b/Admin/Templates/editProtection.tpl @@ -11,7 +11,7 @@ $id = $_GET['uid']; $uid = $_GET['uid']; -$user = $database->getUserArray($id,1); +$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editResources.tpl b/Admin/Templates/editResources.tpl index 27a6b0c9..c51e60a5 100644 --- a/Admin/Templates/editResources.tpl +++ b/Admin/Templates/editResources.tpl @@ -11,11 +11,11 @@ $id = $_GET['did']; $village = $database->getVillage($id); -$user = $database->getUserArray($village['owner'],1); -$coor = $database->getCoor($village['wref']); -$varray = $database->getProfileVillages($village['owner']); +$user = $database->getUserArray($village['owner'],1); +$coor = $database->getCoor($village['wref']); +$varray = $database->getProfileVillages($village['owner']); $type = $database->getVillageType($village['wref']); -$fdata = $database->getResourceLevel($village['wref']); +$fdata = $database->getResourceLevel($village['wref']); if(isset($id)) { include("search2.tpl"); ?> @@ -24,19 +24,19 @@ if(isset($id))
- + - + - + @@ -68,7 +68,7 @@ if(isset($id))
Modify Resources
Resource Amount Maximum Capacity
Wood
- +

getUserArray($id,1); +$user = $database->getUserArray($id,1); if(isset($id)) { ?> diff --git a/Admin/Templates/editUser.tpl b/Admin/Templates/editUser.tpl index 21154e5a..f8c6d496 100644 --- a/Admin/Templates/editUser.tpl +++ b/Admin/Templates/editUser.tpl @@ -1,4 +1,4 @@ -getUserArray($id,1); +{ + $user = $database->getUserArray($id,1); $varray = $database->getProfileVillages($id); $varmedal = $database->getProfileMedal($id); ?> - + - - - - - - - - - - - - + + + + + + + + + + + +
IGM/Reports
IGM ID
Report ID
IGM/Reports
IGM ID
Report ID

diff --git a/Admin/Templates/msg.tpl b/Admin/Templates/msg.tpl index 7a6495dd..6224e15b 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -1,4 +1,4 @@ -lang/en/compact.css?f4b7c" rel="stylesheet" type="text/css"> - - + +
- + Send To: getUserField($msg[0]['target'],'username',0);?>
- +

Messages

diff --git a/Admin/Templates/natarbuildingplan.tpl b/Admin/Templates/natarbuildingplan.tpl index 7e7ed61e..d9bdcea3 100644 --- a/Admin/Templates/natarbuildingplan.tpl +++ b/Admin/Templates/natarbuildingplan.tpl @@ -44,8 +44,8 @@ if(isset($_GET['g'])) { - echo '

WW Buidingplan villages Added'; + echo '

WW Buidingplan villages Added'; - } + } ?> \ No newline at end of file diff --git a/Admin/Templates/natarend.tpl b/Admin/Templates/natarend.tpl index 9286c608..ff1b4f38 100644 --- a/Admin/Templates/natarend.tpl +++ b/Admin/Templates/natarend.tpl @@ -44,8 +44,8 @@ if(isset($_GET['g'])) { - echo '

World Wonders Added'; + echo '

World Wonders Added'; - } + } ?> \ No newline at end of file diff --git a/Admin/Templates/notregistered.tpl b/Admin/Templates/notregistered.tpl index 99e1a499..505e5675 100644 --- a/Admin/Templates/notregistered.tpl +++ b/Admin/Templates/notregistered.tpl @@ -14,7 +14,7 @@
Time
Populate Oases
+
- - - - - - - - - - - - - + + + + + + + + + + + +getUserField($active[$i]['username'],'id',1); $varray = $database->getProfileVillages($uid); @@ -47,21 +47,21 @@ foreach($varray as $vil) { $tribe = "Gaul"; } echo ' - - - - - - - - -'; -} + + + + + + + + +'; +} }else{ echo ''; -} +} + +?> -?> -
Online users ()
Name [access]TimeTribePopVillagesGold
Online users ()
Name [access]TimeTribePopVillagesGold
'.$active[$i]['username'].' ['.$active[$i]['access'].']'.date("d.m.y H:i:s",$active[$i]['timestamp']).''.$tribe.''.$totalpop.''.count($varray).'Gold '.$active[$i]['gold'].'
'.$active[$i]['username'].' ['.$active[$i]['access'].']'.date("d.m.y H:i:s",$active[$i]['timestamp']).''.$tribe.''.$totalpop.''.count($varray).'Gold '.$active[$i]['gold'].'
No online users
\ No newline at end of file diff --git a/Admin/Templates/player.tpl b/Admin/Templates/player.tpl index 98529b97..6cab7342 100644 --- a/Admin/Templates/player.tpl +++ b/Admin/Templates/player.tpl @@ -1,4 +1,4 @@ -getProfileMedal($id); - $user = $database->getUserArray($id,1); + $user = $database->getUserArray($id,1); $varray = $database->getProfileVillages($id); $refreshicon = ""; $deletion = false; if($deletion) - { + { include("playerdeletion.tpl"); - } + } include("playerinfo.tpl"); include("playeradditionalinfo.tpl"); echo "
"; include("playermedals.tpl"); include ("villages.tpl"); ?> - +
-
@@ -55,7 +55,7 @@ if(isset($id)) include ('add_village.tpl'); ?>
- + + @@ -8,7 +8,7 @@ - img/new/tick.png" value="submit"> - @@ -64,12 +64,12 @@ - - - "> - @@ -224,7 +224,7 @@ diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl index b7c9a787..0a453709 100644 --- a/Admin/Templates/playerinfo.tpl +++ b/Admin/Templates/playerinfo.tpl @@ -2,7 +2,7 @@ - + @@ -23,11 +23,11 @@ - + - + - + - + - + @@ -140,7 +140,7 @@ */ ?> @@ -185,7 +185,7 @@ - + » Edit User'; - } + } else if($_SESSION['access'] == MULTIHUNTER) { echo ''; @@ -208,41 +208,41 @@ » Delete User'; - } + } else if($_SESSION['access'] == MULTIHUNTER) { echo ''; } ?> - + - + - + - + - + - + - + - + diff --git a/Admin/Templates/playermedals.tpl b/Admin/Templates/playermedals.tpl index 66f5a405..538be353 100644 --- a/Admin/Templates/playermedals.tpl +++ b/Admin/Templates/playermedals.tpl @@ -1,7 +1,7 @@ -
Additional Information
Access - Gold
Sitter 1 + = 1) { echo ''.$database->getUserField($user['sit1'],"username",0).''; - } + } else if($user['sit1'] == 0) { echo 'No Sitter'; @@ -79,12 +79,12 @@
Sitter 2 + = 1) { echo ''.$database->getUserField($user['sit2'],"username",0).''; - } + } else if($user['sit2'] == 0) { echo 'No Sitter'; @@ -145,22 +145,22 @@
Culture Points - - &cp'>
Last Activity -
Total Attack Points -
Player
Details DescriptionTribe
Alliance Age -
Username @@ -111,21 +111,21 @@
Location
Password Change
".$user['email'].""; - echo $link; + echo $link; ?>
» Ban User
» Send Message
» Edit Plus & Bonus
» Edit Sitters
» Edit Overall Off & Def
» Edit Weekly Off, Def, Raid
» User Login Log
» User Illegal Log
+
@@ -18,14 +18,14 @@ -
This player has no medals yet
0) { - foreach($varmedal as $medal) + foreach($varmedal as $medal) { $titel="Bonus"; - switch ($medal['categorie']) + switch ($medal['categorie']) { case "1": $titel="Attackers"; break; case "2": $titel="Defenders"; break; @@ -46,7 +46,7 @@ $week = $medal['week']; $points = $medal['points']; if($points == '') { $points = "

Bonus

"; } else { $points = $points; } - + echo" @@ -59,7 +59,7 @@ "; } - + $averagerank = 0; foreach($varmedal as $medal) { @@ -78,7 +78,7 @@ } } $average = $averagerank / $i; - echo ""; + echo ""; } ?> "; + echo "".date('d.m.Y H:i',$user['b1']+3600*2).""; } */ ?> @@ -104,7 +104,7 @@ } else { - echo "".date('d.m.Y H:i',$user['b2']+3600*2).""; + echo "".date('d.m.Y H:i',$user['b2']+3600*2).""; } */ ?> @@ -142,7 +142,7 @@ } else { - echo "".date('d.m.Y H:i',$user['b3']+3600*2).""; + echo "".date('d.m.Y H:i',$user['b3']+3600*2).""; } */ ?> @@ -180,7 +180,7 @@ } else { - echo "".date('d.m.Y H:i',$user['b4']+3600*2).""; + echo "".date('d.m.Y H:i',$user['b4']+3600*2).""; } */ ?> diff --git a/Admin/Templates/punish.tpl b/Admin/Templates/punish.tpl index 0b0dfa80..0ac9b25b 100644 --- a/Admin/Templates/punish.tpl +++ b/Admin/Templates/punish.tpl @@ -1,4 +1,4 @@ -getUserActive(); ?> + .del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} + @@ -77,7 +77,7 @@ $active = $admin->getUserActive(); diff --git a/Admin/Templates/renameVillage.tpl b/Admin/Templates/renameVillage.tpl index 534297c0..3d958989 100644 --- a/Admin/Templates/renameVillage.tpl +++ b/Admin/Templates/renameVillage.tpl @@ -1,11 +1,11 @@ -getVillage($id); -$user = $database->getUserArray($village['owner'],1); -$coor = $database->getCoor($village['wref']); -$varray = $database->getProfileVillages($village['owner']); +$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']); $fdata = $database->getResourceLevel($village['wref']); $units = $database->getUnit($village['wref']); ?>
Player Medals ()
This player has no medals yet
$title
Average Rank$averageDelete All
Average Rank$averageDelete All diff --git a/Admin/Templates/playerplusbonus.tpl b/Admin/Templates/playerplusbonus.tpl index f7fe34bc..836c1278 100644 --- a/Admin/Templates/playerplusbonus.tpl +++ b/Admin/Templates/playerplusbonus.tpl @@ -66,7 +66,7 @@ } else { - echo "".date('d.m.Y H:i',$user['b1']+3600*2)."
- Empty Warehouses + Empty Warehouses
- + diff --git a/Admin/Templates/report.tpl b/Admin/Templates/report.tpl index 11235596..045b7031 100644 --- a/Admin/Templates/report.tpl +++ b/Admin/Templates/report.tpl @@ -1,4 +1,4 @@ -getUserArray($rep['uid'],1); ?>

Under Construction

diff --git a/Admin/Templates/resetPlus.tpl b/Admin/Templates/resetPlus.tpl index 70e35316..e64693d5 100644 --- a/Admin/Templates/resetPlus.tpl +++ b/Admin/Templates/resetPlus.tpl @@ -1,4 +1,4 @@ -
Plus For Everyone Reset'; } diff --git a/Admin/Templates/resetPlusBonus.tpl b/Admin/Templates/resetPlusBonus.tpl index 9925c9b2..5922434f 100644 --- a/Admin/Templates/resetPlusBonus.tpl +++ b/Admin/Templates/resetPlusBonus.tpl @@ -1,4 +1,4 @@ -
Plus Resource Bonuses For Everyone Reset'; } diff --git a/Admin/Templates/results_alliances.tpl b/Admin/Templates/results_alliances.tpl index 2aa22379..75275b7a 100644 --- a/Admin/Templates/results_alliances.tpl +++ b/Admin/Templates/results_alliances.tpl @@ -1,4 +1,4 @@ -search_alliance($_POST['s']); ?>
Edit Village Name
- - - - + + + +
1 «Found alliances ()» 100
1 «Found alliances ()» 100
- - - - - - - - + + + + + + + - - - - - -'; + + + + + + +'; }} -else{ +else{ echo ' - - - + + + '; } -?> - +?> +
AIDNameTagFounder
AIDNameTagFounder
'.$result[$i]["id"].''.$result[$i]["name"].''.$result[$i]["tag"].''.$database->getUserField($result[$i]["leader"],'username',0).'
'.$result[$i]["id"].''.$result[$i]["name"].''.$result[$i]["tag"].''.$database->getUserField($result[$i]["leader"],'username',0).'
No results
No results
diff --git a/Admin/Templates/results_email.tpl b/Admin/Templates/results_email.tpl index 80936d00..10d2f3c4 100644 --- a/Admin/Templates/results_email.tpl +++ b/Admin/Templates/results_email.tpl @@ -1,4 +1,4 @@ -search_email($_POST['s']); ?> - - - - + + + +
1 «Found emails ()» 100
1 «Found emails ()» 100
- - - - - - - + + + + + + - - - - -'; + + + + + +'; }} -else{ +else{ echo ' - - - + + + '; } -?> - +?> +
UIDNameEmail
UIDNameEmail
'.$result[$i]["id"].''.$database->getUserField($result[$i]["id"],'username',0).''.$result[$i]["email"].'
'.$result[$i]["id"].''.$database->getUserField($result[$i]["id"],'username',0).''.$result[$i]["email"].'
No results
No results
diff --git a/Admin/Templates/results_ip.tpl b/Admin/Templates/results_ip.tpl index 4482a15e..9907236d 100644 --- a/Admin/Templates/results_ip.tpl +++ b/Admin/Templates/results_ip.tpl @@ -1,4 +1,4 @@ - search_ip($_POST['s']); -$newArray = array(); +$newArray = array(); function arr($arr,$el){ global $newArray; for ($i = 0; $i <= count($arr)-1; $i++) { - if(in_array($el,$newArray)){ - return false; - }else{ - array_push($newArray,$el); - return true; - } + if(in_array($el,$newArray)){ + return false; + }else{ + array_push($newArray,$el); + return true; + } +} } -} ?> - - - - + + + +
1 «Found IPs ()» 100
1 «Found IPs ()» 100
- - - - - - + + + + + - - - -'; -} -} -} -else{ -echo ' - - - + + + + '; } -?> - +} +} +else{ +echo ' + + + +'; +} +?> +
IPName
IPName
'.$result[$i]["ip"].''.$database->getUserField($result[$i]["uid"],'username',0).'
No results
'.$result[$i]["ip"].''.$database->getUserField($result[$i]["uid"],'username',0).'
No results
diff --git a/Admin/Templates/results_player.tpl b/Admin/Templates/results_player.tpl index 3fbea5d3..1fd44486 100644 --- a/Admin/Templates/results_player.tpl +++ b/Admin/Templates/results_player.tpl @@ -1,4 +1,4 @@ -search_player($_POST['s']); ?> - - - - + + + +
1 «Found player ()» 100
1 «Found player ()» 100
- - - - - - - - + + + + + + +getProfileVillages($result[$i]["id"]); $totalpop = 0; foreach($varray as $vil) { $totalpop += $vil['pop']; } echo ' - - - - - - -'; + + + + + + +'; }} -else{ +else{ echo ' - - - + + + '; } -?> - +?> +
UIDPlayerVillagesPop
UIDPlayerVillagesPop
'.$result[$i]["id"].''.$result[$i]["username"].''.count($varray).''.$totalpop.'
'.$result[$i]["id"].''.$result[$i]["username"].''.count($varray).''.$totalpop.'
No results
No results
diff --git a/Admin/Templates/results_villages.tpl b/Admin/Templates/results_villages.tpl index 7e5b5ee3..7ab5f027 100644 --- a/Admin/Templates/results_villages.tpl +++ b/Admin/Templates/results_villages.tpl @@ -1,4 +1,4 @@ -search_village($_POST['s']); ID Village Name - Village Owner + Village Owner Population - '; @@ -54,7 +54,7 @@ $result = $admin->search_village($_POST['s']); '.$database->getUserField($result[$i]["owner"],'username',0).' '.$result[$i]["pop"].' '.$delLink.' - '; + '; } echo ' @@ -71,7 +71,7 @@ $result = $admin->search_village($_POST['s']); '; } else - { + { echo ' diff --git a/Admin/Templates/search.tpl b/Admin/Templates/search.tpl index efa2bfa1..7ec7e61c 100644 --- a/Admin/Templates/search.tpl +++ b/Admin/Templates/search.tpl @@ -1,4 +1,4 @@ - Search v1.0 - + - + getRadio('vid',1); ?>>      - + - + @@ -138,8 +138,8 @@ if(NEWSBOX3) { include("Templates/News/newsbox3.tpl"); }
-
- +
+
diff --git a/banned.php b/banned.php index e1f17cea..a5d400e3 100644 --- a/banned.php +++ b/banned.php @@ -1,4 +1,4 @@ -access == BANNED){ <?php echo SERVER_NAME ?> - + @@ -45,7 +45,7 @@ if($session->access == BANNED){ - +
@@ -72,7 +72,7 @@ include("Templates/links.tpl");
- @@ -82,7 +82,7 @@ include("Templates/res.tpl") pageLoadTimeEnd()-$start)*1000); ?> ms - +
@@ -92,5 +92,5 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); diff --git a/berichte.php b/berichte.php index 89b30965..00054e47 100644 --- a/berichte.php +++ b/berichte.php @@ -31,7 +31,7 @@ if(isset($_GET['t'])) { <?php echo SERVER_NAME ?> - + @@ -58,8 +58,8 @@ if(isset($_GET['t'])) { window.addEvent('domready', start); - - + +
@@ -78,12 +78,12 @@ if(isset($_GET['t'])) { | >Miscellaneous plus) { echo "| Archive"; } ?>
-alliance==$_GET['aid']){ @@ -98,7 +98,7 @@ if($_GET['aid']!=0){ } } } -} +} }else if(isset($_GET['vill'])){ if(isset($_GET['id'])) { @@ -124,7 +124,7 @@ if($_GET['aid']!=0){ } ?>
- +
-
@@ -148,7 +148,7 @@ include("Templates/res.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
Server time:
diff --git a/build.php b/build.php index d27a00be..53948aa5 100644 --- a/build.php +++ b/build.php @@ -14,8 +14,8 @@ ob_start(); include_once("GameEngine/Village.php"); include_once("GameEngine/Units.php"); if(isset($_GET['newdid'])) { - $_SESSION['wid'] = $_GET['newdid']; - header("Location: ".$_SERVER['PHP_SELF'].(isset($_GET['id'])?'?id='.$_GET['id']:(isset($_GET['gid'])?'?gid='.$_GET['gid']:''))); + $_SESSION['wid'] = $_GET['newdid']; + header("Location: ".$_SERVER['PHP_SELF'].(isset($_GET['id'])?'?id='.$_GET['id']:(isset($_GET['gid'])?'?gid='.$_GET['gid']:''))); } if(isset($_GET['buildingFinish'])) { if($session->gold >= 2) { @@ -26,28 +26,28 @@ if(isset($_GET['buildingFinish'])) { $start = $generator->pageLoadTimeStart(); $alliance->procAlliForm($_POST); $technology->procTech($_POST); -$market->procMarket($_POST); +$market->procMarket($_POST); if(isset($_GET['gid'])) { - $_GET['id'] = strval($building->getTypeField(preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['gid']))); + $_GET['id'] = strval($building->getTypeField(preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['gid']))); } else if(isset($_POST['id'])) { - $_GET['id'] = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); // WTF is this? + $_GET['id'] = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['id']); // WTF is this? } if(isset($_POST['t'])){ - $_GET['t'] = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['t']); + $_GET['t'] = preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['t']); } if(isset($_GET['id'])) { - if (!ctype_digit(preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['id']))){ - $_GET['id'] = "1"; - } - if($village->resarray['f'.$_GET['id'].'t'] == 17) { - $market->procRemove($_GET); - } - if($village->resarray['f'.$_GET['id'].'t'] == 18) { - $alliance->procAlliance($_GET); - } - if($village->resarray['f'.$_GET['id'].'t'] == 12 || $village->resarray['f'.$_GET['id'].'t'] == 13 || $village->resarray['f'.$_GET['id'].'t'] == 22) { - $technology->procTechno($_GET); - } + if (!ctype_digit(preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['id']))){ + $_GET['id'] = "1"; + } + if($village->resarray['f'.$_GET['id'].'t'] == 17) { + $market->procRemove($_GET); + } + if($village->resarray['f'.$_GET['id'].'t'] == 18) { + $alliance->procAlliance($_GET); + } + if($village->resarray['f'.$_GET['id'].'t'] == 12 || $village->resarray['f'.$_GET['id'].'t'] == 13 || $village->resarray['f'.$_GET['id'].'t'] == 22) { + $technology->procTechno($_GET); + } } if($session->goldclub == 1 && count($session->villages) > 1){ if(isset($_GET['routeid'])){ @@ -84,7 +84,7 @@ if($routeaccess = 1){ } }else{ $route = 0; - header("Location: banned.php"); + header("Location: banned.php"); } } if(isset($_GET['action']) && $_GET['action'] == 'extendRoute') { @@ -109,7 +109,7 @@ if($routeaccess = 1){ } }else{ $route = 0; - header("Location: banned.php"); + header("Location: banned.php"); } } if(isset($_POST['action']) && $_POST['action'] == 'editRoute') { @@ -140,7 +140,7 @@ if($routeaccess = 1){ unset($routeid); }else{ $route = 0; - header("Location: banned.php"); + header("Location: banned.php"); } } if(isset($_GET['action']) && $_GET['action'] == 'delRoute') { @@ -158,20 +158,20 @@ if($routeaccess = 1){ } }else{ $route = 0; - header("Location: banned.php"); + header("Location: banned.php"); } } } } if($session->goldclub == 1 && $session->access != BANNED){ - if(isset($_GET['t'])==99) { + if(isset($_GET['t'])==99) { - if($_GET['action'] == 'addList') { - $create = 1; - }else if($_GET['action'] == 'addraid') { - $create = 2; - }else if($_GET['action'] == 'showSlot' && $_GET['eid']) { - $create = 3; + if($_GET['action'] == 'addList') { + $create = 1; + }else if($_GET['action'] == 'addraid') { + $create = 2; + }else if($_GET['action'] == 'showSlot' && $_GET['eid']) { + $create = 3; }else{ $create = 0; } @@ -181,51 +181,51 @@ if($session->goldclub == 1 && $session->access != BANNED){ if($FLData['owner'] == $session->uid){ $checked[$_GET['slid']] = 1; } - } + } - if($_GET['action'] == 'deleteList') { - $database->delFarmList($_GET['lid'], $session->uid); - header("Location: build.php?id=39&t=99"); - }elseif($_GET['action'] == 'deleteSlot') { - $database->delSlotFarm($_GET['eid']); - header("Location: build.php?id=39&t=99"); - } + if($_GET['action'] == 'deleteList') { + $database->delFarmList($_GET['lid'], $session->uid); + header("Location: build.php?id=39&t=99"); + }elseif($_GET['action'] == 'deleteSlot') { + $database->delSlotFarm($_GET['eid']); + header("Location: build.php?id=39&t=99"); + } if($_POST['action'] == 'startRaid'){ include ("Templates/a2b/startRaid.tpl"); } - + if(isset($_GET['slid']) && is_numeric($_GET['slid'])) { $FLData = $database->getFLData($_GET['slid']); if($FLData['owner'] == $session->uid){ $checked[$_GET['slid']] = 1; } - } - + } + if(isset($_GET['evasion']) && is_numeric($_GET['evasion'])) { $evasionvillage = $database->getVillage($_GET['evasion']); if($evasionvillage['owner'] == $session->uid){ $database->setVillageEvasion($_GET['evasion']); } header("Location: build.php?id=39&t=99"); - } - + } + if(isset($_POST['maxevasion']) && is_numeric($_POST['maxevasion'])) { $database->updateUserField($session->uid, "maxevasion", $_POST['maxevasion'], 1); header("Location: build.php?id=39&t=99"); - } + } } }else{ $create = 0; if($session->access == BANNED){ -header("Location: banned.php"); +header("Location: banned.php"); } } -if (isset($_POST['a']) == 533374 && isset($_POST['id']) == 39){ +if (isset($_POST['a']) == 533374 && isset($_POST['id']) == 39){ if($session->access != BANNED){ - $units->Settlers($_POST); + $units->Settlers($_POST); }else{ -header("Location: banned.php"); +header("Location: banned.php"); } } if($_GET['mode']=='troops' && $_GET['cancel']==1){ @@ -237,26 +237,26 @@ if(($now-$oldmovement[0]['starttime'])<90 && $oldmovement[0]['from'] == $village $qc="SELECT * FROM " . TB_PREFIX . "movement where proc = 0 and moveid = ".$_GET['moveid']; $resultc=$database->query($qc) or die(mysql_error()); - if (mysql_num_rows($resultc)==1){ + if (mysql_num_rows($resultc)==1){ - $q = "UPDATE " . TB_PREFIX . "movement set proc = 1 where proc = 0 and moveid = ".$_GET['moveid']; - $database->query($q); - $end=$now+($now-$oldmovement[0]['starttime']); - //echo "6,".$oldmovement[0]['to'].",".$oldmovement[0]['from'].",0,".$now.",".$end; - $q2 = "SELECT id FROM " . TB_PREFIX . "send ORDER BY id DESC"; - $lastid=mysql_fetch_array(mysql_query($q2)); - $newid=$lastid['id']+1; - $q2 = "INSERT INTO " . TB_PREFIX . "send values ($newid,0,0,0,0,0)"; - $database->query($q2); - $database->addMovement(4,$oldmovement[0]['to'],$oldmovement[0]['from'],$oldmovement[0]['ref'],$now,$end); + $q = "UPDATE " . TB_PREFIX . "movement set proc = 1 where proc = 0 and moveid = ".$_GET['moveid']; + $database->query($q); + $end=$now+($now-$oldmovement[0]['starttime']); + //echo "6,".$oldmovement[0]['to'].",".$oldmovement[0]['from'].",0,".$now.",".$end; + $q2 = "SELECT id FROM " . TB_PREFIX . "send ORDER BY id DESC"; + $lastid=mysql_fetch_array(mysql_query($q2)); + $newid=$lastid['id']+1; + $q2 = "INSERT INTO " . TB_PREFIX . "send values ($newid,0,0,0,0,0)"; + $database->query($q2); + $database->addMovement(4,$oldmovement[0]['to'],$oldmovement[0]['from'],$oldmovement[0]['ref'],$now,$end); - $database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$now,$end); - } + $database->addMovement(6,$oldmovement[0]['to'],$oldmovement[0]['from'],$newid,$now,$end); + } } header("Location: ".$_SERVER['PHP_SELF']."?id=".$_GET['id']); }else{ -header("Location: banned.php"); +header("Location: banned.php"); } } if(isset($_GET['id'])){ @@ -266,84 +266,84 @@ $automation->isWinner(); - <?php echo SERVER_NAME; ?> - - - - - - + <?php echo SERVER_NAME; ?> + + + + + + - - - - - - gpack == null || GP_ENABLE == false) { - echo " - - "; - } else { - echo " - - "; - } - ?> - + + + + + gpack == null || GP_ENABLE == false) { + echo " + + "; + } else { + echo " + + "; + } + ?> + + window.addEvent('domready', start); + - - + +
-
+
resarray['f99t'] == 40){ - include("Templates/Build/ww.tpl"); - } else - if($village->resarray['f'.$_GET['id'].'t'] == 0 && $_GET['id'] >= 19) { - include("Templates/Build/avaliable.tpl"); - } - else { - if(isset($_GET['t'])) { - if($_GET['t'] == 1) { - $_SESSION['loadMarket'] = 1; - } - include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t']."_".$_GET['t'].".tpl"); - } else - if(isset($_GET['s'])) { - include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t']."_".$_GET['s'].".tpl"); - } - else { - include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t'].".tpl"); - } - } + if(isset($_GET['s'])) + { + if (!ctype_digit($_GET['s'])) { + $_GET['s'] = null; + } + } + if(isset($_GET['t'])) + { + if (!ctype_digit($_GET['t'])) { + $_GET['t'] = null; + } + } + if (!ctype_digit($_GET['id'])) { + $_GET['id'] = "1"; + } + $id = $_GET['id']; + if($id=='99' AND $village->resarray['f99t'] == 40){ + include("Templates/Build/ww.tpl"); + } else + if($village->resarray['f'.$_GET['id'].'t'] == 0 && $_GET['id'] >= 19) { + include("Templates/Build/avaliable.tpl"); + } + else { + if(isset($_GET['t'])) { + if($_GET['t'] == 1) { + $_SESSION['loadMarket'] = 1; + } + include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t']."_".$_GET['t'].".tpl"); + } else + if(isset($_GET['s'])) { + include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t']."_".$_GET['s'].".tpl"); + } + else { + include("Templates/Build/".$village->resarray['f'.$_GET['id'].'t'].".tpl"); + } + } }else{ header("Location: dorf1.php"); } @@ -364,9 +364,9 @@ include("Templates/links.tpl");
-
@@ -374,10 +374,10 @@ include("Templates/res.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
Server time:
-
+
diff --git a/create_account.php b/create_account.php index a0851805..07a01f85 100644 --- a/create_account.php +++ b/create_account.php @@ -1,4 +1,4 @@ -access < ADMIN){ - die("Access Denied: You are not Admin!"); + if($session->access < ADMIN){ + die("Access Denied: You are not Admin!"); }else{ $start = $generator->pageLoadTimeStart(); @@ -30,7 +30,7 @@ $start = $generator->pageLoadTimeStart(); <?php echo SERVER_NAME ?> - + @@ -57,7 +57,7 @@ $start = $generator->pageLoadTimeStart(); - +
@@ -72,222 +72,222 @@ $start = $generator->pageLoadTimeStart(); * Functions */ if($_POST['password'] != ""){ - function generateBase($kid, $uid, $username) { - global $database, $message; - if($kid == 0) { - $kid = rand(1, 4); - } else { - $kid = $_POST['kid']; - } + function generateBase($kid, $uid, $username) { + global $database, $message; + if($kid == 0) { + $kid = rand(1, 4); + } else { + $kid = $_POST['kid']; + } - $wid = $database->generateBase($kid); - $database->setFieldTaken($wid); - $database->addVillage($wid, $uid, $username, 1); - $database->addResourceFields($wid, $database->getVillageType($wid)); - $database->addUnits($wid); - $database->addTech($wid); - $database->addABTech($wid); - $database->updateUserField($uid, "access", USER, 1); - $message->sendWelcome($uid, $username); - } + $wid = $database->generateBase($kid); + $database->setFieldTaken($wid); + $database->addVillage($wid, $uid, $username, 1); + $database->addResourceFields($wid, $database->getVillageType($wid)); + $database->addUnits($wid); + $database->addTech($wid); + $database->addABTech($wid); + $database->updateUserField($uid, "access", USER, 1); + $message->sendWelcome($uid, $username); + } /** * Creating account & capital village */ - $username = "Natars"; - $password = md5($_POST['password']); - $email = "natars@noreply.com"; - $tribe = 5; - $desc = "******************** - [#natars] - ********************"; + $username = "Natars"; + $password = md5($_POST['password']); + $email = "natars@noreply.com"; + $tribe = 5; + $desc = "******************** + [#natars] + ********************"; - $q = "INSERT INTO " . TB_PREFIX . "users (id,username,password,access,email,timestamp,tribe,location,act,protect) VALUES (3, '$username', '$password', " . USER . ", '$email', ".time().", $tribe, '', '', 0)"; - mysql_query($q); - unset($q); - $uid = $database->getUserField($username, 'id', 1); - generateBase(0, $uid, $username); - $wid = mysql_fetch_assoc(mysql_query("SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $uid")); - $q = "UPDATE " . TB_PREFIX . "vdata SET pop = 834 WHERE owner = $uid"; - mysql_query($q) or die(mysql_error()); - $q2 = "UPDATE " . TB_PREFIX . "users SET access = 2 WHERE id = $uid"; - mysql_query($q2) or die(mysql_error()); - if(SPEED > 3) { - $speed = 5; - } else { - $speed = SPEED; - } - $q3 = "UPDATE " . TB_PREFIX . "units SET u41 = " . (64700 * $speed) . ", u42 = " . (295231 * $speed) . ", u43 = " . (180747 * $speed) . ", u44 = " . (7 * $speed) . ", u45 = " . (364401 * $speed) . ", u46 = " . (217602 * $speed) . ", u47 = " . (2034 * $speed) . ", u48 = " . (1040 * $speed) . " , u49 = " . (1 * $speed) . ", u50 = " . (9 * $speed) . " WHERE vref = " . $wid['wref'] . ""; - mysql_query($q3) or die(mysql_error()); - $q4 = "UPDATE " . TB_PREFIX . "users SET desc2 = '$desc' WHERE id = $uid"; - mysql_query($q4) or die(mysql_error()); + $q = "INSERT INTO " . TB_PREFIX . "users (id,username,password,access,email,timestamp,tribe,location,act,protect) VALUES (3, '$username', '$password', " . USER . ", '$email', ".time().", $tribe, '', '', 0)"; + mysql_query($q); + unset($q); + $uid = $database->getUserField($username, 'id', 1); + generateBase(0, $uid, $username); + $wid = mysql_fetch_assoc(mysql_query("SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $uid")); + $q = "UPDATE " . TB_PREFIX . "vdata SET pop = 834 WHERE owner = $uid"; + mysql_query($q) or die(mysql_error()); + $q2 = "UPDATE " . TB_PREFIX . "users SET access = 2 WHERE id = $uid"; + mysql_query($q2) or die(mysql_error()); + if(SPEED > 3) { + $speed = 5; + } else { + $speed = SPEED; + } + $q3 = "UPDATE " . TB_PREFIX . "units SET u41 = " . (64700 * $speed) . ", u42 = " . (295231 * $speed) . ", u43 = " . (180747 * $speed) . ", u44 = " . (7 * $speed) . ", u45 = " . (364401 * $speed) . ", u46 = " . (217602 * $speed) . ", u47 = " . (2034 * $speed) . ", u48 = " . (1040 * $speed) . " , u49 = " . (1 * $speed) . ", u50 = " . (9 * $speed) . " WHERE vref = " . $wid['wref'] . ""; + mysql_query($q3) or die(mysql_error()); + $q4 = "UPDATE " . TB_PREFIX . "users SET desc2 = '$desc' WHERE id = $uid"; + mysql_query($q4) or die(mysql_error()); /** * SMALL ARTEFACTS */ - function Artefact($uid, $type, $size, $art_name, $village_name, $desc, $effect, $img) { - global $database; - $kid = rand(1, 4); - $wid = $database->generateBase($kid); - $database->addArtefact($wid, $uid, $type, $size, $art_name, $desc, $effect, $img); - $database->setFieldTaken($wid); - $database->addVillage($wid, $uid, $village_name, '0'); - $database->addResourceFields($wid, $database->getVillageType($wid)); - $database->addUnits($wid); - $database->addTech($wid); - $database->addABTech($wid); - mysql_query("UPDATE " . TB_PREFIX . "vdata SET pop = 163 WHERE wref = $wid"); - mysql_query("UPDATE " . TB_PREFIX . "vdata SET name = '$village_name' WHERE wref = $wid"); - if(SPEED > 3) { - $speed = 5; - } else { - $speed = SPEED; - } - if($size == 1) { - mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(1000, 2000) * $speed) . ", u42 = " . (rand(1500, 2000) * $speed) . ", u43 = " . (rand(2300, 2800) * $speed) . ", u44 = " . (rand(25, 75) * $speed) . ", u45 = " . (rand(1200, 1900) * $speed) . ", u46 = " . (rand(1500, 2000) * $speed) . ", u47 = " . (rand(500, 900) * $speed) . ", u48 = " . (rand(100, 300) * $speed) . " , u49 = " . (rand(1, 5) * $speed) . ", u50 = " . (rand(1, 5) * $speed) . " WHERE vref = " . $wid . ""); - mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 10, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); - } elseif($size == 2) { - mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(2000, 4000) * $speed) . ", u42 = " . (rand(3000, 4000) * $speed) . ", u43 = " . (rand(4600, 5600) * $speed) . ", u44 = " . (rand(50, 150) * $speed) . ", u45 = " . (rand(2400, 3800) * $speed) . ", u46 = " . (rand(3000, 4000) * $speed) . ", u47 = " . (rand(1000, 1800) * $speed) . ", u48 = " . (rand(200, 600) * $speed) . " , u49 = " . (rand(2, 10) * $speed) . ", u50 = " . (rand(2, 10) * $speed) . " WHERE vref = " . $wid . ""); - mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 20, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); - } elseif($size == 3) { - mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(4000, 8000) * $speed) . ", u42 = " . (rand(6000, 8000) * $speed) . ", u43 = " . (rand(9200, 11200) * $speed) . ", u44 = " . (rand(100, 300) * $speed) . ", u45 = " . (rand(4800, 7600) * $speed) . ", u46 = " . (rand(6000, 8000) * $speed) . ", u47 = " . (rand(2000, 3600) * $speed) . ", u48 = " . (rand(400, 1200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(4, 20) * $speed) . " WHERE vref = " . $wid . ""); - mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 20, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); - } - } + function Artefact($uid, $type, $size, $art_name, $village_name, $desc, $effect, $img) { + global $database; + $kid = rand(1, 4); + $wid = $database->generateBase($kid); + $database->addArtefact($wid, $uid, $type, $size, $art_name, $desc, $effect, $img); + $database->setFieldTaken($wid); + $database->addVillage($wid, $uid, $village_name, '0'); + $database->addResourceFields($wid, $database->getVillageType($wid)); + $database->addUnits($wid); + $database->addTech($wid); + $database->addABTech($wid); + mysql_query("UPDATE " . TB_PREFIX . "vdata SET pop = 163 WHERE wref = $wid"); + mysql_query("UPDATE " . TB_PREFIX . "vdata SET name = '$village_name' WHERE wref = $wid"); + if(SPEED > 3) { + $speed = 5; + } else { + $speed = SPEED; + } + if($size == 1) { + mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(1000, 2000) * $speed) . ", u42 = " . (rand(1500, 2000) * $speed) . ", u43 = " . (rand(2300, 2800) * $speed) . ", u44 = " . (rand(25, 75) * $speed) . ", u45 = " . (rand(1200, 1900) * $speed) . ", u46 = " . (rand(1500, 2000) * $speed) . ", u47 = " . (rand(500, 900) * $speed) . ", u48 = " . (rand(100, 300) * $speed) . " , u49 = " . (rand(1, 5) * $speed) . ", u50 = " . (rand(1, 5) * $speed) . " WHERE vref = " . $wid . ""); + mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 10, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); + } elseif($size == 2) { + mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(2000, 4000) * $speed) . ", u42 = " . (rand(3000, 4000) * $speed) . ", u43 = " . (rand(4600, 5600) * $speed) . ", u44 = " . (rand(50, 150) * $speed) . ", u45 = " . (rand(2400, 3800) * $speed) . ", u46 = " . (rand(3000, 4000) * $speed) . ", u47 = " . (rand(1000, 1800) * $speed) . ", u48 = " . (rand(200, 600) * $speed) . " , u49 = " . (rand(2, 10) * $speed) . ", u50 = " . (rand(2, 10) * $speed) . " WHERE vref = " . $wid . ""); + mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 20, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); + } elseif($size == 3) { + mysql_query("UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(4000, 8000) * $speed) . ", u42 = " . (rand(6000, 8000) * $speed) . ", u43 = " . (rand(9200, 11200) * $speed) . ", u44 = " . (rand(100, 300) * $speed) . ", u45 = " . (rand(4800, 7600) * $speed) . ", u46 = " . (rand(6000, 8000) * $speed) . ", u47 = " . (rand(2000, 3600) * $speed) . ", u48 = " . (rand(400, 1200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(4, 20) * $speed) . " WHERE vref = " . $wid . ""); + mysql_query("UPDATE " . TB_PREFIX . "fdata SET f22t = 27, f22 = 10, f28t = 25, f28 = 20, f19t = 23, f19 = 10, f32t = 23, f32 = 10 WHERE vref = $wid"); + } + } /** * THE ARCHITECTS */ - $desc = 'All buildings in the area of effect are stronger. This means that you will need more catapults to damage buildings protected by this artifacts powers.'; - - - $vname = 'Diamond Chisel'; - $effect = '(4x)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 1, 1, 'The architects slight secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); - } + $desc = 'All buildings in the area of effect are stronger. This means that you will need more catapults to damage buildings protected by this artifacts powers.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Giant Marble Hammer'; - $effect = '(3x)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 1, 2, 'The architects great secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); - } - unset($i); - unset($vname); - unset($effect); - $vname = 'Hemons Scrolls'; - $effect = '(5x)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 1, 3, 'The architects unique secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); - } + $vname = 'Diamond Chisel'; + $effect = '(4x)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 1, 1, 'The architects slight secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); + } + + unset($i); + unset($vname); + unset($effect); + $vname = 'Giant Marble Hammer'; + $effect = '(3x)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 1, 2, 'The architects great secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); + } + + unset($i); + unset($vname); + unset($effect); + $vname = 'Hemons Scrolls'; + $effect = '(5x)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 1, 3, 'The architects unique secret', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type1.gif'); + } /** * MILITARY HASTE */ - $desc = 'All troops in the area of effect move faster.'; + $desc = 'All troops in the area of effect move faster.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Opal Horseshoe'; - $effect = '(2x)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 2, 1, 'The slight titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Opal Horseshoe'; + $effect = '(2x)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 2, 1, 'The slight titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Golden Chariot'; - $effect = '(1.5x)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 2, 2, 'The great titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Golden Chariot'; + $effect = '(1.5x)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 2, 2, 'The great titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Pheidippides Sandals'; - $effect = '(3x)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 2, 3, 'The unique titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Pheidippides Sandals'; + $effect = '(3x)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 2, 3, 'The unique titan boots', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type2.gif'); + } /** * HAWK'S EYESIGHT */ - $desc = 'All spies (Scouts, Pathfinders, and Equites Legati) increase their spying ability. In addition, with all versions of this artifact you can see the incoming TYPE of troops but not how many there are.'; + $desc = 'All spies (Scouts, Pathfinders, and Equites Legati) increase their spying ability. In addition, with all versions of this artifact you can see the incoming TYPE of troops but not how many there are.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Tale of a Rat'; - $effect = '(5x)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 3, 1, 'The eagles slight eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Tale of a Rat'; + $effect = '(5x)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 3, 1, 'The eagles slight eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Generals Letter'; - $effect = '(3x)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 3, 2, 'The eagles great eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Generals Letter'; + $effect = '(3x)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 3, 2, 'The eagles great eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Diary of Sun Tzu'; - $effect = '(10x)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 3, 3, 'The eagles unique eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Diary of Sun Tzu'; + $effect = '(10x)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 3, 3, 'The eagles unique eyes', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type3.gif'); + } /** * THE DIET */ - $desc = 'All troops in the artifacts range consume less wheat, making it possible to maintain a larger army.'; + $desc = 'All troops in the artifacts range consume less wheat, making it possible to maintain a larger army.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Silver Platter'; - $effect = '(50%)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 4, 1, 'Slight diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Silver Platter'; + $effect = '(50%)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 4, 1, 'Slight diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Sacred Hunting Bow'; - $effect = '(25%)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 4, 2, 'Great diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Sacred Hunting Bow'; + $effect = '(25%)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 4, 2, 'Great diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'King Arthurs Chalice'; - $effect = '(50%)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 4, 3, 'Unique diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'King Arthurs Chalice'; + $effect = '(50%)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 4, 3, 'Unique diet control', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type4.gif'); + } /** @@ -295,34 +295,34 @@ if($_POST['password'] != ""){ */ - $desc = 'Troops are built a certain percentage faster within the scope of the artifact.'; + $desc = 'Troops are built a certain percentage faster within the scope of the artifact.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Scribed Soldiers Oath'; - $effect = '(50%)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 5, 1, 'The trainers slight talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Scribed Soldiers Oath'; + $effect = '(50%)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 5, 1, 'The trainers slight talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Declaration of War'; - $effect = '(25%)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 5, 2, 'The trainers great talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Declaration of War'; + $effect = '(25%)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 5, 2, 'The trainers great talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Memoirs of Alexander the Great'; - $effect = '(50%)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 5, 3, 'The trainers unique talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Memoirs of Alexander the Great'; + $effect = '(50%)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 5, 3, 'The trainers unique talent', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type5.gif'); + } /** @@ -330,25 +330,25 @@ if($_POST['password'] != ""){ */ - $desc = 'With this building plan you are able to build the Great Granary or Great Warehouse in the Village with the artifact, or the whole account depending on the artifact. As long as you posses that artifact you are able to build and enlarge those buildings.'; + $desc = 'With this building plan you are able to build the Great Granary or Great Warehouse in the Village with the artifact, or the whole account depending on the artifact. As long as you posses that artifact you are able to build and enlarge those buildings.'; - unset($i); - unset($vname); - unset($effect);; - $vname = 'Builders Sketch'; - $effect = ''; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 6, 1, 'Slight storage masterplan', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type6.gif'); - } + unset($i); + unset($vname); + unset($effect);; + $vname = 'Builders Sketch'; + $effect = ''; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 6, 1, 'Slight storage masterplan', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type6.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Babylonian Tablet'; - $effect = ''; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 6, 2, 'Great storage masterplan', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type6.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Babylonian Tablet'; + $effect = ''; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 6, 2, 'Great storage masterplan', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type6.gif'); + } /** @@ -356,34 +356,34 @@ if($_POST['password'] != ""){ */ - $desc = 'Cranny capacity is increased by a certain amount for each type of artifact. Catapults can only shoot random on villages within this artifacts power. Exceptions are the WW which can always be targeted and the treasure chamber which can always be targeted, except with the unique artifact. When aiming at a resource field only random resource fields can be hit, when aiming at a building only random buildings can be hit.'; + $desc = 'Cranny capacity is increased by a certain amount for each type of artifact. Catapults can only shoot random on villages within this artifacts power. Exceptions are the WW which can always be targeted and the treasure chamber which can always be targeted, except with the unique artifact. When aiming at a resource field only random resource fields can be hit, when aiming at a building only random buildings can be hit.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Map of the Hidden Caverns'; - $effect = '(200)'; - for($i > 1; $i < 6; $i++) { - Artefact($uid, 7, 1, 'Rivals slight confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Map of the Hidden Caverns'; + $effect = '(200)'; + for($i > 1; $i < 6; $i++) { + Artefact($uid, 7, 1, 'Rivals slight confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Bottomless Satchel'; - $effect = '(100)'; - for($i > 1; $i < 4; $i++) { - Artefact($uid, 7, 2, 'Rivals great confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Bottomless Satchel'; + $effect = '(100)'; + for($i > 1; $i < 4; $i++) { + Artefact($uid, 7, 2, 'Rivals great confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Trojan Horse'; - $effect = '(500)'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 7, 3, 'Rivals unique confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Trojan Horse'; + $effect = '(500)'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 7, 3, 'Rivals unique confusion', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type7.gif'); + } /** @@ -391,38 +391,38 @@ if($_POST['password'] != ""){ */ - $desc = 'Every 24 hours it gets a random effect, bonus, or penalty (all are possible with the exception of great warehouse, great granary and WW building plans). They change effect AND scope every 24 hours. The unique artifact will always take positive bonuses.'; + $desc = 'Every 24 hours it gets a random effect, bonus, or penalty (all are possible with the exception of great warehouse, great granary and WW building plans). They change effect AND scope every 24 hours. The unique artifact will always take positive bonuses.'; - unset($i); - unset($vname); - unset($effect); - $vname = 'Pendant of Mischief'; - for($i > 1; $i < 5; $i++) { - Artefact($uid, 8, 1, 'Artefact of the slight fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Pendant of Mischief'; + for($i > 1; $i < 5; $i++) { + Artefact($uid, 8, 1, 'Artefact of the slight fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Pendant of Mischief'; - for($i > 1; $i < 5; $i++) { - Artefact($uid, 8, 2, 'Artefact of the slight fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); - } + unset($i); + unset($vname); + unset($effect); + $vname = 'Pendant of Mischief'; + for($i > 1; $i < 5; $i++) { + Artefact($uid, 8, 2, 'Artefact of the slight fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); + } - unset($i); - unset($vname); - unset($effect); - $vname = 'Forbidden Manuscript'; - for($i > 1; $i < 1; $i++) { - Artefact($uid, 8, 3, 'Artefact of the unique fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); - } - + unset($i); + unset($vname); + unset($effect); + $vname = 'Forbidden Manuscript'; + for($i > 1; $i < 1; $i++) { + Artefact($uid, 8, 3, 'Artefact of the unique fool', '' . $vname . '', '' . $desc . '', '' . $effect . '', 'type8.gif'); + } - echo "Done"; + + echo "Done"; }else{ ?>
- +

Choose Password @@ -430,8 +430,8 @@ if($_POST['password'] != ""){

-
-
+
+
@@ -448,7 +448,7 @@ include("Templates/links.tpl");
- @@ -458,7 +458,7 @@ include("Templates/res.tpl") pageLoadTimeEnd()-$start)*1000); ?> ms - +
diff --git a/crop_finder.php b/crop_finder.php index dfdac77e..d6ea59da 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -11,71 +11,71 @@ include ("GameEngine/Village.php"); if($session->goldclub == 0) { - header("Location: plus.php?id=3"); + header("Location: plus.php?id=3"); } if($_POST['type'] == 15) { - header("Location: ".$_SERVER['PHP_SELF']."?s=1&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); + header("Location: ".$_SERVER['PHP_SELF']."?s=1&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); } elseif($_POST['type'] == 9) { - header("Location: ".$_SERVER['PHP_SELF']."?s=2&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); + header("Location: ".$_SERVER['PHP_SELF']."?s=2&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); } elseif($_POST['type'] == 'both') { - header("Location: ".$_SERVER['PHP_SELF']."?s=3&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); + header("Location: ".$_SERVER['PHP_SELF']."?s=3&x=" . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['x']) . '&y=' . preg_replace("/[^a-zA-Z0-9_-]/","",$_POST['y'])); } ?> - <?php + <title><?php echo SERVER_NAME ?> - Crop Finder - - - - - - - - - - + + + + + + + + + - lang/en/compact.css?f4b7c" rel="stylesheet" type="text/css" /> - gpack == null || GP_ENABLE == false) { echo " - - "; + + "; } else { echo " - - "; + + "; } ?> - + window.addEvent('domready', start); + - +
-
+
wid; - $coor2 = $database->getCoor($wref2); + $wref2 = $village->wid; + $coor2 = $database->getCoor($wref2); } - + ?>
@@ -108,9 +108,9 @@ Search for: - /> 15 crop - /> 9 crop - /> both
+ /> 15 crop + /> 9 crop + /> both
@@ -129,16 +129,16 @@ $type15 = mysql_query("SELECT id,x,y,occupied FROM ".PREFIX."wdata WHERE fieldtype = 6"); $type9 = mysql_query("SELECT id,x,y,occupied FROM ".PREFIX."wdata WHERE fieldtype = 1"); $type_both = mysql_query("SELECT id,x,y,occupied,fieldtype FROM ".PREFIX."wdata WHERE fieldtype = 1 OR fieldtype = 6"); - + if(is_numeric($_GET['x']) AND is_numeric($_GET['y'])) { - $coor['x'] = $_GET['x']; - $coor['y'] = $_GET['y']; + $coor['x'] = $_GET['x']; + $coor['y'] = $_GET['y']; } else { - $wref = $village->wid; - $coor = $database->getCoor($wref); + $wref = $village->wid; + $coor = $database->getCoor($wref); } - function getDistance($coorx1, $coory1, $coorx2, $coory2) { + function getDistance($coorx1, $coory1, $coorx2, $coory2) { $max = 2 * WORLD_MAX + 1; $x1 = intval($coorx1); $y1 = intval($coory1); @@ -154,18 +154,18 @@ ?> - - - - - - - - - - - - + + + + + + + + + + + +
@@ -173,26 +173,26 @@ $row) { - echo ""; - echo ""; - if($row['occupied'] == 0) { - echo ""; - echo ""; - echo ""; - } else { - echo ""; - echo ""; - echo ""; - } - echo ""; + echo ""; + echo ""; + if($row['occupied'] == 0) { + echo ""; + echo ""; + echo ""; + } else { + echo ""; + echo ""; + echo ""; + } + echo ""; } ?> @@ -206,18 +206,18 @@ ?>
Crop Finder - 15c
TypeCoordinatesOwnerOccupiedDistance
Crop Finder - 15c
TypeCoordinatesOwnerOccupiedDistance
15c(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
15c(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
- - - - - - - - - - - - + + + + + + + + + + + +
@@ -225,31 +225,31 @@ unset($rows); while($row = mysql_fetch_array($type9)) { - $dist = getDistance($coor['x'], $coor['y'], $row['x'], $row['y']); + $dist = getDistance($coor['x'], $coor['y'], $row['x'], $row['y']); - $rows[$dist] = $row; + $rows[$dist] = $row; } ksort($rows); foreach($rows as $dist => $row) { - echo ""; - echo ""; - if($row['occupied'] == 0) { - echo ""; - echo ""; - echo ""; - } else { - echo ""; - echo ""; - echo ""; - } - echo ""; + echo ""; + echo ""; + if($row['occupied'] == 0) { + echo ""; + echo ""; + echo ""; + } else { + echo ""; + echo ""; + echo ""; + } + echo ""; } ?> - +
Crop Finder - 9c
TypeCoordinatesOwnerOccupiedDistance
Crop Finder - 9c
TypeCoordinatesOwnerOccupiedDistance
9c(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
9c(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
- - - - - - - - - - - - + + + + + + + + + + + +
@@ -278,36 +278,36 @@ unset($rows); while($row = mysql_fetch_array($type_both)) { - $dist = getDistance($coor['x'], $coor['y'], $row['x'], $row['y']); + $dist = getDistance($coor['x'], $coor['y'], $row['x'], $row['y']); - $rows[$dist] = $row; + $rows[$dist] = $row; } ksort($rows); foreach($rows as $dist => $row) { - if($row['fieldtype'] == 1) { - $field = '9c'; - } elseif($row['fieldtype'] == 6) { - $field = '15c'; - } - - echo ""; - echo ""; - if($row['occupied'] == 0) { - echo ""; - echo ""; - echo ""; - } else { - echo ""; - echo ""; - echo ""; - } - echo ""; + if($row['fieldtype'] == 1) { + $field = '9c'; + } elseif($row['fieldtype'] == 6) { + $field = '15c'; + } + + echo ""; + echo ""; + if($row['occupied'] == 0) { + echo ""; + echo ""; + echo ""; + } else { + echo ""; + echo ""; + echo ""; + } + echo ""; } ?> - +
Crop Finder - 9c and 15c
TypeCoordinatesOwnerOccupiedDistance
Crop Finder - 9c and 15c
TypeCoordinatesOwnerOccupiedDistance
" . $field . "(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
" . $field . "(".$row['x']."|".$row['y'].")-UnoccupiedgetMapCheck($row['id'])."\">".$database->getVillageField($row['id'], "name")." (".$row['x']."|".$row['y'].")getVillageField($row['id'], "owner")."\">".$database->getUserField($database->getVillageField($row['id'], "owner"), "username", 0)."Occupied
".getDistance($coor['x'], $coor['y'], $row['x'], $row['y'])."
pageLoadTimeEnd() - $start) * 1000); ?> ms - +
Server time:
- +
diff --git a/dorf1.php b/dorf1.php index d41d759b..1c652250 100644 --- a/dorf1.php +++ b/dorf1.php @@ -34,7 +34,7 @@ header("Location: banned.php"); <?php echo SERVER_NAME ?> - + @@ -61,7 +61,7 @@ header("Location: banned.php"); - +
@@ -79,7 +79,7 @@ $timer = 1; NewBuilding) { include("Templates/Building.tpl"); @@ -99,9 +99,9 @@ include("Templates/links.tpl");
-
@@ -109,7 +109,7 @@ include("Templates/res.tpl"); pageLoadTimeEnd()-$start)*1000); ?> ms - +
diff --git a/dorf2.php b/dorf2.php index a13b1680..69d70c78 100644 --- a/dorf2.php +++ b/dorf2.php @@ -32,7 +32,7 @@ header("Location: banned.php"); <?php echo SERVER_NAME ?> - + @@ -59,8 +59,8 @@ header("Location: banned.php"); window.addEvent('domready', start); - - + +
@@ -89,9 +89,9 @@ include("Templates/links.tpl");
-
@@ -99,7 +99,7 @@ include("Templates/res.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
Server time:
diff --git a/dorf3.php b/dorf3.php index b16e0eb4..ba8e5821 100644 --- a/dorf3.php +++ b/dorf3.php @@ -1,4 +1,4 @@ - <?php echo SERVER_NAME ?> - + @@ -54,8 +54,8 @@ if(isset($_GET['newdid'])) { window.addEvent('domready', start); - - + +
@@ -66,25 +66,25 @@ if(isset($_GET['newdid'])) {
-plus){ if(isset($_GET['s'])){ - if($_GET['s'] == 2){ - include("Templates/dorf3/2.tpl"); - }elseif($_GET['s'] == 3){ - include("Templates/dorf3/3.tpl"); - }elseif($_GET['s'] == 4){ - include("Templates/dorf3/4.tpl"); - }elseif($_GET['s'] == 5){ - include("Templates/dorf3/5.tpl"); - } + if($_GET['s'] == 2){ + include("Templates/dorf3/2.tpl"); + }elseif($_GET['s'] == 3){ + include("Templates/dorf3/3.tpl"); + }elseif($_GET['s'] == 4){ + include("Templates/dorf3/4.tpl"); + }elseif($_GET['s'] == 5){ + include("Templates/dorf3/5.tpl"); + } }else{ - include("Templates/dorf3/1.tpl"); - } + include("Templates/dorf3/1.tpl"); + } }else{ - include("Templates/dorf3/noplus.tpl"); -} -?> + include("Templates/dorf3/noplus.tpl"); +} +?>
@@ -98,9 +98,9 @@ include("Templates/links.tpl");
-
@@ -108,7 +108,7 @@ include("Templates/res.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
Server time:
diff --git a/img/admin/Thumbs.db b/img/admin/Thumbs.db index ddfdf0b5e4cf18d330bac0904f0c4e203f098f0f..c4e6c2cb84a69c962335d7be7cd13d0c26fc4347 100644 GIT binary patch delta 12075 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 delta 1006 zcmZXTUr1AN6vuzR?cUw%y317(Dr#!BJrp`?(Q@Jz4!6L_2UDV`MVgqUf_sRt+Q6u% zuzRe)1xZ3rQP}TAFw|&<&>nj3p&t5UL==b*(nIU}n=>^peC|EJ^F8PM{+!>9|FFcD z`EZac6GzBW^e2RoOgW8#!I>}xCnZ{C2$$^ z0vSLrwdQes&@S}tvl>OJd}eW@gIl25!0IH9Fb2#nUyL23ggRjBgOzWm-^JJS+&STp z6pU98CRY~BL~wA*BK)SRQQQ+WU7->aDuEGj58MY2Kz1!r*NAf(gBdWp>QvlAg`Y6^ z48DM`U;)SsG3HL9{=+$qf;)A(?Vl90gNqii_~edFdc=Il$3^hk6c_&Ib2hUn=JSk%Fsa4;y-VqD8P)hOa)j4CwvJGO)$uyRaplFVAd?7RTq5R!Y z|6BU#EVkv$jI;d4ipkG2FRNxG+WIYWhy|A7C+h%WcqIHZv?l=AdE%O`( diff --git a/img/admin/b/Thumbs.db b/img/admin/b/Thumbs.db index fd8e36e76035218202206c6e80479db268b2f1a6..360f3853b6ef1c91185a031d7ccc62c1a3c3d36b 100644 GIT binary patch delta 33 ocmZojX-L_S!@};cODp?<&)LnzEUJR+R?2UeoB?v?izdnd0OarumH+?% delta 33 ncmZojX-L_S!@~Z-u4HGn+nLS9EUJR+Z?5p>=m9zNMH6KJ?a>X4 diff --git a/img/admin/icon/Thumbs.db b/img/admin/icon/Thumbs.db index 3f628144db406d6c4212dca9f4bb7422174013d2..b7731c96c2f4a928ce4419249f4d7b523b088737 100644 GIT binary patch delta 33 ocmZoLXfW82!@_P5Zj$}L=j`TUmZyB|9$sIToB?v;g%`2_0NZ&DqyPW_ delta 33 ncmZoLXfW82!@~aHXT{EJw=j4b< diff --git a/img/admin/r/Thumbs.db b/img/admin/r/Thumbs.db index d5d101744a316618638622075cf1bb6ad1845bb7..f9634d4a05a34064f62ecb0782a8319cf2b2ae4b 100644 GIT binary patch delta 4261 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 diff --git a/index.php b/index.php index e3e4d3d6..be78e57a 100644 --- a/index.php +++ b/index.php @@ -28,47 +28,47 @@ include ("GameEngine/Lang/".LANG.".php"); - Powered by ZravianX - <?php echo SERVER_NAME; ?> - - - - - - - - - - + Powered by ZravianX - <?php echo SERVER_NAME; ?> + + + + + + + + + + -
-
-
- - -
- - +
+
+
+ + +
+ + @@ -78,177 +78,177 @@ include ("GameEngine/Lang/".LANG.".php");
-
- - -
-
+
+ + +
+
-

-

-

-
-
- - - - + +
+

+

+ +
+ + + + + ?>: - - + ?> + - - + ?>: - - + ?> + - - + ?>: - - - -
:
+ :
+ :
-
-
-

:

-
    -
    • -
    • -
    • -
-
- -
-
-

- -
-
    -
  • Screenshot
    • -
  • Screenshot
    • -
  • Screenshot
    • -
  • Screenshot
    • -
  • Screenshot
    • -
  • Screenshot
    • -
  • Screenshot
    • -
-
-
-
-

-
-
-
- -
- + ?> +
+
+
+

:

+
    +
    • +
    • +
    • +
+
+
+
+
+

+ +
+
    +
  • Screenshot
    • +
  • Screenshot
    • +
  • Screenshot
    • +
  • Screenshot
    • +
  • Screenshot
    • +
  • Screenshot
    • +
  • Screenshot
    • +
+
+
+
+

+
+
+
+
+
+
-
-
-
-
-

- Close -
    -
  • - World" /> -
    :
    -
    :
    -
    -
    -
    • -
-
-
-
-
-
-
-

- Close -
    -
  • - World" /> -
    :
    -
    :
    -
    -
    -
    • -
-
-
-
-
-
-
- Close -

-
-
-
-
-
-
-
-

- Close -
-

- Screenshot -
-
- - -
-
-
+
+
+
+
+

+ Close +
    +
  • + World" /> +
    :
    +
    :
    +
    +
    +
    • +
+
+
+
+
+
+
+

+ Close +
    +
  • + World" /> +
    :
    +
    :
    +
    +
    +
    • +
+
+
+
+
+
+
+ Close +

+
+
+
+
+
+
+
+

+ Close +
+

+ Screenshot +
+
+ + +
+
+
+ var screenshots = [ + {'img':'img/en/s/s1.png','hl':"", 'desc':""},{'img':'img/en/s/s2.png','hl':"", 'desc':""},{'img':'img/en/s/s4.png','hl':"", 'desc':""},{'img':'img/en/s/s3.png','hl':"", 'desc':""},{'img':'img/en/s/s5.png','hl':"", 'desc':""},{'img':'img/en/s/s7.png','hl':"", 'desc':""},{'img':'img/en/s/s8.png','hl':"", 'desc':""}]; + var galarie = new Fx.Screenshots('screen_view', 'screen_hl', 'screen_desc', screenshots); + \ No newline at end of file diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl index c2ee07d4..ffd91ea5 100644 --- a/install/data/constant_format.tpl +++ b/install/data/constant_format.tpl @@ -267,4 +267,4 @@ $requse = 0; ## ## ################################################################################# -?> +?> \ No newline at end of file diff --git a/install/include/database.php b/install/include/database.php index 74830943..b94124b5 100644 --- a/install/include/database.php +++ b/install/include/database.php @@ -10,43 +10,43 @@ include("constant.php"); class MYSQLi_DB { - + var $connection; - + function MYSQLi_DB() { $this->connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB) or die(mysqli_error()); } function query($query) { return $this->connection->query($query); } - + }; class MYSQL_DB { - + var $connection; - + function MYSQL_DB() { $this->connection = mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysql_error()); mysql_select_db(SQL_DB, $this->connection) or die(mysql_error()); } - + function mysql_exec_batch ($p_query, $p_transaction_safe = true) { if ($p_transaction_safe) { - $p_query = 'START TRANSACTION;' . $p_query . '; COMMIT;'; - }; + $p_query = 'START TRANSACTION;' . $p_query . '; COMMIT;'; + }; $query_split = preg_split ("/[;]+/", $p_query); foreach ($query_split as $command_line) { - $command_line = trim($command_line); - if ($command_line != '') { - $query_result = mysql_query($command_line); - if ($query_result == 0) { - break; - }; - }; + $command_line = trim($command_line); + if ($command_line != '') { + $query_result = mysql_query($command_line); + if ($query_result == 0) { + break; + }; + }; }; return $query_result; -} +} function query($query) { return mysql_query($query, $this->connection); diff --git a/install/include/multihunter.php b/install/include/multihunter.php index d4982609..3fee7536 100644 --- a/install/include/multihunter.php +++ b/install/include/multihunter.php @@ -1,31 +1,31 @@ getWref(0, 0); - $uid = 5; - $status = $database->getVillageState($wid); - if($status == 0) { - $database->setFieldTaken($wid); - $database->addVillage($wid, $uid, 'Multihunter', '0'); - $database->addResourceFields($wid, $database->getVillageType($wid)); - $database->addUnits($wid); - $database->addTech($wid); - $database->addABTech($wid); - } - } + mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS); + mysql_select_db(SQL_DB); + + if(isset($_POST['mhpw'])) { + $password = $_POST['mhpw']; + mysql_query("UPDATE " . TB_PREFIX . "users SET password = '" . md5($password) . "' WHERE username = 'Multihunter'"); + $wid = $admin->getWref(0, 0); + $uid = 5; + $status = $database->getVillageState($wid); + if($status == 0) { + $database->setFieldTaken($wid); + $database->addVillage($wid, $uid, 'Multihunter', '0'); + $database->addResourceFields($wid, $database->getVillageType($wid)); + $database->addUnits($wid); + $database->addTech($wid); + $database->addABTech($wid); + } + } $gameinstall = 0; - header("Location: ../index.php?s=5"); + header("Location: ../index.php?s=5"); ?> \ No newline at end of file diff --git a/install/include/oasis.php b/install/include/oasis.php index e1220a86..2ec563aa 100644 --- a/install/include/oasis.php +++ b/install/include/oasis.php @@ -1,21 +1,21 @@ populateOasisdata(); - $database->populateOasis(); - $database->populateOasisUnitsHigh(); - - + include ("../../GameEngine/config.php"); + include ("../../GameEngine/Database.php"); + include ("../../GameEngine/Admin/database.php"); - header("Location: ../index.php?s=6"); + mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS); + mysql_select_db(SQL_DB); + + $database->populateOasisdata(); + $database->populateOasis(); + $database->populateOasisUnitsHigh(); + + + + + header("Location: ../index.php?s=6"); ?> \ No newline at end of file diff --git a/install/include/wdata.php b/install/include/wdata.php index 383ed27c..698bf119 100644 --- a/install/include/wdata.php +++ b/install/include/wdata.php @@ -17,7 +17,7 @@ $y=(WORLD_MAX-$i); for($j=0; $j<$xyas; $j++){ $x=((WORLD_MAX*-1)+$j); - + //choose a field type if($x == 0 & $y == 0){ $typ='3'; @@ -104,7 +104,7 @@ $y=(WORLD_MAX-$i); } else { $image="o".$otype.""; } - + //into database $q = "INSERT into ".TB_PREFIX."wdata values (0,'".$typ."','".$otype."','".$x."','".$y."',0,'".$image."')"; $database->query($q); diff --git a/install/index.php b/install/index.php index 37306a89..bd8843df 100644 --- a/install/index.php +++ b/install/index.php @@ -1,45 +1,45 @@ - - + + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - TravianX Installation - - - - - - - - - - - - - + TravianX Installation + + + + + + + + + + + + + -
- +
+ -
+
- + + +
+
+ +
-
-
- -
- - ERROR!
It's not possible to write the config file. Change the permission to '777'. After that, refresh this page!"; - } else - switch($_GET['s']){ - case 0: - include("templates/greet.tpl"); - break; - case 1: - include("templates/config.tpl"); - break; - case 2: - include("templates/dataform.tpl"); - break; - case 3: - include("templates/field.tpl"); - break; - case 4: - include("templates/multihunter.tpl"); - break; - case 5: - include("templates/oasis.tpl"); - break; - case 6: - include("templates/end.tpl"); - break; - } - ?> + } else + switch($_GET['s']){ + case 0: + include("templates/greet.tpl"); + break; + case 1: + include("templates/config.tpl"); + break; + case 2: + include("templates/dataform.tpl"); + break; + case 3: + include("templates/field.tpl"); + break; + case 4: + include("templates/multihunter.tpl"); + break; + case 5: + include("templates/oasis.tpl"); + break; + case 6: + include("templates/end.tpl"); + break; + } + ?> -
+
-
-
+
+
-
+
-
+
- +
+
+
-
+
\ No newline at end of file diff --git a/install/process.php b/install/process.php index 398a0f70..2fd0cb76 100644 --- a/install/process.php +++ b/install/process.php @@ -9,127 +9,127 @@ ## ## ################################################################################# - if(file_exists("include/constant.php")) { - include ("include/database.php"); - } - class Process { +if(file_exists("include/constant.php")) { + include ("include/database.php"); +} +class Process { - function Process() { - if(isset($_POST['subconst'])) { - $this->constForm(); - } else - if(isset($_POST['substruc'])) { - $this->createStruc(); - } else - if(isset($_POST['subwdata'])) { - $this->createWdata(); - } else - if(isset($_POST['subacc'])) { - $this->createAcc(); - } else { - header("Location: index.php"); - } - } + function Process() { + if(isset($_POST['subconst'])) { + $this->constForm(); + } else + if(isset($_POST['substruc'])) { + $this->createStruc(); + } else + if(isset($_POST['subwdata'])) { + $this->createWdata(); + } else + if(isset($_POST['subacc'])) { + $this->createAcc(); + } else { + header("Location: index.php"); + } + } - function constForm() { - $myFile = "include/constant.php"; - $fh = fopen($myFile, 'w') or die("


Can't open file: install\include\constant.php"); - $text = file_get_contents("data/constant_format.tpl"); - $text = preg_replace("'%SERVERNAME%'", $_POST['servername'], $text); - $text = preg_replace("'%SSTARTDATE%'", $_POST['start_date'], $text); - $text = preg_replace("'%SSTARTTIME%'", $_POST['start_time'], $text); - $text = preg_replace("'%LANG%'", $_POST['lang'], $text); - $text = preg_replace("'%SPEED%'", $_POST['speed'], $text); - $text = preg_replace("'%INCSPEED%'", $_POST['incspeed'], $text); - $text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text); - $text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text); - $text = preg_replace("'%UTRACK%'", $_POST['trackusers'], $text); - $text = preg_replace("'%UTOUT%'", $_POST['timeout'], $text); - $text = preg_replace("'%AUTOD%'", $_POST['autodel'], $text); - $text = preg_replace("'%AUTODT%'", $_POST['autodeltime'], $text); - $text = preg_replace("'%MAX%'", $_POST['wmax'], $text); - $text = preg_replace("'%GP%'", $_POST['gpack'], $text); - $text = preg_replace("'%SSERVER%'", $_POST['sserver'], $text); - $text = preg_replace("'%SUSER%'", $_POST['suser'], $text); - $text = preg_replace("'%SPASS%'", $_POST['spass'], $text); - $text = preg_replace("'%SDB%'", $_POST['sdb'], $text); - $text = preg_replace("'%PREFIX%'", $_POST['prefix'], $text); - $text = preg_replace("'%CONNECTT%'", $_POST['connectt'], $text); - $text = preg_replace("'%AEMAIL%'", $_POST['aemail'], $text); - $text = preg_replace("'%ANAME%'", $_POST['aname'], $text); - $text = preg_replace("'%SUBDOM%'", $_POST['subdom'], $text); - $text = preg_replace("'%LOGBUILD%'", $_POST['log_build'], $text); - $text = preg_replace("'%LOGTECH%'", $_POST['log_tech'], $text); - $text = preg_replace("'%LOGLOGIN%'", $_POST['log_login'], $text); - $text = preg_replace("'%LOGGOLDFIN%'", $_POST['log_gold_fin'], $text); - $text = preg_replace("'%LOGADMIN%'", $_POST['log_admin'], $text); - $text = preg_replace("'%LOGWAR%'", $_POST['log_war'], $text); - $text = preg_replace("'%LOGMARKET%'", $_POST['log_market'], $text); - $text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text); - $text = preg_replace("'%MINUSERLENGTH%'", $_POST['userlength'], $text); - $text = preg_replace("'%MINPASSLENGTH%'", $_POST['passlength'], $text); - $text = preg_replace("'%SPECIALCHARS%'", $_POST['specialchars'], $text); - $text = preg_replace("'%ACTIVATE%'", $_POST['activate'], $text); - $text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text); - $text = preg_replace("'%QUEST%'", $_POST['quest'], $text); - $text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text); - $text = preg_replace("'%STARTTIME%'", time(), $text); - $text = preg_replace("'%DOMAIN%'", $_POST['domain'], $text); - $text = preg_replace("'%HOMEPAGE%'", $_POST['homepage'], $text); - $text = preg_replace("'%SERVER%'", $_POST['server'], $text); - $text = preg_replace("'%LIMIT_MAILBOX%'", $_POST['limit_mailbox'], $text); - $text = preg_replace("'%MAX_MAILS%'", $_POST['max_mails'], $text); - $text = preg_replace("'%DEMOLISH%'", $_POST['demolish'], $text); - $text = preg_replace("'%BOX1%'", $_POST['box1'], $text); - $text = preg_replace("'%BOX2%'", $_POST['box2'], $text); - $text = preg_replace("'%BOX3%'", $_POST['box3'], $text); - $text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text); - $text = preg_replace("'%ERROR%'", $_POST['error'], $text); - $text = preg_replace("'%GP_LOCATE%'", $_POST['gp_locate'], $text); - $text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text); - $text = preg_replace("'%PLUS_PRODUCTION%'", $_POST['plus_production'], $text); - $text = preg_replace("'%GREAT_WKS%'", $_POST['great_wks'], $text); - $text = preg_replace("'%TS_THRESHOLD%'", $_POST['ts_threshold'], $text); - $text = preg_replace("'%WW%'", $_POST['ww'], $text); - $text = preg_replace("'%T4_COMING%'", $_POST['t4_coming'], $text); - $text = preg_replace("'%REG_OPEN%'", $_POST['reg_open'], $text); - $text = preg_replace("'%PEACE%'", $_POST['peace'], $text); + function constForm() { + $myFile = "include/constant.php"; + $fh = fopen($myFile, 'w') or die("


Can't open file: install\include\constant.php"); + $text = file_get_contents("data/constant_format.tpl"); + $text = preg_replace("'%SERVERNAME%'", $_POST['servername'], $text); + $text = preg_replace("'%SSTARTDATE%'", $_POST['start_date'], $text); + $text = preg_replace("'%SSTARTTIME%'", $_POST['start_time'], $text); + $text = preg_replace("'%LANG%'", $_POST['lang'], $text); + $text = preg_replace("'%SPEED%'", $_POST['speed'], $text); + $text = preg_replace("'%INCSPEED%'", $_POST['incspeed'], $text); + $text = preg_replace("'%EVASIONSPEED%'", $_POST['evasionspeed'], $text); + $text = preg_replace("'%TRADERCAP%'", $_POST['tradercap'], $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text); + $text = preg_replace("'%UTRACK%'", $_POST['trackusers'], $text); + $text = preg_replace("'%UTOUT%'", $_POST['timeout'], $text); + $text = preg_replace("'%AUTOD%'", $_POST['autodel'], $text); + $text = preg_replace("'%AUTODT%'", $_POST['autodeltime'], $text); + $text = preg_replace("'%MAX%'", $_POST['wmax'], $text); + $text = preg_replace("'%GP%'", $_POST['gpack'], $text); + $text = preg_replace("'%SSERVER%'", $_POST['sserver'], $text); + $text = preg_replace("'%SUSER%'", $_POST['suser'], $text); + $text = preg_replace("'%SPASS%'", $_POST['spass'], $text); + $text = preg_replace("'%SDB%'", $_POST['sdb'], $text); + $text = preg_replace("'%PREFIX%'", $_POST['prefix'], $text); + $text = preg_replace("'%CONNECTT%'", $_POST['connectt'], $text); + $text = preg_replace("'%AEMAIL%'", $_POST['aemail'], $text); + $text = preg_replace("'%ANAME%'", $_POST['aname'], $text); + $text = preg_replace("'%SUBDOM%'", $_POST['subdom'], $text); + $text = preg_replace("'%LOGBUILD%'", $_POST['log_build'], $text); + $text = preg_replace("'%LOGTECH%'", $_POST['log_tech'], $text); + $text = preg_replace("'%LOGLOGIN%'", $_POST['log_login'], $text); + $text = preg_replace("'%LOGGOLDFIN%'", $_POST['log_gold_fin'], $text); + $text = preg_replace("'%LOGADMIN%'", $_POST['log_admin'], $text); + $text = preg_replace("'%LOGWAR%'", $_POST['log_war'], $text); + $text = preg_replace("'%LOGMARKET%'", $_POST['log_market'], $text); + $text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text); + $text = preg_replace("'%MINUSERLENGTH%'", $_POST['userlength'], $text); + $text = preg_replace("'%MINPASSLENGTH%'", $_POST['passlength'], $text); + $text = preg_replace("'%SPECIALCHARS%'", $_POST['specialchars'], $text); + $text = preg_replace("'%ACTIVATE%'", $_POST['activate'], $text); + $text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text); + $text = preg_replace("'%QUEST%'", $_POST['quest'], $text); + $text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text); + $text = preg_replace("'%STARTTIME%'", time(), $text); + $text = preg_replace("'%DOMAIN%'", $_POST['domain'], $text); + $text = preg_replace("'%HOMEPAGE%'", $_POST['homepage'], $text); + $text = preg_replace("'%SERVER%'", $_POST['server'], $text); + $text = preg_replace("'%LIMIT_MAILBOX%'", $_POST['limit_mailbox'], $text); + $text = preg_replace("'%MAX_MAILS%'", $_POST['max_mails'], $text); + $text = preg_replace("'%DEMOLISH%'", $_POST['demolish'], $text); + $text = preg_replace("'%BOX1%'", $_POST['box1'], $text); + $text = preg_replace("'%BOX2%'", $_POST['box2'], $text); + $text = preg_replace("'%BOX3%'", $_POST['box3'], $text); + $text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text); + $text = preg_replace("'%ERROR%'", $_POST['error'], $text); + $text = preg_replace("'%GP_LOCATE%'", $_POST['gp_locate'], $text); + $text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text); + $text = preg_replace("'%PLUS_PRODUCTION%'", $_POST['plus_production'], $text); + $text = preg_replace("'%GREAT_WKS%'", $_POST['great_wks'], $text); + $text = preg_replace("'%TS_THRESHOLD%'", $_POST['ts_threshold'], $text); + $text = preg_replace("'%WW%'", $_POST['ww'], $text); + $text = preg_replace("'%T4_COMING%'", $_POST['t4_coming'], $text); + $text = preg_replace("'%REG_OPEN%'", $_POST['reg_open'], $text); + $text = preg_replace("'%PEACE%'", $_POST['peace'], $text); - fwrite($fh, $text); + fwrite($fh, $text); - if(file_exists("include/constant.php")) { - header("Location: index.php?s=2"); - } else { - header("Location: index.php?s=1&c=1"); - } + if(file_exists("include/constant.php")) { + header("Location: index.php?s=2"); + } else { + header("Location: index.php?s=1&c=1"); + } - fclose($fh); - } + fclose($fh); + } - function createStruc() { - global $database; - $str = file_get_contents("data/sql.sql"); - $str = preg_replace("'%PREFIX%'", TB_PREFIX, $str); - if(DB_TYPE) { - $result = $database->connection->multi_query($str); - } else { - $result = $database->mysql_exec_batch($str); - } - if($result) { - header("Location: index.php?s=3"); - } else { - header("Location: index.php?s=2&c=1"); - } - } + function createStruc() { + global $database; + $str = file_get_contents("data/sql.sql"); + $str = preg_replace("'%PREFIX%'", TB_PREFIX, $str); + if(DB_TYPE) { + $result = $database->connection->multi_query($str); + } else { + $result = $database->mysql_exec_batch($str); + } + if($result) { + header("Location: index.php?s=3"); + } else { + header("Location: index.php?s=2&c=1"); + } + } - function createWdata() { - header("Location: include/wdata.php"); - } - - } - ; + function createWdata() { + header("Location: include/wdata.php"); + } - $process = new Process; +} +; + +$process = new Process; ?> diff --git a/install/templates/config.tpl b/install/templates/config.tpl index 71835a81..184a1b5f 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -26,14 +26,14 @@ echo "
Error creating constant.php - + Register Open: - + Server: Domain: Homepage: @@ -52,7 +52,7 @@ echo "
Error creating constant.php - + Plus account length: - + +25% production length: - + Storage Multipler: Tourn Threshold: Great Workshop: @@ -84,7 +84,7 @@ echo "
Error creating constant.php - + ww:

- +

ADMIN ACCOUNT @@ -117,7 +117,7 @@ echo "
Error creating constant.php

- +

SQL RELATED @@ -133,7 +133,7 @@ echo "
Error creating constant.php

- - - +

NEWSBOX OPTIONS @@ -177,7 +177,7 @@ echo "
Error creating constant.php

- +

LOG RELATED (You should disable them) @@ -270,4 +270,4 @@ echo "
Error creating constant.php -
+ \ No newline at end of file diff --git a/install/templates/end.tpl b/install/templates/end.tpl index 18e8ac66..6c2dee05 100644 --- a/install/templates/end.tpl +++ b/install/templates/end.tpl @@ -12,7 +12,7 @@ Thanks for installing TravianX.

Please remove/rename the installation folder.

All the files are placed. The database is created, so you can now start playing on your own Travian.

- +

> My TravianX homepage <
diff --git a/install/templates/greet.tpl b/install/templates/greet.tpl index e1ea6a8c..20e9df2d 100644 --- a/install/templates/greet.tpl +++ b/install/templates/greet.tpl @@ -1,9 +1,9 @@ -
+
-

  Disclaimer

+

  Disclaimer

-
    +
    • Along with the installation/usage of this game, you shall be fully responsible for any legal results that may raised initiated by the owners of any unlicensed content you permit your copy of this game to publish.
    • Neither the team that created this script nor the team that customised it to create this distribution/release shall be responsible for any damage done to your computer/server system.
      • @@ -17,7 +17,7 @@
    • You have no rights to edit copyright notices or/and claim this script as your own.
    • Last but not least, Enjoy.
      • -
    +
    @@ -29,14 +29,14 @@
  • Change CHMOD GameEngine back to 644 and CHMOD 777: Prevention, Notes
-
+
TravianX Team -
-
+
+
- +
diff --git a/install/templates/menu.tpl b/install/templates/menu.tpl index 8925d88c..01be4f88 100644 --- a/install/templates/menu.tpl +++ b/install/templates/menu.tpl @@ -16,12 +16,12 @@ case 4: echo "
  • Intro
  • Configuration
  • Database
  • Field
  • Multihunter
  • Oasis
  • End
    • "; break; - case 5: + case 5: echo "
  • Intro
  • Configuration
  • Database
  • Field
  • Multihunter
  • Oasis
  • End
    • "; break; - case 6: - echo "
  • Intro
  • Configuration
  • Database
  • Field
  • Multihunter
  • Oasis
  • End
    • "; - break; + case 6: + echo "
  • Intro
  • Configuration
  • Database
  • Field
  • Multihunter
  • Oasis
  • End
    • "; + break; } ?> \ No newline at end of file diff --git a/install/templates/multihunter.tpl b/install/templates/multihunter.tpl index d5408212..13bc860d 100644 --- a/install/templates/multihunter.tpl +++ b/install/templates/multihunter.tpl @@ -12,7 +12,7 @@ - +

    Create Multihunter account

    @@ -22,8 +22,8 @@

    -
    -
    +
    +
    - +
    \ No newline at end of file diff --git a/install/templates/script.tpl b/install/templates/script.tpl index cfe34d61..26c9141f 100644 --- a/install/templates/script.tpl +++ b/install/templates/script.tpl @@ -1,14 +1,14 @@ - '; - } - - protected function draw_bar() { - echo ' -
    - -
    - -
    -
    - '; - echo ' - - '; - - $this->flush(); - } - - protected function draw_progress() { - - $width = round($this->ticks / $this->max_ticks * 100, 2); - $label = sprintf($this->label, $this->ticks, $this->max_ticks); - - echo ' - - - '; - $this->flush(); - } - - protected function flush() { - while(ob_get_level() > 0) { - ob_end_flush(); - } - - flush(); - } + + protected $bar_id; + + protected $max_ticks; + + protected $ticks; + + protected $label; + + public function __construct($max_ticks, $label = '%d van %d') { + $this->bar_id = uniqid('progressbar'); + $this->label = $label; + + $this->max_ticks = $max_ticks; + $this->ticks = 0; + } + + public function tick() { + $this->ticks++; + $this->draw_progress(); + } + + public function draw() { + $this->draw_bar(); + $this->draw_progress(); + } + + static public function draw_css() { + echo ' + + '; + } + + protected function draw_bar() { + echo ' +
    + +
    + +
    +
    + '; + echo ' + + '; + + $this->flush(); + } + + protected function draw_progress() { + + $width = round($this->ticks / $this->max_ticks * 100, 2); + $label = sprintf($this->label, $this->ticks, $this->max_ticks); + + echo ' + + + '; + $this->flush(); + } + + protected function flush() { + while(ob_get_level() > 0) { + ob_end_flush(); + } + + flush(); + } } -?> \ No newline at end of file +?> \ No newline at end of file diff --git a/karte.php b/karte.php index 293db5e8..77610161 100644 --- a/karte.php +++ b/karte.php @@ -32,7 +32,7 @@ else{ <?php echo SERVER_NAME ?> - + @@ -60,8 +60,8 @@ else{ window.addEvent('domready', start); - - + +
    @@ -69,7 +69,7 @@ else{
    -getMapCheck($_GET['d']) == $_GET['c']) { include("Templates/Map/vilview.tpl"); @@ -77,7 +77,7 @@ if(isset($_GET['d']) && isset($_GET['c'])) { else { header("Location: dorf1.php"); } -} +} else { include("Templates/Map/mapview.tpl"); } @@ -95,9 +95,9 @@ include("Templates/links.tpl");
    -
    @@ -105,7 +105,7 @@ include("Templates/res.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
    Server time:
    diff --git a/karte2.php b/karte2.php index 0fac757e..d86e97e7 100644 --- a/karte2.php +++ b/karte2.php @@ -1,48 +1,48 @@ -pageLoadTimeStart(); - $building->procBuild($_GET); -if($session->plus){ -?> - - - - <?php echo SERVER_NAME ?> - - - - - - - - - - - - - - -
    -
    -
    - Calculated in pageLoadTimeEnd()-$start)*1000);?> ms
    - Server time: -
    -
    -
    -
    - - -pageLoadTimeStart(); + $building->procBuild($_GET); +if($session->plus){ +?> + + + + <?php echo SERVER_NAME ?> + + + + + + + + + + + + + + +
    +
    +
    + Calculated in pageLoadTimeEnd()-$start)*1000);?> ms
    + Server time: +
    +
    +
    +
    + + + \ No newline at end of file diff --git a/login.php b/login.php index 8c9691df..6a098b78 100644 --- a/login.php +++ b/login.php @@ -25,7 +25,7 @@ if(!isset($_COOKIE['COOKUSR'])) { <?php echo SERVER_NAME; ?> - + @@ -34,11 +34,11 @@ if(!isset($_COOKIE['COOKUSR'])) { - - + + - - + + @@ -79,14 +79,14 @@ FinishMessage = "START NOW"; function calcage(secs, num1, num2) { s = ((Math.floor(secs/num1))%num2).toString(); if (LeadingZero && s.length < 2) - s = "0" + s; + s = "0" + s; return "" + s + ""; } function CountBack(secs) { if (secs < 0) { - document.getElementById("cntdwn").innerHTML = FinishMessage; - return; + document.getElementById("cntdwn").innerHTML = FinishMessage; + return; } DisplayStr = DisplayFormat.replace(/%%D%%/g, calcage(secs,86400,100000)); DisplayStr = DisplayStr.replace(/%%H%%/g, calcage(secs,3600,24)); @@ -95,7 +95,7 @@ function CountBack(secs) { document.getElementById("cntdwn").innerHTML = DisplayStr; if (CountActive) - setTimeout("CountBack(" + (secs+CountStepper) + ")", SetTimeOutPeriod); + setTimeout("CountBack(" + (secs+CountStepper) + ")", SetTimeOutPeriod); } function putspan(backcolor, forecolor) { @@ -137,7 +137,7 @@ CountBack(gsecs); date('H:i')){ ?>
    Server will start in:
    @@ -152,14 +152,14 @@ FinishMessage = "START NOW"; function calcage(secs, num1, num2) { s = ((Math.floor(secs/num1))%num2).toString(); if (LeadingZero && s.length < 2) - s = "0" + s; + s = "0" + s; return "" + s + ""; } function CountBack(secs) { if (secs < 0) { - document.getElementById("cntdwn").innerHTML = FinishMessage; - return; + document.getElementById("cntdwn").innerHTML = FinishMessage; + return; } DisplayStr = DisplayFormat.replace(/%%D%%/g, calcage(secs,86400,100000)); DisplayStr = DisplayStr.replace(/%%H%%/g, calcage(secs,3600,24)); @@ -168,7 +168,7 @@ function CountBack(secs) { document.getElementById("cntdwn").innerHTML = DisplayStr; if (CountActive) - setTimeout("CountBack(" + (secs+CountStepper) + ")", SetTimeOutPeriod); + setTimeout("CountBack(" + (secs+CountStepper) + ")", SetTimeOutPeriod); } function putspan(backcolor, forecolor) { @@ -334,8 +334,8 @@ if(NEWSBOX3) { include("Templates/News/newsbox3.tpl"); }
    -
    - +
    +
    diff --git a/logout.php b/logout.php index 93b18825..ce1f833c 100644 --- a/logout.php +++ b/logout.php @@ -45,8 +45,8 @@ $start = $generator->pageLoadTimeStart(); window.addEvent('domready', start); - - + +
    @@ -72,8 +72,8 @@ include("Templates/news.tpl");
    -
    @@ -81,7 +81,7 @@ include("Templates/footer.tpl"); Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
    Server time:
    diff --git a/manual.php b/manual.php index 25555037..6ade5aff 100644 --- a/manual.php +++ b/manual.php @@ -17,7 +17,7 @@ include("GameEngine/config.php"); <?php echo SERVER_NAME; ?> - + @@ -26,12 +26,12 @@ include("GameEngine/config.php"); - - + + - - - + + + - + <?php echo SERVER_NAME ?> - + @@ -99,12 +99,12 @@ if (isset($_GET['send']) && isset($_GET['from'])) "; } ?> - + + - + - - gpack == null || GP_ENABLE == false) { - echo " - - "; - } else { - echo " - - "; - } - ?> - + + gpack == null || GP_ENABLE == false) { + echo " + + "; + } else { + echo " + + "; + } + ?> + - +
    @@ -148,42 +148,42 @@ if (isset($_GET['send']) && isset($_GET['from']))