From 636bc3969bf393bee573c86edef0ca7c6131445a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Nov 2025 13:59:15 -0500 Subject: [PATCH 1/3] Composer(deps): Bump adodb/adodb-php from 5.22.8 to 5.22.10 in /web (#1054) Bumps [adodb/adodb-php](https://github.com/ADOdb/ADOdb) from 5.22.8 to 5.22.10. - [Release notes](https://github.com/ADOdb/ADOdb/releases) - [Changelog](https://github.com/ADOdb/ADOdb/blob/master/docs/changelog.md) - [Commits](https://github.com/ADOdb/ADOdb/compare/v5.22.8...v5.22.10) --- updated-dependencies: - dependency-name: adodb/adodb-php dependency-version: 5.22.10 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/composer.lock b/web/composer.lock index dda41aabf..4e8457bf8 100644 --- a/web/composer.lock +++ b/web/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "adodb/adodb-php", - "version": "v5.22.8", + "version": "v5.22.10", "source": { "type": "git", "url": "https://github.com/ADOdb/ADOdb.git", - "reference": "bc0d3e05ce89f3c73c24d1cb78de57793d1afe3a" + "reference": "38ce257600e67b1e854f2e9054166569cff4bf6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/bc0d3e05ce89f3c73c24d1cb78de57793d1afe3a", - "reference": "bc0d3e05ce89f3c73c24d1cb78de57793d1afe3a", + "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/38ce257600e67b1e854f2e9054166569cff4bf6b", + "reference": "38ce257600e67b1e854f2e9054166569cff4bf6b", "shasum": "" }, "require": { @@ -65,7 +65,7 @@ "issues": "https://github.com/ADOdb/ADOdb/issues", "source": "https://github.com/ADOdb/ADOdb" }, - "time": "2025-01-25T01:10:09+00:00" + "time": "2025-08-03T16:20:39+00:00" }, { "name": "doctrine/lexer", @@ -1403,6 +1403,6 @@ "ext-openssl": "*", "php": ">=8.2" }, - "platform-dev": [], - "plugin-api-version": "2.2.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } From a405404b164b5d24a8f3dd77d123c9d08544a022 Mon Sep 17 00:00:00 2001 From: Rushaway Date: Sun, 2 Nov 2025 19:59:48 +0100 Subject: [PATCH 2/3] fix(blockit): Prevent php warnings (#1028) - Uncommented and fixed the database query to get server data and prevent php warnings for $data - Added null coalescing operator for hostname array access --- web/pages/admin.blockit.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/pages/admin.blockit.php b/web/pages/admin.blockit.php index c4849f8bc..a8f237db9 100644 --- a/web/pages/admin.blockit.php +++ b/web/pages/admin.blockit.php @@ -80,13 +80,13 @@ function BlockPlayer($check, int $sid, $num, $type, int $length) return $objResponse; } -// $GLOBALS['PDO']->query("SELECT ip, port FROM `:prefix_servers` WHERE sid = :sid"); -// $GLOBALS['PDO']->bind(':sid', $sid); -// $sdata = $GLOBALS['PDO']->single(); + $GLOBALS['PDO']->query("SELECT ip, port FROM `:prefix_servers` WHERE sid = :sid"); + $GLOBALS['PDO']->bind(':sid', $sid); + $sdata = $GLOBALS['PDO']->single(); // show hostname instead of the ip, but leave the ip in the title $hostsearch = preg_match_all('/hostname:[ ]*(.+)/', $ret, $hostname, PREG_PATTERN_ORDER); - $hostname = trunc(htmlspecialchars($hostname[1][0]), 25); + $hostname = trunc(htmlspecialchars($hostname[1][0] ?? ''), 25); if (!empty($hostname)) $objResponse->addAssign("srvip_$num", "innerHTML", "" . $hostname . ""); From 69ba281d769531c1df68f1397e5a6096eca63975 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 18:04:03 -0500 Subject: [PATCH 3/3] Composer(deps): Bump maxmind-db/reader from 1.12.0 to 1.13.1 in /web (#1059) Bumps [maxmind-db/reader](https://github.com/maxmind/MaxMind-DB-Reader-php) from 1.12.0 to 1.13.1. - [Release notes](https://github.com/maxmind/MaxMind-DB-Reader-php/releases) - [Changelog](https://github.com/maxmind/MaxMind-DB-Reader-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/maxmind/MaxMind-DB-Reader-php/compare/v1.12.0...v1.13.1) --- updated-dependencies: - dependency-name: maxmind-db/reader dependency-version: 1.13.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/composer.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web/composer.lock b/web/composer.lock index 4e8457bf8..59239d3de 100644 --- a/web/composer.lock +++ b/web/composer.lock @@ -286,16 +286,16 @@ }, { "name": "maxmind-db/reader", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90" + "reference": "2194f58d0f024ce923e685cdf92af3daf9951908" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90", - "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/2194f58d0f024ce923e685cdf92af3daf9951908", + "reference": "2194f58d0f024ce923e685cdf92af3daf9951908", "shasum": "" }, "require": { @@ -308,12 +308,13 @@ "friendsofphp/php-cs-fixer": "3.*", "phpstan/phpstan": "*", "phpunit/phpunit": ">=8.0.0,<10.0.0", - "squizlabs/php_codesniffer": "3.*" + "squizlabs/php_codesniffer": "4.*" }, "suggest": { "ext-bcmath": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", - "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" + "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups", + "maxmind-db/reader-ext": "C extension for significantly faster IP lookups (install via PIE: pie install maxmind-db/reader-ext)" }, "type": "library", "autoload": { @@ -343,9 +344,9 @@ ], "support": { "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues", - "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.12.0" + "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.13.1" }, - "time": "2024-11-14T22:43:47+00:00" + "time": "2025-11-21T22:24:26+00:00" }, { "name": "psr/clock",