xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-09 22:26:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mysqli_error needs MySQLi connection as parameter

Browse Source
This commit is contained in:
Martin Ambrus
2017-10-17 13:05:13 +02:00
parent 6ceb273163
commit ac5d3538f8
57 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Account.php
+1 -1
View File
@@ -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();
}
GameEngine/Admin/Mods/addUsers.php
+3 -3
View File
@@ -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);
GameEngine/Admin/Mods/additional.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editAccess.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editBuildings.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editOverall.php
+1 -1
View File
@@ -27,7 +27,7 @@ if($sessionaccess != 9) die("<h1><font color=\"red\">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."");
?>
GameEngine/Admin/Mods/editPassword.php
+1 -1
View File
@@ -27,7 +27,7 @@ if($sessionaccess != 9) die("<h1><font color=\"red\">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."");
?>
GameEngine/Admin/Mods/editPlus.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editProtection.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editResources.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editSitter.php
+1 -1
View File
@@ -27,7 +27,7 @@ if($sessionaccess != 9) die("<h1><font color=\"red\">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."");
?>
GameEngine/Admin/Mods/editUser.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/editVillageOwner.php
+1 -1
View File
@@ -26,7 +26,7 @@ if($sessionaccess != 9) die("<h1><font color=\"red\">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']."");
?>
GameEngine/Admin/Mods/editWeek.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Admin/Mods/giveResBonus.php
+1 -1
View File
@@ -26,7 +26,7 @@ $sessionaccess = $access['access'];
if($sessionaccess != 9) die("<h1><font color=\"red\">Access Denied: You are not Admin!</font></h1>");
$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");
?>
GameEngine/Admin/Mods/gold.php
+1 -1
View File
@@ -26,7 +26,7 @@ $sessionaccess = $access['access'];
if($sessionaccess != 9) die("<h1><font color=\"red\">Access Denied: You are not Admin!</font></h1>");
$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");
?>
GameEngine/Admin/Mods/natarbuildingplan.php
+3 -3
View File
@@ -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 <b>$amt</b> WW Buildingplan Villages',".time().")");
GameEngine/Admin/Mods/natarend.php
+1 -1
View File
@@ -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);
GameEngine/Admin/Mods/recalcWH.php
+1 -1
View File
@@ -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."");
?>
GameEngine/Automation.php
+2 -2
View File
@@ -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 = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
$crop = 800 * STORAGE_MULTIPLIER;
}
mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'vdata` SET `maxstore` = ' . $ress . ', `maxcrop` = ' . $crop . ' WHERE `wref` = ' . $row['vref']) or die(mysqli_error());
mysqli_query($GLOBALS['link'],'UPDATE `' . TB_PREFIX . 'vdata` SET `maxstore` = ' . $ress . ', `maxcrop` = ' . $crop . ' WHERE `wref` = ' . $row['vref']) or die(mysqli_error($database->dblink));
}
}
GameEngine/Data/hunitdata.php
+1 -1
View File
@@ -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);
GameEngine/Database.php
+29 -29
View File
@@ -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) {
GameEngine/Message.php
+2 -2
View File
@@ -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
GameEngine/Profile.php
+1 -1
View File
@@ -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{
GameEngine/Ranking.php
+2 -2
View File
@@ -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;
}
GameEngine/Technology.php
+2 -2
View File
@@ -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);