diff --git a/Admin/Templates/Notice/all.tpl b/Admin/Templates/Notice/all.tpl index 0ebda1d0..714a8561 100644 --- a/Admin/Templates/Notice/all.tpl +++ b/Admin/Templates/Notice/all.tpl @@ -12,7 +12,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); $date2=strtotime("NOW"); if ($golds['plus'] <= $date2) { ?> diff --git a/Admin/Templates/server_info.tpl b/Admin/Templates/server_info.tpl index 3a2004cc..26f8d799 100644 --- a/Admin/Templates/server_info.tpl +++ b/Admin/Templates/server_info.tpl @@ -35,7 +35,7 @@ $users = mysqli_num_rows(mysqli_query($GLOBALS["link"], "SELECT SQL_CACHE * FROM Players online dblink));; $num_rows = mysqli_num_rows($result); echo $num_rows;?> diff --git a/Admin/database.php b/Admin/database.php index 4986d35f..04290f6e 100644 --- a/Admin/database.php +++ b/Admin/database.php @@ -31,8 +31,8 @@ class adm_DB { function adm_DB(){ global $database; - $this->connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error()); - mysqli_select_db($this->connection, SQL_DB) or die(mysqli_error()); + $this->connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error($database->dblink)); + mysqli_select_db($this->connection, SQL_DB) or die(mysqli_error($database->dblink)); } function Login($username,$password){ diff --git a/GameEngine/Account.php b/GameEngine/Account.php index 4ce9f4bf..bf7baf19 100755 --- a/GameEngine/Account.php +++ b/GameEngine/Account.php @@ -226,7 +226,7 @@ class Account { global $session,$database; unset($_SESSION['wid']); $database->activeModify(addslashes($session->username),1); - $database->UpdateOnline("logout") or die(mysqli_error()); + $database->UpdateOnline("logout") or die(mysqli_error($database->dblink)); $session->Logout(); } diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php index c131c2c8..413f2ce0 100755 --- a/GameEngine/Admin/Mods/addUsers.php +++ b/GameEngine/Admin/Mods/addUsers.php @@ -102,7 +102,7 @@ else // Need a $database function for this // (assuming we don't already have one as creating Natars also updates this way) $q = "UPDATE " . TB_PREFIX . "users SET desc2 = '[#0]' WHERE id = $uid"; - mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); + mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); if (!$beginnersProtection) { @@ -113,7 +113,7 @@ else $protection = time(); mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET protect = '".$protection."' -WHERE id = $uid") or die(mysqli_error()); +WHERE id = $uid") or die(mysqli_error($database->dblink)); } $database->updateUserField($uid,"act","",1); @@ -129,7 +129,7 @@ WHERE id = $uid") or die(mysqli_error()); //insert village with all resource and building with random level $time = time(); $q = "INSERT INTO ".TB_PREFIX."vdata (`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','$uid','".$userName."\'s village',1,200,1,0,0,$rand_resource,$rand_resource,$rand_resource,$cap_storage,$rand_resource,$cap_storage,$time,100,0,0,0,$time)"; - mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); + mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid ,".rand(5,10).",1,".rand(5,10).",4,".rand(5,10).",1,".rand(5,10).",3,".rand(5,10).",2,".rand(5,10).",2,".rand(5,10).",3,".rand(5,10).",4,".rand(5,10).",4,".rand(5,10).",3,".rand(5,10).",3,".rand(5,10).",4,".rand(5,10).",4,".rand(5,10).",1,".rand(5,10).",4,".rand(5,10).",2,".rand(5,10).",1,".rand(5,10).",2,".rand(2,5).",8,".rand(5,20).",37,".rand(10,20).",26,".rand(10,20).",22,".rand(10,20).",19,".rand(2,5).",9,$level_storage,11,".rand(10,20).",15,".rand(10,20).",20,0,0,".rand(10,15).",17,$level_storage,10,".rand(5,10).",12,0,0,10,23,0,0,0,0,0,0,0,0,".rand(5,10).",18,".rand(5,10).",16,0,0,0,0,'World Wonder')"; mysqli_query($GLOBALS["link"], $q); $pop = $automation->recountPop($wid); diff --git a/GameEngine/Admin/Mods/additional.php b/GameEngine/Admin/Mods/additional.php index 673cd9d1..cbe36d2a 100755 --- a/GameEngine/Admin/Mods/additional.php +++ b/GameEngine/Admin/Mods/additional.php @@ -42,7 +42,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET RR = '".$_POST['res']."', apall = '".$_POST['ooff']."', dpall = '".$_POST['odef']."' - WHERE id = ".$id."") or die(mysqli_error()); + WHERE id = ".$id."") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editAccess.php b/GameEngine/Admin/Mods/editAccess.php index 9cdb998b..e34d4331 100755 --- a/GameEngine/Admin/Mods/editAccess.php +++ b/GameEngine/Admin/Mods/editAccess.php @@ -28,7 +28,7 @@ $access = $_POST['access']; mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET access = ".$access." - WHERE id = ".$id."") or die(mysqli_error()); + WHERE id = ".$id."") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editBuildings.php b/GameEngine/Admin/Mods/editBuildings.php index 7680a8df..d8f9c6da 100755 --- a/GameEngine/Admin/Mods/editBuildings.php +++ b/GameEngine/Admin/Mods/editBuildings.php @@ -101,7 +101,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."fdata SET f39t = '".$_POST['id39gid']."', f40 = '".$_POST['id40level']."', f40t = '".$_POST['id40gid']."' - WHERE vref = $id") or die(mysqli_error()); + WHERE vref = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=village&did=".$id.""); ?> diff --git a/GameEngine/Admin/Mods/editOverall.php b/GameEngine/Admin/Mods/editOverall.php index c8616341..f2263add 100755 --- a/GameEngine/Admin/Mods/editOverall.php +++ b/GameEngine/Admin/Mods/editOverall.php @@ -27,7 +27,7 @@ if($sessionaccess != 9) die("

Access Denied: You are not mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET apall = '".$_POST['off']."', dpall = '".$_POST['def']."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editPassword.php b/GameEngine/Admin/Mods/editPassword.php index fe90213d..c84429fb 100755 --- a/GameEngine/Admin/Mods/editPassword.php +++ b/GameEngine/Admin/Mods/editPassword.php @@ -27,7 +27,7 @@ if($sessionaccess != 9) die("

Access Denied: You are not mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET password = '".$pass."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editPlus.php b/GameEngine/Admin/Mods/editPlus.php index e63a329b..d5a0750e 100755 --- a/GameEngine/Admin/Mods/editPlus.php +++ b/GameEngine/Admin/Mods/editPlus.php @@ -65,7 +65,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET b2 = '".$clay."', b3 = '".$iron."', b4 = '".$crop."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editProtection.php b/GameEngine/Admin/Mods/editProtection.php index 94b5ac35..c8c00337 100755 --- a/GameEngine/Admin/Mods/editProtection.php +++ b/GameEngine/Admin/Mods/editProtection.php @@ -29,7 +29,7 @@ $protection = (time() + $dur); mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET protect = '".$protection."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editResources.php b/GameEngine/Admin/Mods/editResources.php index 868ea4bc..a91359ee 100755 --- a/GameEngine/Admin/Mods/editResources.php +++ b/GameEngine/Admin/Mods/editResources.php @@ -31,7 +31,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."vdata SET crop = '".$_POST['crop']."', maxstore = '".$_POST['maxstore']."', maxcrop = '".$_POST['maxcrop']."' - WHERE wref = '".$id."'") or die(mysqli_error()); + WHERE wref = '".$id."'") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=village&did=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editSitter.php b/GameEngine/Admin/Mods/editSitter.php index 44d7320b..78003204 100755 --- a/GameEngine/Admin/Mods/editSitter.php +++ b/GameEngine/Admin/Mods/editSitter.php @@ -27,7 +27,7 @@ if($sessionaccess != 9) die("

Access Denied: You are not mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET sit1 = '".$_POST['sitter1']."', sit2 = '".$_POST['sitter2']."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editUser.php b/GameEngine/Admin/Mods/editUser.php index 07df4466..59665d60 100755 --- a/GameEngine/Admin/Mods/editUser.php +++ b/GameEngine/Admin/Mods/editUser.php @@ -31,7 +31,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET desc1 = '".$_POST['desc1']."', desc2 = '".$_POST['desc2']."', quest = '".$_POST['quest']."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editVillageOwner.php b/GameEngine/Admin/Mods/editVillageOwner.php index fc2a1424..af382fef 100755 --- a/GameEngine/Admin/Mods/editVillageOwner.php +++ b/GameEngine/Admin/Mods/editVillageOwner.php @@ -26,7 +26,7 @@ if($sessionaccess != 9) die("

Access Denied: You are not mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."vdata SET owner = '".$_POST['newowner']."' - WHERE wref = $id") or die(mysqli_error()); + WHERE wref = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$_POST['newowner'].""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editWeek.php b/GameEngine/Admin/Mods/editWeek.php index 0ff224d7..0c1293e1 100755 --- a/GameEngine/Admin/Mods/editWeek.php +++ b/GameEngine/Admin/Mods/editWeek.php @@ -28,7 +28,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET ap = '".$_POST['off']."', dp = '".$_POST['def']."', RR = '".$_POST['res']."' - WHERE id = $id") or die(mysqli_error()); + WHERE id = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/giveResBonus.php b/GameEngine/Admin/Mods/giveResBonus.php index 25355534..1e7c61ee 100755 --- a/GameEngine/Admin/Mods/giveResBonus.php +++ b/GameEngine/Admin/Mods/giveResBonus.php @@ -26,7 +26,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); $q = "UPDATE ".TB_PREFIX."users SET gold = gold + ".$_POST['gold']." WHERE id != '0'"; -mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); +mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=maintenenceResetPlusBonus&g"); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/gold.php b/GameEngine/Admin/Mods/gold.php index 8a9a105f..e719d808 100755 --- a/GameEngine/Admin/Mods/gold.php +++ b/GameEngine/Admin/Mods/gold.php @@ -26,7 +26,7 @@ $sessionaccess = $access['access']; if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); $q = "UPDATE ".TB_PREFIX."users SET gold = gold + ".$_POST['gold']." WHERE id != '0'"; -mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); +mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?p=gold&g"); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php index cc41c21f..ca1eefeb 100755 --- a/GameEngine/Admin/Mods/natarbuildingplan.php +++ b/GameEngine/Admin/Mods/natarbuildingplan.php @@ -25,7 +25,7 @@ for($i=1;$i<=$amt;$i++) { $database->setFieldTaken($wid); $time = time(); $q = "insert into ".TB_PREFIX."vdata (`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','3','".PLANVILLAGE."',0,0,0,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,1314968914)"; - mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); + mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,10,27,20,10,10,22,10,25,0,0,20,15,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,0,0,'World Wonder')"; mysqli_query($GLOBALS["link"], $q); $pop = $automation->recountPop($wid); @@ -46,10 +46,10 @@ for($i=1;$i<=$amt;$i++) { fwrite($fh, $text); $query="SELECT * FROM ".TB_PREFIX."users ORDER BY id + 0 DESC"; - $result=mysqli_query($GLOBALS["link"], $query) or die (mysqli_error()); + $result=mysqli_query($GLOBALS["link"], $query) or die (mysqli_error($database->dblink)); for ($i=0; $row=mysqli_fetch_row($result); $i++) { $updateattquery = mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."users SET ok = '1' WHERE id = '".$row[0]."'") - or die(mysqli_error()); + or die(mysqli_error($database->dblink)); } mysqli_query($GLOBALS["link"], "Insert into ".TB_PREFIX."admin_log values (0,$id,'Added $amt WW Buildingplan Villages',".time().")"); diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php index 2e3596ed..0858a71d 100755 --- a/GameEngine/Admin/Mods/natarend.php +++ b/GameEngine/Admin/Mods/natarend.php @@ -26,7 +26,7 @@ for($i=1;$i<=$amt;$i++) { $database->setFieldTaken($wid); $time = time(); $q = "insert into ".TB_PREFIX."vdata (`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`,`natar`) values ('$wid','3','".WWVILLAGE."',0,0,0,0,0,80000.00,80000.00,80000.00,80000,80000.00,80000,1314974534,100,0,0,0,$time,1)"; - mysqli_query($GLOBALS["link"], $q) or die(mysqli_error()); + mysqli_query($GLOBALS["link"], $q) or die(mysqli_error($database->dblink)); $q = "insert into ".TB_PREFIX."fdata (`vref`,`f1`,`f1t`,`f2`,`f2t`,`f3`,`f3t`,`f4`,`f4t`,`f5`,`f5t`,`f6`,`f6t`,`f7`,`f7t`,`f8`,`f8t`,`f9`,`f9t`,`f10`,`f10t`,`f11`,`f11t`,`f12`,`f12t`,`f13`,`f13t`,`f14`,`f14t`,`f15`,`f15t`,`f16`,`f16t`,`f17`,`f17t`,`f18`,`f18t`,`f19`,`f19t`,`f20`,`f20t`,`f21`,`f21t`,`f22`,`f22t`,`f23`,`f23t`,`f24`,`f24t`,`f25`,`f25t`,`f26`,`f26t`,`f27`,`f27t`,`f28`,`f28t`,`f29`,`f29t`,`f30`,`f30t`,`f31`,`f31t`,`f32`,`f32t`,`f33`,`f33t`,`f34`,`f34t`,`f35`,`f35t`,`f36`,`f36t`,`f37`,`f37t`,`f38`,`f38t`,`f39`,`f39t`,`f40`,`f40t`,`f99`,`f99t`,`wwname`) values ($wid,0,1,0,4,0,1,0,3,0,2,0,2,0,3,0,4,0,4,0,3,0,3,0,4,0,4,0,1,0,4,0,2,0,1,0,2,20,17,20,11,20,15,20,10,10,22,10,25,0,0,0,0,10,19,0,0,0,0,0,0,10,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,0,0,0,40,'World Wonder')"; mysqli_query($GLOBALS["link"], $q); $pop = $automation->recountPop($wid); diff --git a/GameEngine/Admin/Mods/recalcWH.php b/GameEngine/Admin/Mods/recalcWH.php index f4244f36..a0c9f1ca 100755 --- a/GameEngine/Admin/Mods/recalcWH.php +++ b/GameEngine/Admin/Mods/recalcWH.php @@ -105,7 +105,7 @@ mysqli_query($GLOBALS["link"], "UPDATE ".TB_PREFIX."fdata SET f39t = '".$_POST['id39gid']."', f40 = '".$_POST['id40level']."', f40t = '".$_POST['id40gid']."' - WHERE vref = $id") or die(mysqli_error()); + WHERE vref = $id") or die(mysqli_error($database->dblink)); header("Location: ../../../Admin/admin.php?action=recountPop&did=".$id.""); ?> \ No newline at end of file diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index e3291d03..1a41b4d1 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -882,7 +882,7 @@ class Automation { } // get the capital village from the natars - $query = mysqli_query($GLOBALS['link'],'SELECT `wref` FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = 3 and `capital` = 1 LIMIT 1') or die(mysqli_error()); + $query = mysqli_query($GLOBALS['link'],'SELECT `wref` FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = 3 and `capital` = 1 LIMIT 1') or die(mysqli_error($database->dblink)); $row = mysqli_fetch_assoc($query); // start the attacks @@ -4205,7 +4205,7 @@ $wallimg = "dblink)); } } diff --git a/GameEngine/Data/hunitdata.php b/GameEngine/Data/hunitdata.php index c71c3a5c..ba8611dd 100755 --- a/GameEngine/Data/hunitdata.php +++ b/GameEngine/Data/hunitdata.php @@ -8,7 +8,7 @@ ## Copyright: TravianX (c) 2010-2011. All rights reserved. ## ## ## ################################################################################# -$getheroinfo = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."hero WHERE `uid`='".$session->uid."'") or die(mysqli_error()); +$getheroinfo = mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."hero WHERE `uid`='".$session->uid."'") or die(mysqli_error($database->dblink)); $heroinfo = mysqli_fetch_array($getheroinfo); echo $heroinfo['attackpower']; $hero=array('atk'=>40*$heroinfo['attackpower'],'di'=>35,'dc'=>50,'wood'=>120,'clay'=>100,'iron'=>150,'crop'=>30,'pop'=>6,'speed'=>6,'time'=>1600,'cap'=>0); diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 8f616859..90c8bfd5 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -23,7 +23,7 @@ class MYSQLi_DB { var $dblink; function __construct() { - $this->dblink = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error()); + $this->dblink = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error($database->dblink)); mysqli_select_db($this->dblink, SQL_DB); mysqli_query($this->dblink,"SET NAMES 'UTF8'"); } @@ -231,14 +231,14 @@ class MYSQLi_DB { function getVrefField($ref, $field){ $q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = '$ref'"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray[$field]; } function getVrefCapital($ref){ $q = "SELECT * FROM " . TB_PREFIX . "vdata where owner = '$ref' and capital = 1"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray; } @@ -263,7 +263,7 @@ class MYSQLi_DB { } else { $q = "SELECT $field FROM " . TB_PREFIX . "activate where username = '$ref'"; } - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray[$field]; } @@ -525,7 +525,7 @@ class MYSQLi_DB { } $time = time(); $q = "INSERT into " . TB_PREFIX . "vdata (wref, owner, name, capital, pop, cp, celebration, wood, clay, iron, maxstore, crop, maxcrop, lastupdate, created) values ('$wid', '$uid', '$vname', '$capital', 2, 1, 0, 750, 750, 750, ".STORAGE_BASE.", 750, ".STORAGE_BASE.", '$time', '$time')"; - return mysqli_query($this->dblink,$q) or die(mysqli_error()); + return mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function addResourceFields($vid, $type) { @@ -1519,7 +1519,7 @@ class MYSQLi_DB { } else { $q = "SELECT $field FROM " . TB_PREFIX . "ali_permission where username = '$ref'"; } - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray[$field]; } @@ -2135,7 +2135,7 @@ class MYSQLi_DB { $time = time(); $q = "INSERT INTO " . TB_PREFIX . "ali_invite values (0,$uid,$alli,$sender,$time,0)"; - return mysqli_query($this->dblink,$q) or die(mysqli_error()); + return mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function removeInvitation($id) { @@ -2283,7 +2283,7 @@ class MYSQLi_DB { $time = time(); } $q = "INSERT INTO " . TB_PREFIX . "ndata (id, uid, toWref, ally, topic, ntype, data, time, viewed) values (0,'$uid','$toWref','$ally','$topic',$type,'$data',$time,0)"; - return mysqli_query($this->dblink,$q) or die(mysqli_error()); + return mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function getNotice($uid) { @@ -2347,7 +2347,7 @@ class MYSQLi_DB { list($id) = $this->escape_input($id); $q = "SELECT * FROM " . TB_PREFIX . "route where id = $id"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray; } @@ -2356,7 +2356,7 @@ class MYSQLi_DB { list($id) = $this->escape_input($id); $q = "SELECT * FROM " . TB_PREFIX . "route where id = $id"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['uid']; } @@ -2383,7 +2383,7 @@ class MYSQLi_DB { list($wid, $field, $type, $loop, $time, $master, $level) = $this->escape_input($wid, $field, $type, $loop, $time, $master, $level); $x = "UPDATE " . TB_PREFIX . "fdata SET f" . $field . "t=" . $type . " WHERE vref=" . $wid; - mysqli_query($this->dblink,$x) or die(mysqli_error()); + mysqli_query($this->dblink,$x) or die(mysqli_error($database->dblink)); $q = "INSERT into " . TB_PREFIX . "bdata values (0,$wid,$field,$type,$loop,$time,$master,$level)"; return mysqli_query($this->dblink,$q); } @@ -2483,13 +2483,13 @@ class MYSQLi_DB { } else { if($jobs[$jobDeleted]['field'] >= 19) { $x = "SELECT f" . $jobs[$jobDeleted]['field'] . " FROM " . TB_PREFIX . "fdata WHERE vref=" . $jobs[$jobDeleted]['wid']; - $result = mysqli_query($this->dblink,$x) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$x) or die(mysqli_error($database->dblink)); $fieldlevel = mysqli_fetch_row($result); if($fieldlevel[0] == 0) { if ($village->natar==1 && $jobs[$jobDeleted]['field']==99) { //fix by ronix }else{ $x = "UPDATE " . TB_PREFIX . "fdata SET f" . $jobs[$jobDeleted]['field'] . "t=0 WHERE vref=" . $jobs[$jobDeleted]['wid']; - mysqli_query($this->dblink,$x) or die(mysqli_error()); + mysqli_query($this->dblink,$x) or die(mysqli_error($database->dblink)); } } } @@ -2497,7 +2497,7 @@ class MYSQLi_DB { if(($jobs[$jobLoopconID]['field'] <= 18 && $jobs[$jobDeleted]['field'] <= 18) || ($jobs[$jobLoopconID]['field'] >= 19 && $jobs[$jobDeleted]['field'] >= 19) || sizeof($jobs) < 3) { $uprequire = $building->resourceRequired($jobs[$jobLoopconID]['field'], $jobs[$jobLoopconID]['type']); $x = "UPDATE " . TB_PREFIX . "bdata SET loopcon=0,timestamp=" . (time() + $uprequire['time']) . " WHERE wid=" . $jobs[$jobDeleted]['wid'] . " AND loopcon=1 AND master=0"; - mysqli_query($this->dblink,$x) or die(mysqli_error()); + mysqli_query($this->dblink,$x) or die(mysqli_error($database->dblink)); } } } @@ -2728,7 +2728,7 @@ class MYSQLi_DB { list($vref, $field) = $this->escape_input($vref, $field); $q = "SELECT $field FROM " . TB_PREFIX . "market where vref = '$vref'"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray[$field]; } @@ -3119,7 +3119,7 @@ class MYSQLi_DB { list($vref, $unit) = $this->escape_input($vref, $unit); $q = "SELECT $unit FROM " . TB_PREFIX . "tdata WHERE vref = $vref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray[$unit]; } @@ -3444,7 +3444,7 @@ class MYSQLi_DB { list($vref) = $this->escape_input($vref); $q = "SELECT f99 FROM " . TB_PREFIX . "fdata WHERE vref = $vref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['f99']; } @@ -3458,7 +3458,7 @@ class MYSQLi_DB { list($vref) = $this->escape_input($vref); $q = "SELECT owner FROM " . TB_PREFIX . "vdata WHERE wref = $vref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['owner']; } @@ -3472,7 +3472,7 @@ class MYSQLi_DB { list($id) = $this->escape_input($id); $q = "SELECT alliance FROM " . TB_PREFIX . "users where id = $id"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['alliance']; } @@ -3486,7 +3486,7 @@ class MYSQLi_DB { list($vref) = $this->escape_input($vref); $q = "SELECT wwname FROM " . TB_PREFIX . "fdata WHERE vref = $vref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['wwname']; } @@ -3643,7 +3643,7 @@ class MYSQLi_DB { list($wref) = $this->escape_input($wref); $q = "SELECT wood FROM " . TB_PREFIX . "vdata WHERE wref = $wref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['wood']; } @@ -3652,7 +3652,7 @@ class MYSQLi_DB { list($wref) = $this->escape_input($wref); $q = "SELECT clay FROM " . TB_PREFIX . "vdata WHERE wref = $wref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['clay']; } @@ -3661,7 +3661,7 @@ class MYSQLi_DB { list($wref) = $this->escape_input($wref); $q = "SELECT iron FROM " . TB_PREFIX . "vdata WHERE wref = $wref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['iron']; } @@ -3670,7 +3670,7 @@ class MYSQLi_DB { list($wref) = $this->escape_input($wref); $q = "SELECT crop FROM " . TB_PREFIX . "vdata WHERE wref = $wref"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); return $dbarray['crop']; } @@ -4055,18 +4055,18 @@ class MYSQLi_DB { function addPassword($uid, $npw, $cpw){ $q = "REPLACE INTO `" . TB_PREFIX . "password`(uid, npw, cpw) VALUES ($uid, '$npw', '$cpw')"; - mysqli_query($this->dblink,$q) or die(mysqli_error()); + mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function resetPassword($uid, $cpw){ $q = "SELECT npw FROM `" . TB_PREFIX . "password` WHERE uid = $uid AND cpw = '$cpw' AND used = 0"; - $result = mysqli_query($this->dblink,$q) or die(mysqli_error()); + $result = mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); $dbarray = mysqli_fetch_array($result); if(!empty($dbarray)) { if(!$this->updateUserField($uid, 'password', md5($dbarray['npw']), 1)) return false; $q = "UPDATE `" . TB_PREFIX . "password` SET used = 1 WHERE uid = $uid AND cpw = '$cpw' AND used = 0"; - mysqli_query($this->dblink,$q) or die(mysqli_error()); + mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); return true; } @@ -4155,7 +4155,7 @@ class MYSQLi_DB { $time = time(); $q = "INSERT INTO " . TB_PREFIX . "general values (0,'$casualties','$time',1)"; - return mysqli_query($this->dblink,$q) or die(mysqli_error()); + return mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function getAttackByDate($time) { @@ -4250,7 +4250,7 @@ class MYSQLi_DB { list($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11) = $this->escape_input($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11); $q = "UPDATE " . TB_PREFIX . "prisoners set t1 = t1 + $t1, t2 = t2 + $t2, t3 = t3 + $t3, t4 = t4 + $t4, t5 = t5 + $t5, t6 = t6 + $t6, t7 = t7 + $t7, t8 = t8 + $t8, t9 = t9 + $t9, t10 = t10 + $t10, t11 = t11 + $t11 where wref = $wid and ".TB_PREFIX."prisoners.from = $from"; - return mysqli_query($this->dblink,$q) or die(mysqli_error()); + return mysqli_query($this->dblink,$q) or die(mysqli_error($database->dblink)); } function getPrisoners($wid,$mode=0) { diff --git a/GameEngine/Message.php b/GameEngine/Message.php index ae2a811b..c8c66eaf 100755 --- a/GameEngine/Message.php +++ b/GameEngine/Message.php @@ -322,7 +322,7 @@ class Message { // Vulnerability closed by Shadow $q = "SELECT * FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".time()." - 60"; - $res = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error(). " query ".$q); + $res = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink). " query ".$q); $flood = mysqli_num_rows($res); if($flood > 5) return; //flood @@ -411,7 +411,7 @@ class Message { // Vulnerability closed by Shadow $q = "SELECT * FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".time()." - 60"; - $res = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error(). " query ".$q); + $res = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink). " query ".$q); $flood = mysqli_num_rows($res); if($flood > 5) return; //flood diff --git a/GameEngine/Profile.php b/GameEngine/Profile.php index b77d54d5..a5b8d494 100755 --- a/GameEngine/Profile.php +++ b/GameEngine/Profile.php @@ -120,7 +120,7 @@ class Profile { if($set){ unset($_SESSION['wid']); $database->activeModify(addslashes($session->username),1); - $database->UpdateOnline("logout") or die(mysqli_error()); + $database->UpdateOnline("logout") or die(mysqli_error($database->dblink)); $session->Logout(); header("Location: login.php"); }else{ diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index f6298379..811a9a26 100755 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -378,7 +378,7 @@ FROM " . TB_PREFIX . "users WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, userid DESC"; - $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error()); + $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink)); while($row = mysqli_Fetch_assoc($result)) { $datas[] = $row; } @@ -420,7 +420,7 @@ FROM " . TB_PREFIX . "users WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, userid DESC"; - $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error()); + $result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error($database->dblink)); while($row = mysqli_Fetch_assoc($result)) { $datas[] = $row; } diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php index 962ef0bc..b13efa75 100755 --- a/GameEngine/Technology.php +++ b/GameEngine/Technology.php @@ -182,7 +182,7 @@ class Technology { global $village,$$unit; $unitarray = $$unit; $res = array(); - $res = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT maxstore, maxcrop, wood, clay, iron, crop FROM ".TB_PREFIX."vdata WHERE wref = ".$village->wid)) or die(mysqli_error()); + $res = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT maxstore, maxcrop, wood, clay, iron, crop FROM ".TB_PREFIX."vdata WHERE wref = ".$village->wid)) or die(mysqli_error($database->dblink)); if ($res['wood'] > $res['maxstore']){$res['wood'] = $res['maxstore'];} if ($res['clay'] > $res['maxstore']){$res['clay'] = $res['maxstore'];} if ($res['iron'] > $res['maxstore']){$res['iron'] = $res['maxstore'];} @@ -208,7 +208,7 @@ class Technology { global $village,$$unit; $unitarray = $$unit; $res = array(); - $res = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT maxstore, maxcrop, wood, clay, iron, crop FROM ".TB_PREFIX."vdata WHERE wref = ".$village->wid)) or die(mysqli_error()); + $res = mysqli_fetch_assoc(mysqli_query($GLOBALS['link'],"SELECT maxstore, maxcrop, wood, clay, iron, crop FROM ".TB_PREFIX."vdata WHERE wref = ".$village->wid)) or die(mysqli_error($database->dblink)); $totalres = $res['wood']+$res['clay']+$res['iron']+$res['crop']; $totalresunit = ($unitarray['wood'] * ($great?3:1))+($unitarray['clay'] * ($great?3:1))+($unitarray['iron'] * ($great?3:1))+($unitarray['crop'] * ($great?3:1)); $max =round($totalres/$totalresunit); diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl index 29bc63ec..0dccd628 100644 --- a/Templates/Ajax/mapscroll.tpl +++ b/Templates/Ajax/mapscroll.tpl @@ -86,7 +86,7 @@ $query2 = "SELECT where ".TB_PREFIX."wdata.id IN ($maparray) ORDER BY FIND_IN_SET(".TB_PREFIX."wdata.id,'$maparray2')"; -$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error()); +$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error($database->dblink)); $i=0; //Load coor array diff --git a/Templates/Ajax/mapscroll2.tpl b/Templates/Ajax/mapscroll2.tpl index 636290c4..ff1da200 100644 --- a/Templates/Ajax/mapscroll2.tpl +++ b/Templates/Ajax/mapscroll2.tpl @@ -101,7 +101,7 @@ $query2 = "SELECT ORDER BY FIND_IN_SET(".TB_PREFIX."wdata.id,'$maparray2')"; //echo $query2; -$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error()); +$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error($database->dblink)); $i=0; $i2=0; diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index 8189a442..c6b533f8 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -71,7 +71,7 @@ if (isset($qact)){ $_SESSION['qst']= 3; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=86400; @@ -151,7 +151,7 @@ if (isset($qact)){ $_SESSION['qst']= 11; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=172800; @@ -338,7 +338,7 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=86400; @@ -401,7 +401,7 @@ if (isset($qact)){ $_SESSION['qst']= 97; //Give Reward 20 gold + 2 days plus if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=172800; diff --git a/Templates/Ajax/quest_core25.tpl b/Templates/Ajax/quest_core25.tpl index 071cf8a0..187004f3 100644 --- a/Templates/Ajax/quest_core25.tpl +++ b/Templates/Ajax/quest_core25.tpl @@ -69,7 +69,7 @@ if (isset($qact)){ $_SESSION['qst']= 3; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=86400; @@ -154,7 +154,7 @@ if (isset($qact)){ $_SESSION['qst']= 11; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus','username'); $plus+=172800; @@ -322,7 +322,7 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus',1); $plus+=86400; @@ -385,7 +385,7 @@ if (isset($qact)){ $_SESSION['qst']= 97; //Give Reward 20 gold + 2 days plus if(!$session->plus){ - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$_SESSION['username']."'") or die(mysqli_error($database->dblink)); } else { $plus=$database->getUserField($_SESSION['username'],'plus',1); $plus+=172800; diff --git a/Templates/Build/26.tpl b/Templates/Build/26.tpl index 82a11b8e..2cb44d74 100644 --- a/Templates/Build/26.tpl +++ b/Templates/Build/26.tpl @@ -17,18 +17,18 @@ if($_POST AND $_GET['action'] == 'change_capital') { if($data2['vref'] != $village->wid) { for($i = 1; $i<=18; ++$i) { if($data2['f' . $i] > 10) { - $query2 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . '` = 10 WHERE `vref` = ' . $data2['vref']) or die(mysqli_error()); + $query2 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . '` = 10 WHERE `vref` = ' . $data2['vref']) or die(mysqli_error($database->dblink)); } } for($i=19; $i<=40; ++$i) { if($data2['f' . $i . 't'] == 34) { - $query3 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . 't` = 0, `f' . $i . '` = 0 WHERE `vref` = ' . $data2['vref']) or die(mysqli_error()); + $query3 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . 't` = 0, `f' . $i . '` = 0 WHERE `vref` = ' . $data2['vref']) or die(mysqli_error($database->dblink)); } } for($i=19; $i<=40; ++$i) { if($data2['f' . $i . 't'] == 29 or $data2['f' . $i . 't'] == 30 or $data2['f' . $i . 't'] == 38 or $data2['f' . $i . 't'] == 39 or $data2['f' . $i . 't'] == 42) { - $query3 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . 't` = 0, `f' . $i . '` = 0 WHERE `vref` = ' . $village->wid) or die(mysqli_error()); + $query3 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'fdata` SET `f' . $i . 't` = 0, `f' . $i . '` = 0 WHERE `vref` = ' . $village->wid) or die(mysqli_error($database->dblink)); } } $query3 = mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'vdata` SET `capital` = 0 WHERE `wref` = ' . $data1['wref']); diff --git a/Templates/Build/37_hero.tpl b/Templates/Build/37_hero.tpl index 9d138174..82c4b88c 100644 --- a/Templates/Build/37_hero.tpl +++ b/Templates/Build/37_hero.tpl @@ -14,7 +14,7 @@ global $database; if (isset($_POST['name'])) { $_POST['name'] = stripslashes($_POST['name']); - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `name`='".($database->escape($_POST['name']))."' where `uid`='".$session->uid."'") or die("ERROR:".mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `name`='".($database->escape($_POST['name']))."' where `uid`='".$session->uid."'") or die("ERROR:".mysqli_error($database->dblink)); $hero = mysqli_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = " . $session->uid . ""); $hero_info = mysqli_fetch_array($hero); echo "".NAME_CHANGED.""; diff --git a/Templates/Manual/52.tpl b/Templates/Manual/52.tpl index af9ddcfb..771e34e6 100644 --- a/Templates/Manual/52.tpl +++ b/Templates/Manual/52.tpl @@ -2,8 +2,8 @@ $count="0"; include("GameEngine/Config.php"); - $connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error()); - mysqli_select_db(SQL_DB, $connection) or die(mysqli_error()); + $connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysqli_error($database->dblink)); + mysqli_select_db(SQL_DB, $connection) or die(mysqli_error($database->dblink)); $q = "SELECT * FROM ".TB_PREFIX."movement where endtime < ".time()." and proc = 0"; $result = mysqli_query($GLOBALS["link"], $q, $connection); diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl index 19a5b213..5f84230c 100644 --- a/Templates/Map/mapview.tpl +++ b/Templates/Map/mapview.tpl @@ -111,7 +111,7 @@ $query2 = "SELECT //$query2; -$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error()); +$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error($database->dblink)); $targetalliance = array(); $neutralarray = array(); diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl index 03210410..4a261ae6 100644 --- a/Templates/Map/mapviewlarge.tpl +++ b/Templates/Map/mapviewlarge.tpl @@ -121,7 +121,7 @@ $query2 = "SELECT ORDER BY FIND_IN_SET(".TB_PREFIX."wdata.id,'$maparray2')"; //echo $query2; -$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error()); +$result2 = mysqli_query($GLOBALS['link'],$query2) or die(mysqli_error($database->dblink)); $targetalliance = array(); $neutralarray = array(); diff --git a/Templates/Message/inbox.tpl b/Templates/Message/inbox.tpl index d8ec3e06..50201a33 100644 --- a/Templates/Message/inbox.tpl +++ b/Templates/Message/inbox.tpl @@ -11,7 +11,7 @@ x
Sent uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); $date2=strtotime("NOW"); if ($golds['plus'] <= $date2) { ?> diff --git a/Templates/Message/sent.tpl b/Templates/Message/sent.tpl index 370ee3cb..88aaf95b 100644 --- a/Templates/Message/sent.tpl +++ b/Templates/Message/sent.tpl @@ -22,7 +22,7 @@ Recipient Sent uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); $date2=strtotime("NOW"); if ($golds['plus'] <= $date2) { ?> diff --git a/Templates/Notice/all.tpl b/Templates/Notice/all.tpl index dba36a62..3e1697e2 100644 --- a/Templates/Notice/all.tpl +++ b/Templates/Notice/all.tpl @@ -12,7 +12,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); $date2=strtotime("NOW"); if ($golds['plus'] <= $date2) { ?> diff --git a/Templates/Plus/10.tpl b/Templates/Plus/10.tpl index beabdc3d..5ffd5990 100644 --- a/Templates/Plus/10.tpl +++ b/Templates/Plus/10.tpl @@ -1,25 +1,25 @@ access != BANNED && $session->gold >= 5){ - $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); if($session->sit == 0) { if (mysqli_num_rows($MyGold) == 1) { if($golds['gold'] >= 5) { if($golds['b2'] < time()) { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b2 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b2 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } else { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b2 = '".($golds['b2']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b2 = '".($golds['b2']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } $done1 = "+25% Production: Clay"; - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error()); - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Clay')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Clay')") or die(mysqli_error($database->dblink)); } else { $done1 = "You need more gold"; } } else { $done1 = "Failed clay attempt"; - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Clay')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Clay')") or die(mysqli_error($database->dblink)); } } header("Location: plus.php?id=3"); diff --git a/Templates/Plus/11.tpl b/Templates/Plus/11.tpl index 0edc7a15..76684172 100644 --- a/Templates/Plus/11.tpl +++ b/Templates/Plus/11.tpl @@ -1,25 +1,25 @@ access != BANNED && $session->gold >= 5){ - $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); if($session->sit == 0) { if (mysqli_num_rows($MyGold)) { if($golds['gold'] >= 5) { if($golds['b3'] < time()) { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b3 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b3 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } else { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b3 = '".($golds['b3']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b3 = '".($golds['b3']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } $done1 = "+25% Production: Iron"; - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error()); - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Iron')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Iron')") or die(mysqli_error($database->dblink)); } else { $done1 = "You need more gold"; } } else { $done1 = "Failed iron attempt"; - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Iron')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Iron')") or die(mysqli_error($database->dblink)); } } header("Location: plus.php?id=3"); diff --git a/Templates/Plus/12.tpl b/Templates/Plus/12.tpl index c8568d01..d86d96f9 100644 --- a/Templates/Plus/12.tpl +++ b/Templates/Plus/12.tpl @@ -1,25 +1,25 @@ access != BANNED && $session->gold >= 5){ - $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error()); + $MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); $golds = mysqli_fetch_array($MyGold); if($session->sit == 0) { if (mysqli_num_rows($MyGold)) { if($golds['gold'] >= 5) { if($golds['b4'] < time()) { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b4 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b4 = '".(time()+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } else { - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b4 = '".($golds['b4']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set b4 = '".($golds['b4']+PLUS_PRODUCTION)."' where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); } $done1 = "+25% Production: Crop"; - mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error()); - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Crop')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."users set gold = ".($session->gold-5)." where `id`='".$session->uid."'") or die(mysqli_error($database->dblink)); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', '+25% Production: Crop')") or die(mysqli_error($database->dblink)); } else { $done1 = "You need more gold"; } } else { $done1 = "Failed crop attempt"; - mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Crop')") or die(mysqli_error()); + mysqli_query($GLOBALS['link'],"INSERT INTO ".TB_PREFIX."gold_fin_log (wid,log) VALUES ('".$village->wid."', 'Failed +25% Production: Crop')") or die(mysqli_error($database->dblink)); } } header("Location: plus.php?id=3"); diff --git a/Templates/Plus/13.tpl b/Templates/Plus/13.tpl index 015b14d3..d71b8129 100644 --- a/Templates/Plus/13.tpl +++ b/Templates/Plus/13.tpl @@ -1,6 +1,6 @@