GSP/Panel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix all PHP 8 deprecated/removed function usage across the repository

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

Co-authored-by: iaretechnician <2749183+iaretechnician@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-30 13:47:38 +00:00 • committed by GitHub
parent 73319ffeed
commit c0bd0a0bb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 198 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

113
modules/mysql/edit_server.php
View file

@ -45,20 +45,14 @@ $(document).ready(function(){
require_once('includes/form_table_class.php');
require_once('includes/lib_remote.php');
if ( function_exists('mysqli_connect') )
require_once("modules/mysql/mysqli_database.php");
else
require_once("modules/mysql/mysql_database.php");
// mysqli is always available in PHP 7+
require_once("modules/mysql/mysqli_database.php");
function get_mysql_admin_user(array $mysql_server) {
return !empty($mysql_server['mysql_admin_user']) ? $mysql_server['mysql_admin_user'] : 'root';
}
function mysqli_connect_safe($host, $user, $pass, $db = "", $port = null) {
if (!function_exists('mysqli_connect')) {
return false;
}
mysqli_report(MYSQLI_REPORT_OFF);
try {
return mysqli_connect($host, $user, $pass, $db, $port);
@ -182,32 +176,6 @@ function exec_ogp_module() {
}
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], $mysql_db['db_user'], $mysql_db['db_passwd']);
if ( $link === FALSE )
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], get_mysql_admin_user($mysql_db), $mysql_db['mysql_root_passwd']);
if ( $link !== FALSE )
{
$queries = array("CREATE DATABASE IF NOT EXISTS `".$mysql_db['db_name']."`;",
"GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$mysql_db['db_passwd']."';",
"FLUSH PRIVILEGES;");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
{
break;
}
}
mysql_close($link);
}
}
}
}
print_success(get_lang_f('db_added_for_home_id',$_POST['home_id']));
}
@ -250,24 +218,6 @@ function exec_ogp_module() {
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], get_mysql_admin_user($mysql_db), $mysql_db['mysql_root_passwd']);
if ( $link !== FALSE )
{
$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
"DROP USER '".$mysql_db['db_user']."'@'%';");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
break;
}
mysql_close($link);
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
}
if ( $modDb->removeMysqlServerDB($db_id) === FALSE )
@ -338,25 +288,6 @@ function exec_ogp_module() {
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], get_mysql_admin_user($mysql_db), $mysql_db['mysql_root_passwd']);
if ( $link !== FALSE )
{
$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
"GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
"FLUSH PRIVILEGES;");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
break;
}
mysql_close($link);
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
}
}
@ -405,29 +336,6 @@ function exec_ogp_module() {
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], get_mysql_admin_user($mysql_db), $mysql_db['mysql_root_passwd']);
if ( $link !== FALSE )
{
if($enabled == "0")
$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
"FLUSH PRIVILEGES;");
else
$queries = array("GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
"FLUSH PRIVILEGES;");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
break;
}
mysql_close($link);
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
}
}
@ -490,23 +398,6 @@ function exec_ogp_module() {
mysqli_close($link);
}
}
else
{
@$link = mysql_connect($mysql_server['mysql_ip'].':'.$mysql_server['mysql_port'], get_mysql_admin_user($mysql_server), $mysql_server['mysql_root_passwd']);
if ( $link !== FALSE )
{
$queries = array("DROP DATABASE ".$mysql_db['db_name'].";",
"DROP USER '".$mysql_db['db_user']."'@'%';");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
break;
}
mysql_close($link);
}
}
}
}
}

118
modules/mysql/mysql_database.php
View file

