From f94f830cbb2b838adc83ede629a59192ffa3f1dd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:49:28 +0000
Subject: [PATCH] Address code review feedback: improve error handling and
 clean up no-op function signature

Agent-Logs-Url: https://github.com/GameServerPanel/GSP/sessions/209fe796-9a38-47c1-a6b7-992ce11d038b

Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
---
 modules/ftp/includes/database.inc.php        | 4 ++--
 modules/ftp/includes/registerglobals.inc.php | 2 +-
 modules/mysql/mysql_database.php             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ftp/includes/database.inc.php b/modules/ftp/includes/database.inc.php
index f1adb319..630e231c 100644
--- a/modules/ftp/includes/database.inc.php
+++ b/modules/ftp/includes/database.inc.php
@@ -29,8 +29,8 @@ function connect2db() {
 	global $net2ftp_settings;
 
 	$mydb = mysqli_connect($net2ftp_settings["dbserver"], $net2ftp_settings["dbusername"], $net2ftp_settings["dbpassword"], $net2ftp_settings["dbname"]);
-	if ($mydb == false) { 
-		setErrorVars(false, __("Unable to connect to the MySQL database. Please check your MySQL database settings in net2ftp's configuration file settings.inc.php."), debug_backtrace(), __FILE__, __LINE__);
+	if ($mydb == false || mysqli_connect_errno()) { 
+		setErrorVars(false, __("Unable to connect to the MySQL database or select the database. Please check your MySQL database settings in net2ftp's configuration file settings.inc.php."), debug_backtrace(), __FILE__, __LINE__);
 		return false;
 	}
 
diff --git a/modules/ftp/includes/registerglobals.inc.php b/modules/ftp/includes/registerglobals.inc.php
index 443ea45a..92c2d920 100644
--- a/modules/ftp/includes/registerglobals.inc.php
+++ b/modules/ftp/includes/registerglobals.inc.php
@@ -427,7 +427,7 @@ $net2ftp_globals["browser_platform"] = getBrowser("platform");
 // **                                                                                  **
 // **                                                                                  **
 
-function remove_magic_quotes(&$x, $keyname="") {
+function remove_magic_quotes($x, $keyname="") {
 
 	// get_magic_quotes_gpc() was removed in PHP 8.0; magic quotes are always
 	// disabled on PHP 5.4+, so this function is now a no-op kept for
diff --git a/modules/mysql/mysql_database.php b/modules/mysql/mysql_database.php
index c31ae35f..1568cd48 100644
--- a/modules/mysql/mysql_database.php
+++ b/modules/mysql/mysql_database.php
@@ -45,7 +45,7 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
 
         $this->link = mysqli_connect($db_host, $db_user, $db_pass, $db_name);
 
-        if ( $this->link === FALSE )
+        if ( $this->link === FALSE || mysqli_connect_errno() )
             return -11;