From 60ac124ea921dbc021c12a7e33a3c40d3c800913 Mon Sep 17 00:00:00 2001 From: Ivor Barhansky Date: Fri, 26 Apr 2024 15:47:32 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9A=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20?= =?UTF-8?q?=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B8=20vendor=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D1=82=D1=8F=D0=B3=D0=B8=D0=B2=D0=B0=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B8=D0=B7=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B5=D0=B9=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B8=20src.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _incl_data/autoload.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_incl_data/autoload.php b/_incl_data/autoload.php index 865c3f24..a4e480d5 100644 --- a/_incl_data/autoload.php +++ b/_incl_data/autoload.php @@ -10,13 +10,18 @@ require_once 'mysql_override.php'; spl_autoload_register(function (string $className) { $rootdir = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . '_incl_data' . DIRECTORY_SEPARATOR; + $addsrc = function ($class) { + $c = explode('\\', $class); + array_splice($c, 1, 0, 'src'); + return implode(DIRECTORY_SEPARATOR, $c); + }; # 1 with namespaces # 2 without $fileName = [ $rootdir . 'class' . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className . '.php'), $rootdir . 'class' . DIRECTORY_SEPARATOR . $className . '.php', $rootdir . 'function' . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $className . '.php'), - $rootdir . 'vendor' . DIRECTORY_SEPARATOR . $className . '.php', + $rootdir . 'vendor' . DIRECTORY_SEPARATOR . $addsrc($className) . '.php', ]; foreach ($fileName as $file) { if (file_exists($file)) { From 3830c97ac296f9b0cab0e05223b14300dbb53ec3 Mon Sep 17 00:00:00 2001 From: Ivor Barhansky Date: Fri, 26 Apr 2024 16:08:30 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=82=D1=8B=20false=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _incl_data/class/Core/Db.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/_incl_data/class/Core/Db.php b/_incl_data/class/Core/Db.php index 813a20bc..6413b42d 100644 --- a/_incl_data/class/Core/Db.php +++ b/_incl_data/class/Core/Db.php @@ -53,11 +53,15 @@ class Db /** * @param string $query * @param array $args - * @return false|array + * @return array */ - public static function getRows(string $query, array $args = []): false|array + public static function getRows(string $query, array $args = []): array { - return self::run($query, $args)->fetchAll(); + $stmt = self::run($query, $args)->fetchAll(); + if (!$stmt) { + return []; + } + return $stmt; } /** @@ -108,19 +112,23 @@ class Db { $result = self::getRow($query, $args); if (!empty($result)) { - $result = array_shift($result); + return array_shift($result); } - return $result; + return ''; } /** * @param string $query * @param array $args - * @return mixed + * @return array */ - public static function getRow(string $query, array $args = []): mixed + public static function getRow(string $query, array $args = []): array { - return self::run($query, $args)->fetch(); + $stmt = self::run($query, $args)->fetch(); + if (!$stmt) { + return []; + } + return $stmt; } /** @@ -130,7 +138,11 @@ class Db */ public static function getColumn(string $query, array $args = []): array { - return self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN); + $stmt = self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN); + if (!$stmt) { + return []; + } + return $stmt; } /** From a6b5dd83c3b1b0b35cc13810cee99522271062d5 Mon Sep 17 00:00:00 2001 From: Ivor Barhansky Date: Fri, 26 Apr 2024 16:08:30 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=82=D1=8B=20false=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D0=BF=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _incl_data/class/Core/Db.php | 30 +++++++++++++++++++--------- _incl_data/class/User/Reputation.php | 20 +++++++++---------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/_incl_data/class/Core/Db.php b/_incl_data/class/Core/Db.php index 813a20bc..6413b42d 100644 --- a/_incl_data/class/Core/Db.php +++ b/_incl_data/class/Core/Db.php @@ -53,11 +53,15 @@ class Db /** * @param string $query * @param array $args - * @return false|array + * @return array */ - public static function getRows(string $query, array $args = []): false|array + public static function getRows(string $query, array $args = []): array { - return self::run($query, $args)->fetchAll(); + $stmt = self::run($query, $args)->fetchAll(); + if (!$stmt) { + return []; + } + return $stmt; } /** @@ -108,19 +112,23 @@ class Db { $result = self::getRow($query, $args); if (!empty($result)) { - $result = array_shift($result); + return array_shift($result); } - return $result; + return ''; } /** * @param string $query * @param array $args - * @return mixed + * @return array */ - public static function getRow(string $query, array $args = []): mixed + public static function getRow(string $query, array $args = []): array { - return self::run($query, $args)->fetch(); + $stmt = self::run($query, $args)->fetch(); + if (!$stmt) { + return []; + } + return $stmt; } /** @@ -130,7 +138,11 @@ class Db */ public static function getColumn(string $query, array $args = []): array { - return self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN); + $stmt = self::run($query, $args)->fetchAll(PDO::FETCH_COLUMN); + if (!$stmt) { + return []; + } + return $stmt; } /** diff --git a/_incl_data/class/User/Reputation.php b/_incl_data/class/User/Reputation.php index 23e671bb..fd739db0 100644 --- a/_incl_data/class/User/Reputation.php +++ b/_incl_data/class/User/Reputation.php @@ -20,6 +20,16 @@ class Reputation } } + private function getr(): array + { + return Db::getRow( + 'select *, + (repcapitalcity+repdemonscity+repangelscity+repsuncity+repdreamscity+repabandonedplain+repsandcity+repemeraldscity+repdevilscity) as allrep, + (nu_capitalcity+nu_demonscity+nu_angelscity+nu_suncity+nu_dreamscity+nu_abandonedplain+nu_sandcity+nu_emeraldscity+nu_devilscity) as allnurep + from rep where id = ?', [$this->uid] + ); + } + public function get(): array { return $this->r; @@ -34,14 +44,4 @@ class Reputation Db::sql("update rep set $dungeonName = ? where id = ?", [$value, $this->uid]); return $this->r[$dungeonName]; } - - private function getr() - { - return Db::getRow( - 'select *, - (repcapitalcity+repdemonscity+repangelscity+repsuncity+repdreamscity+repabandonedplain+repsandcity+repemeraldscity+repdevilscity) as allrep, - (nu_capitalcity+nu_demonscity+nu_angelscity+nu_suncity+nu_dreamscity+nu_abandonedplain+nu_sandcity+nu_emeraldscity+nu_devilscity) as allnurep - from rep where id = ?', [$this->uid] - ); - } } \ No newline at end of file