@ -36,22 +36,18 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
}
public function connect($db_host, $db_user, $db_pass, $db_name, $table_prefix = NULL) {
if ( !extension_loaded("mysql") )
return -99;
// The mysql extension was removed in PHP 7. This class now uses mysqli.
$this->table_prefix = $table_prefix;
/// \todo We might want to do other checks here as well?
if ( $db_host === NULL )
return -1;
$this->link = mysql_connect($db_host, $db_user, $db_pass);
$this->link = mysqli_connect($db_host, $db_user, $db_pass, $db_name);
if ( $this->link === FALSE )
return -11;
if ( mysql_select_db($db_name,$this->link) === FALSE )
return -12;
return TRUE;
}
@ -60,20 +56,20 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
if ( !$this->link ) return FALSE;
++$this->queries_;
$result = mysql_query($query, $this->link);
$result = mysqli_query($this->link, $query);
if ( mysql_errno($this->link) > 0 )
print mysql_error($this->link);
if ( mysqli_errno($this->link) > 0 )
print mysqli_error($this->link);
if ( $result === FALSE )
return FALSE;
if ( mysql_num_rows($result) == 0 )
if ( mysqli_num_rows($result) == 0 )
return FALSE;
$results = array();
while ( $row = mysql_fetch_assoc( $result ) )
while ( $row = mysqli_fetch_assoc( $result ) )
array_push($results,$row);
return $results;
@ -93,22 +89,22 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
$query = sprintf("INSERT INTO `%smysql_servers` (`remote_server_id`,`mysql_name`,`mysql_ip`,`mysql_port`,`mysql_admin_user`,`mysql_root_passwd`,`privilegies_str`)
VALUES('%s','%s','%s','%s','%s','%s','%s');",
$this->table_prefix,
mysql_real_escape_string($remote_server_id,$this->link),
mysql_real_escape_string($mysql_name,$this->link),
mysql_real_escape_string($mysql_ip,$this->link),
mysql_real_escape_string($mysql_port,$this->link),
mysql_real_escape_string($mysql_admin_user,$this->link),
mysql_real_escape_string($mysql_root_passwd,$this->link),
mysql_real_escape_string($privilegies_str,$this->link));
mysqli_real_escape_string($this->link, $remote_server_id),
mysqli_real_escape_string($this->link, $mysql_name),
mysqli_real_escape_string($this->link, $mysql_ip),
mysqli_real_escape_string($this->link, $mysql_port),
mysqli_real_escape_string($this->link, $mysql_admin_user),
mysqli_real_escape_string($this->link, $mysql_root_passwd),
mysqli_real_escape_string($this->link, $privilegies_str));
++$this->queries_;
mysql_query($query,$this->link);
mysqli_query($this->link, $query);
if( mysql_errno($this->link) != 0 )
if( mysqli_errno($this->link) != 0 )
{
return false;
}
return mysql_insert_id($this->link);
return mysqli_insert_id($this->link);
}
public function editMysqlServer($mysql_server_id,$remote_server_id,$mysql_name,$mysql_ip,$mysql_port,$mysql_admin_user,$mysql_root_passwd,$privilegies_str)
@ -118,17 +114,17 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
`mysql_admin_user` = '%s', `mysql_root_passwd` = '%s', `privilegies_str` = '%s'
WHERE `mysql_server_id` = %s;",
$this->table_prefix,
mysql_real_escape_string($remote_server_id,$this->link),
mysql_real_escape_string($mysql_name,$this->link),
mysql_real_escape_string($mysql_ip,$this->link),
mysql_real_escape_string($mysql_port,$this->link),
mysql_real_escape_string($mysql_admin_user,$this->link),
mysql_real_escape_string($mysql_root_passwd,$this->link),
mysql_real_escape_string($privilegies_str,$this->link),
mysql_real_escape_string($mysql_server_id,$this->link));
mysqli_real_escape_string($this->link, $remote_server_id),
mysqli_real_escape_string($this->link, $mysql_name),
mysqli_real_escape_string($this->link, $mysql_ip),
mysqli_real_escape_string($this->link, $mysql_port),
mysqli_real_escape_string($this->link, $mysql_admin_user),
mysqli_real_escape_string($this->link, $mysql_root_passwd),
mysqli_real_escape_string($this->link, $privilegies_str),
mysqli_real_escape_string($this->link, $mysql_server_id));
++$this->queries_;
if ( mysql_query($query) === FALSE )
if ( mysqli_query($this->link, $query) === FALSE )
return FALSE;
return TRUE;
@ -145,20 +141,20 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
$query = sprintf("SELECT * FROM `%smysql_servers` WHERE `mysql_server_id` = %d",
$this->table_prefix,
mysql_real_escape_string($id,$this->link));
mysqli_real_escape_string($this->link, $id));
++$this->queries_;
$result = mysql_query($query, $this->link);
$result = mysqli_query($this->link, $query);
// If there are no servers then we can stop here.
if ( mysql_num_rows($result) != 1 )
if ( mysqli_num_rows($result) != 1 )
return FALSE;
return mysql_fetch_assoc( $result );
return mysqli_fetch_assoc( $result );
}
public function removeMysqlServer($mysql_server_id){
$mysql_server_id = mysql_real_escape_string($mysql_server_id, $this->link);
$mysql_server_id = mysqli_real_escape_string($this->link, $mysql_server_id);
$return = TRUE;
@ -169,7 +165,7 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
{
$query = sprintf($query,$this->table_prefix,$mysql_server_id);
++$this->queries_;
$result = mysql_query($query,$this->link);
$result = mysqli_query($this->link, $query);
$return = ($result === FALSE) ? FALSE : $return;
}
return $return;
@ -178,7 +174,7 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
public function getMysqlServerDBs($mysql_server_id){
$query = sprintf("SELECT * FROM `%smysql_databases` WHERE mysql_server_id = %d;",
$this->table_prefix,
mysql_real_escape_string($mysql_server_id,$this->link));
mysqli_real_escape_string($this->link, $mysql_server_id));
return $this->listQuery($query);
}
@ -186,27 +182,27 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
$query = sprintf("INSERT INTO `%smysql_databases` (`mysql_server_id`, `home_id`, `db_user`, `db_passwd`, `db_name`, `enabled`)
VALUES('%d','%d','%s','%s','%s','%d');",
$this->table_prefix,
mysql_real_escape_string($mysql_server_id,$this->link),
mysql_real_escape_string($home_id,$this->link),
mysql_real_escape_string($db_user,$this->link),
mysql_real_escape_string($db_passwd,$this->link),
mysql_real_escape_string($db_name,$this->link),
mysql_real_escape_string($enabled,$this->link));
mysqli_real_escape_string($this->link, $mysql_server_id),
mysqli_real_escape_string($this->link, $home_id),
mysqli_real_escape_string($this->link, $db_user),
mysqli_real_escape_string($this->link, $db_passwd),
mysqli_real_escape_string($this->link, $db_name),
mysqli_real_escape_string($this->link, $enabled));
++$this->queries_;
mysql_query($query,$this->link);
mysqli_query($this->link, $query);
if( mysql_errno($this->link) != 0 )
if( mysqli_errno($this->link) != 0 )
{
return false;
}
return mysql_insert_id($this->link);
return mysqli_insert_id($this->link);
}
public function getMysqlDBbyId($db_id){
$query = sprintf('SELECT * FROM `%1$smysql_databases` NATURAL JOIN `%1$smysql_servers` WHERE db_id = %2$d;',
$this->table_prefix,
mysql_real_escape_string($db_id,$this->link));
mysqli_real_escape_string($this->link, $db_id));
$db_info = $this->listQuery($query);
return $db_info[0];
}
@ -214,15 +210,15 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
public function getMysqlDBsbyHomeId($home_id){
$query = sprintf('SELECT * FROM `%1$smysql_databases` WHERE enabled = 1 AND home_id = %2$d;',
$this->table_prefix,
mysql_real_escape_string($home_id,$this->link));
mysqli_real_escape_string($this->link, $home_id));
return $this->listQuery($query);
}
public function getMysqlHomeDBbyId($home_id,$db_id){
$query = sprintf('SELECT * FROM `%1$smysql_databases` NATURAL JOIN `%1$smysql_servers` WHERE home_id = %2$d AND db_id = %3$d;',
$this->table_prefix,
mysql_real_escape_string($home_id,$this->link),
mysql_real_escape_string($db_id,$this->link));
mysqli_real_escape_string($this->link, $home_id),
mysqli_real_escape_string($this->link, $db_id));
$db_info = $this->listQuery($query);
return $db_info[0];
}
@ -233,17 +229,17 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
SET `home_id`='%d', `db_user`='%s', `db_passwd`='%s', `db_name`='%s',`enabled`='%d'
WHERE `db_id` = '%d';",
$this->table_prefix,
mysql_real_escape_string($home_id, $this->link),
mysql_real_escape_string($db_user, $this->link),
mysql_real_escape_string($db_passwd, $this->link),
mysql_real_escape_string($db_name, $this->link),
mysql_real_escape_string($enabled, $this->link),
mysql_real_escape_string($db_id, $this->link) );
mysqli_real_escape_string($this->link, $home_id),
mysqli_real_escape_string($this->link, $db_user),
mysqli_real_escape_string($this->link, $db_passwd),
mysqli_real_escape_string($this->link, $db_name),
mysqli_real_escape_string($this->link, $enabled),
mysqli_real_escape_string($this->link, $db_id) );
++$this->queries_;
mysql_query($query,$this->link);
mysqli_query($this->link, $query);
if( mysql_errno($this->link) != 0 )
if( mysqli_errno($this->link) != 0 )
return FALSE;
return true;
@ -254,10 +250,10 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
$query = sprintf("DELETE FROM `%smysql_databases`
WHERE `db_id` = '%d'",
$this->table_prefix,
mysql_real_escape_string($db_id, $this->link));
mysqli_real_escape_string($this->link, $db_id));
++$this->queries_;
if ( mysql_query($query) === FALSE )
if ( mysqli_query($this->link, $query) === FALSE )
return FALSE;
return TRUE;
@ -267,7 +263,7 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
$query = sprintf('SELECT %1$sserver_homes.*,%1$sremote_servers.*, %1$sconfig_homes.game_name
FROM `%1$sserver_homes` NATURAL JOIN `%1$sconfig_homes` NATURAL JOIN `%1$sremote_servers` WHERE remote_server_id=%2$s;',
$this->table_prefix,
mysql_real_escape_string($remote_server_id,$this->link));
mysqli_real_escape_string($this->link, $remote_server_id));
return $this->listQuery($query);
}
}

