From 8a8cc2bb33b8cc30044b905dd445728d904debf2 Mon Sep 17 00:00:00 2001 From: Jesse Norell Date: Tue, 9 Feb 2016 14:42:22 -0700 Subject: [PATCH] fix some bugs in the switch to mysqli, Issue #3716 --- install/install.php | 8 ++++---- install/update.php | 6 +++--- server/lib/classes/db_mysql.inc.php | 2 +- server/plugins-available/software_update_plugin.inc.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/install/install.php b/install/install.php index c023e8fe7c..1c413f97f4 100644 --- a/install/install.php +++ b/install/install.php @@ -208,7 +208,7 @@ do { } //* Initialize the MySQL server connection - if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { + if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) { $conf['mysql']['host'] = $tmp_mysql_server_host; $conf['mysql']['port'] = $tmp_mysql_server_port; $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user; @@ -217,7 +217,7 @@ do { $conf['mysql']['charset'] = $tmp_mysql_server_charset; $finished = true; } else { - swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_error()); + swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_connect_error()); } } while ($finished == false); unset($finished); @@ -553,7 +553,7 @@ if($install_mode == 'standard') { $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database'); //* Initialize the MySQL server connection - if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { + if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) { $conf['mysql']['master_host'] = $tmp_mysql_server_host; $conf['mysql']['master_port'] = $tmp_mysql_server_port; $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user; @@ -561,7 +561,7 @@ if($install_mode == 'standard') { $conf['mysql']['master_database'] = $tmp_mysql_server_database; $finished = true; } else { - swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error()); + swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error()); } } while ($finished == false); unset($finished); diff --git a/install/update.php b/install/update.php index 6422e54fef..9b5b9ba7b6 100644 --- a/install/update.php +++ b/install/update.php @@ -229,7 +229,7 @@ do { if(@mysqli_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) { $finished = true; } else { - swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error()); + swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error()); $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password'],'mysql_root_password'); } } while ($finished == false); @@ -255,7 +255,7 @@ if($conf['mysql']['master_slave_setup'] == 'y') { $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database'],'mysql_master_database'); //* Initialize the MySQL server connection - if(@mysqli_connect($tmp_mysql_server_host . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { + if(@mysqli_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password, $tmp_mysql_server_database, (int)$tmp_mysql_server_port)) { $conf['mysql']['master_host'] = $tmp_mysql_server_host; $conf['mysql']['master_port'] = $tmp_mysql_server_port; $conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user; @@ -263,7 +263,7 @@ if($conf['mysql']['master_slave_setup'] == 'y') { $conf['mysql']['master_database'] = $tmp_mysql_server_database; $finished = true; } else { - swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error()); + swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_connect_error()); } } while ($finished == false); unset($finished); diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index e3d0c69721..da6bff96c0 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -558,7 +558,7 @@ class db extends mysqli /* Connect to the database */ $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password); if (!$link) { - $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_DEBUG); + $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_DEBUG); return; } /* Get database-size from information_schema */ diff --git a/server/plugins-available/software_update_plugin.inc.php b/server/plugins-available/software_update_plugin.inc.php index bd8159e1ab..83fb831f7c 100644 --- a/server/plugins-available/software_update_plugin.inc.php +++ b/server/plugins-available/software_update_plugin.inc.php @@ -248,7 +248,7 @@ class software_update_plugin { //* Connect to the database $link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password); if (!$link) { - $app->log('Unable to connect to the database'.mysqli_error($link), LOGLEVEL_ERROR); + $app->log('Unable to connect to the database'.mysqli_connect_error(), LOGLEVEL_ERROR); return; } -- GitLab