From 3349d82f6bb9f99d2b914074b8110f9898857ac1 Mon Sep 17 00:00:00 2001 From: Marvin Lukaschek Date: Mon, 11 Feb 2019 19:16:06 +0100 Subject: [PATCH 1/3] Remove $_SESSION['getInfo'] --- web/includes/sb-callback.php | 3 +-- web/pages/page.servers.php | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/web/includes/sb-callback.php b/web/includes/sb-callback.php index 5cfaa3233..f0bbb5d35 100644 --- a/web/includes/sb-callback.php +++ b/web/includes/sb-callback.php @@ -2549,8 +2549,7 @@ function RefreshServer($sid) $sid = (int)$sid; session_start(); $data = $GLOBALS['db']->GetRow("SELECT ip, port FROM `".DB_PREFIX."_servers` WHERE sid = ?;", array($sid)); - if (isset($_SESSION['getInfo.' . $data['ip'] . '.' . $data['port']]) && is_array($_SESSION['getInfo.' . $data['ip'] . '.' . $data['port']])) - unset($_SESSION['getInfo.' . $data['ip'] . '.' . $data['port']]); + $objResponse->addScript("xajax_ServerHostPlayers('".$sid."');"); return $objResponse; } diff --git a/web/pages/page.servers.php b/web/pages/page.servers.php index c64cc6bd4..fc6f9d975 100644 --- a/web/pages/page.servers.php +++ b/web/pages/page.servers.php @@ -43,9 +43,6 @@ $servers = array(); $i = 0; while (!$res->EOF) { - if (isset($_SESSION['getInfo.' . $res->fields[1] . '.' . $res->fields[2]])) { - $_SESSION['getInfo.' . $res->fields[1] . '.' . $res->fields[2]] = ""; - } $info = array(); $info['sid'] = $res->fields[0]; $info['ip'] = $res->fields[1]; From a93cb680de0d5ed09ba0ee1301f6a8402f67c0a3 Mon Sep 17 00:00:00 2001 From: Marvin Lukaschek Date: Mon, 11 Feb 2019 19:16:51 +0100 Subject: [PATCH 2/3] Replace $_SESSION['aid'] with CUserManager->GetAid() --- web/includes/Log.php | 7 ++++--- web/includes/sb-callback.php | 2 +- web/init.php | 18 +++++++++--------- web/pages/admin.bans.php | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/web/includes/Log.php b/web/includes/Log.php index 9c29a535a..58c46ccd7 100644 --- a/web/includes/Log.php +++ b/web/includes/Log.php @@ -3,14 +3,15 @@ class Log { private static $dbs = null; - public static function init(\Database $dbs) + private static $user = null; + public static function init(\Database $dbs, \CUserManager $user) { self::$dbs = $dbs; + self::$user = $user; } public static function add($type, $title, $message) { - $aid = filter_var($_SESSION['aid'], FILTER_VALIDATE_INT) ? $_SESSION['aid'] : -1; $host = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP) ? $_SERVER['REMOTE_ADDR'] : ''; self::$dbs->query( @@ -22,7 +23,7 @@ public static function add($type, $title, $message) self::$dbs->bind(':message', filter_var($message, FILTER_SANITIZE_STRING)); self::$dbs->bind(':function', filter_var(self::getCaller(), FILTER_SANITIZE_STRING)); self::$dbs->bind(':query', filter_var($_SERVER['QUERY_STRING'], FILTER_SANITIZE_STRING)); - self::$dbs->bind(':aid', $aid); + self::$dbs->bind(':aid', self::$user->GetAid()); self::$dbs->bind(':host', $host); self::$dbs->execute(); } diff --git a/web/includes/sb-callback.php b/web/includes/sb-callback.php index f0bbb5d35..fa33ebc19 100644 --- a/web/includes/sb-callback.php +++ b/web/includes/sb-callback.php @@ -2876,7 +2876,7 @@ function BanFriends($friendid, $name) ':authid' => $steam, ':name' => filter_var($fname, FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES), ':reason' => "Steam Community Friend Ban (".$name.")", - ':aid' => $_SESSION['aid'], + ':aid' => $userbank->GetAid(), ':admip' => $_SERVER['REMOTE_ADDR'] ]); if (!$GLOBALS['PDO']->execute()) { diff --git a/web/init.php b/web/init.php index 74e48ba2a..5db86c7c4 100644 --- a/web/init.php +++ b/web/init.php @@ -139,14 +139,20 @@ require_once(INCLUDES_PATH.'/SteamID/bootstrap.php'); \SteamID\SteamID::init($GLOBALS['PDO']); -require_once(INCLUDES_PATH.'/Log.php'); -Log::init($GLOBALS['PDO']); - require_once(INCLUDES_PATH.'/Config.php'); Config::init($GLOBALS['PDO']); Auth::init($GLOBALS['PDO']); +// --------------------------------------------------- +// Setup our user manager +// --------------------------------------------------- + +$userbank = new CUserManager(Auth::verify()); + +require_once(INCLUDES_PATH.'/Log.php'); +Log::init($GLOBALS['PDO'], $userbank); + // --------------------------------------------------- // Setup our custom error handler // --------------------------------------------------- @@ -226,9 +232,3 @@ function sbError($errno, $errstr, $errfile, $errline) 'cache' => SB_CACHE, 'loader' => new Mustache_Loader_FilesystemLoader(SB_THEMES.$theme_name) ])); - -// --------------------------------------------------- -// Setup our user manager -// --------------------------------------------------- - -$userbank = new CUserManager(Auth::verify()); diff --git a/web/pages/admin.bans.php b/web/pages/admin.bans.php index 833ed66a7..256a4541b 100644 --- a/web/pages/admin.bans.php +++ b/web/pages/admin.bans.php @@ -71,7 +71,7 @@ ); $GLOBALS['PDO']->bindMultiple([ ':ip' => $line[2], - ':aid' => $_SESSION['aid'], + ':aid' => $userbank->GetAid(), ':admip' => $_SERVER['REMOTE_ADDR'] ]); $GLOBALS['PDO']->execute(); @@ -96,7 +96,7 @@ $GLOBALS['PDO']->bindMultiple([ ':authid' => $steam, ':name' => $name, - ':aid' => $_SESSION['aid'], + ':aid' => $userbank->GetAid(), ':ip' => $_SERVER['REMOTE_ADDR'] ]); $GLOBALS['PDO']->execute(); From 602c865fbf702318ffbfb9b3732de8ce8b3c1c71 Mon Sep 17 00:00:00 2001 From: Marvin Lukaschek Date: Mon, 11 Feb 2019 19:22:00 +0100 Subject: [PATCH 3/3] Bump git count --- web/configs/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/configs/version.json b/web/configs/version.json index d4d909d87..42f395b3e 100644 --- a/web/configs/version.json +++ b/web/configs/version.json @@ -1,5 +1,5 @@ { "version": "1.7.0", - "git": "808", + "git": "931", "dev": true }