30
modules/mysql/servers.php
View file

@ -234,33 +234,17 @@ function exec_ogp_module() {
else
{
$mysql_admin_user = get_mysql_admin_user($mysql_server);
if( function_exists('mysqli_connect') )
{
$link = mysqli_connect_safe($mysql_server['mysql_ip'], $mysql_admin_user, $mysql_server['mysql_root_passwd'], "", $mysql_server['mysql_port']);
// mysqli is always available in PHP 7+; the old mysql_* fallback has been removed.
$link = mysqli_connect_safe($mysql_server['mysql_ip'], $mysql_admin_user, $mysql_server['mysql_root_passwd'], "", $mysql_server['mysql_port']);
if ( $link === FALSE )
{
$server_status = "<span class='failure'>".get_lang('mysql_offline')."</span>";
}
else
{
$server_status = "<span class='success'>".get_lang('mysql_online')."</span>";
mysqli_close($link);
}
if ( $link === FALSE )
{
$server_status = "<span class='failure'>".get_lang('mysql_offline')."</span>";
}
else
{
@$link = mysql_connect($mysql_server['mysql_ip'].':'.$mysql_server['mysql_port'], $mysql_admin_user, $mysql_server['mysql_root_passwd']);
if ( $link === FALSE )
{
$server_status = "<span class='failure'>".get_lang('mysql_offline')."</span>";
}
else
{
$server_status = "<span class='success'>".get_lang('mysql_online')."</span>";
mysql_close($link);
}
$server_status = "<span class='success'>".get_lang('mysql_online')."</span>";
mysqli_close($link);
}
}

49
modules/mysql/user_db.php
View file

@ -32,20 +32,14 @@ $(document).ready(function(){
require_once("modules/mysql/functions.php");
require_once('includes/form_table_class.php');
require_once('includes/lib_remote.php');
if ( function_exists('mysqli_connect') )
require_once("modules/mysql/mysqli_database.php");
else
require_once("modules/mysql/mysql_database.php");
// mysqli is always available in PHP 7+
require_once("modules/mysql/mysqli_database.php");
function get_mysql_admin_user(array $mysql_server) {
return !empty($mysql_server['mysql_admin_user']) ? $mysql_server['mysql_admin_user'] : 'root';
}
function mysqli_connect_safe($host, $user, $pass, $db = "", $port = null) {
if (!function_exists('mysqli_connect')) {
return false;
}
mysqli_report(MYSQLI_REPORT_OFF);
try {
return mysqli_connect($host, $user, $pass, $db, $port);
@ -145,26 +139,6 @@ function exec_ogp_module() {
mysqli_close($link);
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], $mysql_db['db_user'], $mysql_db['db_passwd']);
if ( $link !== FALSE )
{
$server_online = TRUE;
if ( mysql_select_db($mysql_db['db_name'],$link) !== FALSE )
{
$databases = mysql_query("SHOW TABLES;");
$user_db = "Database: ".$mysql_db['db_name']."\nTables:\n";
while ( $table = mysql_fetch_array($databases) ) {
$user_db .= $table[0] . "\n";
}
$database_exists = TRUE;
}
mysql_close($link);
}
}
}
if(isset($_POST['restore']))
@ -292,25 +266,6 @@ function exec_ogp_module() {
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
else
{
@$link = mysql_connect($mysql_db['mysql_ip'].':'.$mysql_db['mysql_port'], get_mysql_admin_user($mysql_db), $mysql_db['mysql_root_passwd']);
if ( $link !== FALSE )
{
$queries = array("DROP USER '".$mysql_db['db_user']."'@'%';",
"GRANT ".$mysql_db['privilegies_str']." ON `".$mysql_db['db_name']."`.* TO '".$mysql_db['db_user']."'@'%' IDENTIFIED BY '".$post_db_passwd."';",
"FLUSH PRIVILEGES;");
foreach ((array)$queries as $query)
{
@$return = mysql_query($query);
if(!$return)
break;
}
mysql_close($link);
$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
}
}
}
if ( $modDb->editMysqlServerDB($db_id, $home_id, $post_db_user, $post_db_passwd, $post_db_name, $enabled) === FALSE )