diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 5904860a..e2b3a65f 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -56,8 +56,7 @@ public function __construct() { { $this->demolitionComplete(); } - // TODO: check if commenting-out this next line affected anything (it shouldn't) and should improve performance - //$this->updateStore(); + $this->delTradeRoute(); $this->TradeRoute(); if(!file_exists("GameEngine/Prevention/market.txt") or time()-filemtime("GameEngine/Prevention/market.txt")>50) { @@ -2571,7 +2570,7 @@ private function sendunitsComplete() { } else if (!$village_destroyed) { // you took over the village $villname = addslashes($database->getVillageField($data['to'],"name")); - $artifact = $database->getOwnArtefactInfo($data['to']); + $artifact = reset($database->getOwnArtefactInfo($data['to'])); $info_chief = "".$chief_pic.",Inhabitants of ".$villname." village decided to join your empire."; diff --git a/GameEngine/Logging.php b/GameEngine/Logging.php index 2e9f8e4d..ab4265a5 100755 --- a/GameEngine/Logging.php +++ b/GameEngine/Logging.php @@ -98,17 +98,11 @@ public function clearLogs() { global $database; } - public function debug($time,$uid,$debug_info) { - global $database; - list($time,$uid,$debug_info) = $database->escape_input((int) $time,(int) $uid,$debug_info); - - //$debugFile = "/tmp/debug"; - //$fh = fopen($debugFile, 'a') or die('No debug file'); - //fwrite($fh,"\n".date("Y-m-d H:i:s")." : ".$time.",".$uid.",".$debug_info."\n"); - //fclose($fh); - - //$q = "INSERT INTO ".TB_PREFIX."debug_log (time,uid,debug_info) VALUES ($time,$uid,'$debug_info')"; - //$database->query($q); + public function debug($debug_info, $time = 0) { + global $database, $generator; + list($debug_info) = $database->escape_input($debug_info); + + echo ''; } }; diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index 1ebe6dda..761f8bc6 100755 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -19,9 +19,10 @@ public function getRank() { } public function getUserRank($id) { + global $database; $ranking = $this->getRank(); $users = "SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8"); - $users2 = mysqli_fetch_array(mysqli_query($GLOBALS['link'],$users), MYSQLI_ASSOC); + $users2 = mysqli_fetch_array(mysqli_query($database->dblink,$users), MYSQLI_ASSOC); $users2 = $users2['Total']; $users3 = $users2+1; $myrank = 0; @@ -220,7 +221,7 @@ public function searchRank($name, $field) { } public function procRankArray() { - global $multisort; + global $multisort, $database; if($GLOBALS['db']->countUser() > 0){ $holder = array(); if(SHOW_NATARS == True){ @@ -273,7 +274,7 @@ public function procRankArray() { $datas = array(); - $result = (mysqli_query($GLOBALS['link'],$q)); + $result = (mysqli_query($database->dblink,$q)); while($row = mysqli_fetch_assoc($result)) { $datas[] = $row; } @@ -300,7 +301,7 @@ public function procRankArray() { } public function procRankRaceArray($race) { - global $multisort,$database; + global $multisort, $database; $race = $database->escape((int) $race); //$array = $GLOBALS['db']->getRanking(); $holder = array(); @@ -331,7 +332,7 @@ public function procRankRaceArray($race) { ORDER BY totalpop DESC, totalvillages DESC, userid DESC"; - $result = (mysqli_query($GLOBALS['link'],$q)); + $result = (mysqli_query($database->dblink,$q)); while($row = mysqli_fetch_assoc($result)) { $datas[] = $row; } @@ -367,7 +368,7 @@ public function procRankRaceArray($race) { } public function procAttRankArray() { - global $multisort; + global $multisort, $database; //$array = $GLOBALS['db']->getRanking(); $holder = array(); @@ -388,7 +389,7 @@ public function procAttRankArray() { WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 AND " . TB_PREFIX . "users.id > 5 ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, userid DESC"; - $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink)); + $result = mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink)); while($row = mysqli_Fetch_assoc($result)) { $datas[] = $row; } @@ -413,6 +414,7 @@ public function procAttRankArray() { } public function procDefRankArray() { + global $database; //global $GLOBALS['db'], $multisort; //$array = $GLOBALS['db']->getRanking(); $holder = array(); @@ -431,7 +433,7 @@ public function procDefRankArray() { WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 AND " . TB_PREFIX . "users.id > 5 ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, userid DESC"; - $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink)); + $result = mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink)); while($row = mysqli_Fetch_assoc($result)) { $datas[] = $row; } diff --git a/Templates/links.tpl b/Templates/links.tpl index 38f8953a..3135a809 100644 --- a/Templates/links.tpl +++ b/Templates/links.tpl @@ -17,7 +17,7 @@ while($data = mysqli_fetch_assoc($query)) { $links[] = $data; } -print '

'; +print '
Links:
'; foreach($links as $link) { // Check, if the url is extern if(substr($link['url'], -1, 1) == '*') { diff --git a/Templates/menu.tpl b/Templates/menu.tpl index 0256df28..6895807c 100644 --- a/Templates/menu.tpl +++ b/Templates/menu.tpl @@ -66,12 +66,13 @@ div.c1 {text-align: center} -

+

isDeleting($session->uid); if($timestamp) { - echo ""; + id=\"timer1\">".$time." .
"; } ?>

-
+

Hi username; ?>,

-
+

»

diff --git a/a2b.php b/a2b.php index 61e5d3bc..f95391cd 100644 --- a/a2b.php +++ b/a2b.php @@ -248,7 +248,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/a2b2.php b/a2b2.php index a8a27617..38d8d3a6 100644 --- a/a2b2.php +++ b/a2b2.php @@ -348,7 +348,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/banned.php b/banned.php index 801812ba..981e2560 100644 --- a/banned.php +++ b/banned.php @@ -68,7 +68,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/berichte.php b/berichte.php index e311cd8d..f01f2259 100644 --- a/berichte.php +++ b/berichte.php @@ -145,7 +145,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/create_account.php b/create_account.php index b51900a6..054483e9 100644 --- a/create_account.php +++ b/create_account.php @@ -570,7 +570,6 @@ function Artefact($uid, $type, $size, $art_name, $village_name, $desc, $effect, include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/crop_finder.php b/crop_finder.php index 2a6bda49..eb14c508 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -322,7 +322,6 @@ function getDistance($coorx1, $coory1, $coorx2, $coory2) { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/dorf1.php b/dorf1.php index dff16579..f93342ba 100644 --- a/dorf1.php +++ b/dorf1.php @@ -91,7 +91,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/dorf2.php b/dorf2.php index d55b80eb..9f8570d9 100644 --- a/dorf2.php +++ b/dorf2.php @@ -82,7 +82,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/dorf3.php b/dorf3.php index b2033b2f..c69d734e 100644 --- a/dorf3.php +++ b/dorf3.php @@ -99,7 +99,6 @@
diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css index 23379556..1e764612 100644 --- a/gpack/travian_default/lang/en/compact.css +++ b/gpack/travian_default/lang/en/compact.css @@ -396,6 +396,28 @@ div#side_navi p.deltimer a { padding: 0; text-align: center; } +div#side_navi table { + background-color: #FFFFFF; + width: auto; + padding-left: 12px; +} +div#side_navi table td { + line-height: 18px; + padding: 0; + text-align: left; + white-space: nowrap; +} +div#side_navi table thead td { + background-color: #FFFFFF; + height: 22px; +} +div#side_navi td.dot { + padding: 0 6px; + width: 10px; +} +div#side_navi td.link { + padding-right: 10px; +} div#side_info { float: left; padding-left: 10px; @@ -5908,6 +5930,16 @@ div#side_navi p.deltimer a { div#side_navi p.deltimer a span { color: #FF8000; } +div#side_navi table thead td a { + color: black; + font-weight: bold; +} +div#side_navi table tbody td { + font-size: 11px; +} +div#side_navi td.link { + font-size: 13px; +} div#side_info h6 { color: #FF8000; font-size: 13px; diff --git a/login.php b/login.php index 848f3635..d2176e35 100644 --- a/login.php +++ b/login.php @@ -50,7 +50,7 @@ - + diff --git a/nachrichten.php b/nachrichten.php index 4e0a1a5f..22fafa9f 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -161,7 +161,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/packages.php b/packages.php index dc68ec0c..0ff89303 100644 --- a/packages.php +++ b/packages.php @@ -86,7 +86,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/plus.php b/plus.php index 87b26e98..9c063a35 100644 --- a/plus.php +++ b/plus.php @@ -159,7 +159,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/rules.php b/rules.php index 34f2b9fc..10796f38 100644 --- a/rules.php +++ b/rules.php @@ -74,7 +74,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/spieler.php b/spieler.php index d65d7b05..33f6f7e2 100644 --- a/spieler.php +++ b/spieler.php @@ -171,7 +171,6 @@ function med_showDescription(coords, desc_string){ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/statistiken.php b/statistiken.php index 97dcb350..0f0b1285 100644 --- a/statistiken.php +++ b/statistiken.php @@ -176,7 +176,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/support.php b/support.php index 8341cece..a225aa1a 100644 --- a/support.php +++ b/support.php @@ -149,7 +149,6 @@ function chkFormular () { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/sysmsg.php b/sysmsg.php index 5962ec34..6d4d79e4 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -15,10 +15,10 @@ AccessLogger::logRequest(); $max_per_pass = 1000; -if (mysqli_num_rows(mysqli_query($GLOBALS['link'],"SELECT id FROM ".TB_PREFIX."users WHERE access = 9 AND id = ".$session->uid)) != '1') die("Hacking attempt!"); +if (mysqli_num_rows(mysqli_query($database->dblink,"SELECT id FROM ".TB_PREFIX."users WHERE access = 9 AND id = ".$session->uid)) != '1') die("Hacking attempt!"); if(isset($_GET['del'])){ - mysqli_query($GLOBALS['link'], "UPDATE ".TB_PREFIX."users SET ok = 0"); + mysqli_query($database->dblink, "UPDATE ".TB_PREFIX."users SET ok = 0"); } if (@$_POST['submit'] == "Send") @@ -44,7 +44,7 @@ // $text = utf8_encode($text); fwrite($fh, $text); - mysqli_query($GLOBALS['link'], "UPDATE ".TB_PREFIX."users SET ok = 1"); + mysqli_query($database->dblink, "UPDATE ".TB_PREFIX."users SET ok = 1"); $done = true; } else { die("


wrong"); } diff --git a/version.php b/version.php index b332abf1..9b6d575a 100644 --- a/version.php +++ b/version.php @@ -68,7 +68,7 @@
-
+
1. ronix - For coding above and beyond the call of duty
2. Dzoki - Version starter
3. Shadow - For coding above and beyond the call of duty
@@ -101,10 +101,10 @@ 30. Armando
31. aggenkeech
32. Niko28
-33. martinambrus

-
Released by: Shadow
-Visit: RageZone.com

-
Download from Github
+33. martinambrus

+
Released by: Shadow

+Visit: RageZone.com

+
Download from Github




@@ -112,7 +112,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/warsim.php b/warsim.php index cd3a9f58..533a0a3b 100644 --- a/warsim.php +++ b/warsim.php @@ -172,7 +172,6 @@ include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); -include("Templates/links.tpl"); ?>
diff --git a/winner.php b/winner.php index 03e1b7b8..fffc5c48 100644 --- a/winner.php +++ b/winner.php @@ -242,7 +242,6 @@ function mysqli_result($res, $row, $field=0) { include("Templates/multivillage.tpl"); include("Templates/quest.tpl"); include("Templates/news.tpl"); - include("Templates/links.tpl"); ?>
Links:
"; + echo "
"; if($timestamp > time()+48*3600) { echo "uid."&a=1&e=4\">\"CancelgetTimeFormat(($timestamp-time())); echo " The account will be deleted in ".$time." .