xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-07 05:14:31 +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/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) {