From b63df89034bcbfa9cbabc232e06c68551050d798 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Sat, 21 Oct 2017 10:45:22 +0200 Subject: [PATCH] fix: logs work again (were missing mysqli connection identifier) --- Admin/database.php | 16 ++++++++-------- GameEngine/Admin/database.php | 12 ++++++------ Templates/Build/37_hero.tpl | 2 +- todo.txt | 3 +-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Admin/database.php b/Admin/database.php index 5f1b92b5..0ffa5ab8 100644 --- a/Admin/database.php +++ b/Admin/database.php @@ -72,12 +72,12 @@ class adm_DB { mysqli_query($this->connection, "UPDATE " . TB_PREFIX . "users SET password = '".password_hash($password, PASSWORD_BCRYPT,['cost' => 12])."'".($bcrypt_update_done ? ', is_bcrypt = 1' : '')." where id = ".(int) $dbarray['id']); } - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,'X','$username logged in (IP: ".$_SERVER['REMOTE_ADDR'].")',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,'X','$username logged in (IP: ".$_SERVER['REMOTE_ADDR'].")',".time().")"); return true; } else { - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,'X','IP: ".$_SERVER['REMOTE_ADDR']." tried to log in with username $username but access was denied!',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,'X','IP: ".$_SERVER['REMOTE_ADDR']." tried to log in with username $username but access was denied!',".time().")"); return false; } } @@ -159,7 +159,7 @@ class adm_DB { $status = $database->getVillageState($wid); $status = 0; if($status == 0){ - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Added new village $wid to user $uid',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Added new village $wid to user $uid',".time().")"); $database->setFieldTaken($wid); $database->addVillage($wid,$uid,'new village','0'); $database->addResourceFields($wid,$database->getVillageType($wid)); @@ -200,7 +200,7 @@ class adm_DB { mysqli_query($this->connection, $q); } } - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Punished user: ".(int) $post['uid']." with -".(int) $post['punish']."% population',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Punished user: ".(int) $post['uid']." with -".(int) $post['punish']."% population',".time().")"); } function PunishBuilding($vid,$proc,$pop){ @@ -243,7 +243,7 @@ class adm_DB { mysqli_query($this->connection, $q); $name = $database->getUserField($uid,"username",0); - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,$ID,'Deleted user $name',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,$ID,'Deleted user $name',".time().")"); $q = "DELETE FROM ".TB_PREFIX."users WHERE `id` = $uid;"; mysqli_query($this->connection, $q); } @@ -300,7 +300,7 @@ class adm_DB { } $result = mysqli_query($this->connection, $q); if(mysqli_num_rows($result) > 0){ - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Deleted village $wref',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Deleted village $wref',".time().")"); $database->clearExpansionSlot($wref); @@ -530,7 +530,7 @@ class adm_DB { function DelBan($uid,$id){ global $database; $name = addslashes($database->getUserField($uid,"username",0)); - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Unbanned user $name',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Unbanned user $name',".time().")"); $q = "UPDATE ".TB_PREFIX."users SET `access` = '".USER."' WHERE `id` = ".(int) $uid; mysqli_query($this->connection, $q); $q = "UPDATE ".TB_PREFIX."banlist SET `active` = '0' WHERE `id` = ".(int) $id; @@ -541,7 +541,7 @@ class adm_DB { global $database; list($end,$reason) = $database->escape_input($end,$reason); $name = addslashes($database->getUserField($uid,"username",0)); - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Banned user $name',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Banned user $name',".time().")"); $q = "UPDATE ".TB_PREFIX."users SET `access` = '0' WHERE `id` = ".(int) $uid; mysqli_query($this->connection, $q); $time = time(); diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php index b0f0f7bd..a86a1f36 100755 --- a/GameEngine/Admin/database.php +++ b/GameEngine/Admin/database.php @@ -78,12 +78,12 @@ class adm_DB { mysqli_query($this->connection, "UPDATE " . TB_PREFIX . "users SET password = '".password_hash($password, PASSWORD_BCRYPT,['cost' => 12])."'".($bcrypt_update_done ? ', is_bcrypt = 1' : '')." where id = ".(int) $dbarray['id']); } - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,'X','$username logged in (IP: ".$_SERVER['REMOTE_ADDR'].")',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,'X','$username logged in (IP: ".$_SERVER['REMOTE_ADDR'].")',".time().")"); return true; } else { - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,'X','IP: ".$_SERVER['REMOTE_ADDR']." tried to log in with username $username but access was denied!',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,'X','IP: ".$_SERVER['REMOTE_ADDR']." tried to log in with username $username but access was denied!',".time().")"); return false; } } @@ -167,7 +167,7 @@ class adm_DB { $status = $database->getVillageState($wid); $status = 0; if($status == 0){ - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Added new village $wid to user $uid',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Added new village $wid to user $uid',".time().")"); $database->setFieldTaken($wid); $database->addVillage($wid,$uid,'new village','0'); $database->addResourceFields($wid,$database->getVillageType($wid)); @@ -306,7 +306,7 @@ class adm_DB { } $result = mysqli_query($this->connection, $q); if(mysqli_num_rows($result) > 0){ - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Deleted village $wref',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Deleted village $wref',".time().")"); $database->clearExpansionSlot($wref); @@ -381,7 +381,7 @@ class adm_DB { global $database; $name = addslashes($database->getUserField($uid,"username",0)); $uid = (int) $uid; - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Unbanned user $name',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Unbanned user $name',".time().")"); $q = "UPDATE ".TB_PREFIX."users SET `access` = '".USER."' WHERE `id` = $uid;"; mysqli_query($this->connection, $q); $q = "UPDATE ".TB_PREFIX."banlist SET `active` = '0' WHERE `id` = $id;"; @@ -393,7 +393,7 @@ class adm_DB { $name = addslashes($database->getUserField($uid,"username",0)); list($end,$reason) = $database->escape_input($end,$reason); $uid = (int) $uid; - mysqli_query("Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Banned user $name',".time().")"); + mysqli_query($this->connection,"Insert into ".TB_PREFIX."admin_log values (0,".(int) $_SESSION['id'].",'Banned user $name',".time().")"); $q = "UPDATE ".TB_PREFIX."users SET `access` = '0' WHERE `id` = $uid"; mysqli_query($this->connection, $q); $time = time(); diff --git a/Templates/Build/37_hero.tpl b/Templates/Build/37_hero.tpl index 1a62b9f9..eb650590 100644 --- a/Templates/Build/37_hero.tpl +++ b/Templates/Build/37_hero.tpl @@ -15,7 +15,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`='".$database->escape($session->uid)."'") or die("ERROR:".mysqli_error($database->dblink)); - $hero = mysqli_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = " . (int) $session->uid . ""); + $hero = mysqli_query($database->dblink,"SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = " . (int) $session->uid . ""); $hero_info = mysqli_fetch_array($hero); echo "".NAME_CHANGED.""; } diff --git a/todo.txt b/todo.txt index f7084ea6..835aee14 100644 --- a/todo.txt +++ b/todo.txt @@ -1,5 +1,4 @@ - fix deleting users (need to delete their villages (+alliances/construction plans/...?) after a while) -- check if defeating a player (destroying their village) removes that village from map after a while (as stated in FAQ) - add PayPal listener to verify gold transactions imediatelly - add combat Simulator link to options for a village/oasis (Centre map, Raid, Send Troops...) - don't show Support & Taskmaster in stats @@ -24,4 +23,4 @@ - it's possible to train 2 senators - when 1 is trained, another one is possible to be trained - add registered date into user details in Admin - npc shop button is missing from settlers training (palace) -- logs don't seem to work \ No newline at end of file +- should random attacks from Natars when building Wonder of the World be unit-less? \ No newline at end of file