Fixed problems that prevented ISPConfig to run on PHP 7, Issue #3716 (f1926a01) · Commits · ISPConfig / ISPConfig 3

install/install.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ do {
		} while (!$check);

		// Check if the mysql functions are loaded in PHP
		if(!function_exists('mysql_connect')) die('No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.');
		if(!function_exists('mysqli_connect')) die('No PHP MySQLi functions available. Please ensure that the PHP MySQL module is loaded.');

		//** Get MySQL root credentials
		$finished = false;
		@@ -208,7 +208,7 @@ do {
		}

		//* Initialize the MySQL server connection
		if(@mysql_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 . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
		$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').' '.mysql_error());
		swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysqli_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(@mysql_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 . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
		$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').' '.mysql_error());
		swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
		}
		} while ($finished == false);
		unset($finished);

install/lib/mysql.lib.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -776,7 +776,7 @@ class db_result {
		*
		* @access private
		*/
		public function db_result($iResId, $iConnection) {
		public function __construct($iResId, $iConnection) {
		$this->_iResId = $iResId;
		$this->_iConnection = $iConnection;
		}
		@@ -902,7 +902,7 @@ class fakedb_result {
		*
		* @access private
		*/
		public function fakedb_result($aData) {
		public function __construct($aData) {
		$this->aResultData = $aData;
		$this->aLimitedData = $aData;
		reset($this->aLimitedData);

install/uninstall-fedora.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -65,16 +65,16 @@ if($do_uninstall == 'yes') {
		//exec("/etc/init.d/mysqld stop");
		//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
		//exec("/etc/init.d/mysqld start");
		$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
		$link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
		if (!$link) {
		echo "Unable to connect to the database'.mysql_error($link)";
		} else {
		$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
		if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
		$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
		if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
		$result=mysqli_query($link,"DROP DATABASE ".$conf['db_database']."';");
		if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysqli_error($link)."\n";
		$result=mysqli_query($link, "DROP USER '".$conf['db_user'] ."';");
		if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysqli_error($link)."\n";
		}
		mysql_close($link);
		mysqli_close($link);

		// Deleting the symlink in /var/www
		// Apache

install/uninstall.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -60,16 +60,16 @@ if($do_uninstall == 'yes') {

		echo "\n\n>> Uninstalling ISPConfig 3... \n\n";

		$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
		$link = mysqli_connect($clientdb_host, $clientdb_user, $clientdb_password);
		if (!$link) {
		echo "Unable to connect to the database'.mysql_error($link)";
		} else {
		$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
		if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
		$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
		if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
		$result=mysqli_query($link,"DROP DATABASE ".$conf['db_database']."';");
		if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysqli_error($link)."\n";
		$result=mysqli_query($link,"DROP USER '".$conf['db_user'] ."';");
		if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysqli_error($link)."\n";
		}
		mysql_close($link);
		mysqli_close($link);

		// Deleting the symlink in /var/www
		// Apache

install/update.php

+4 −4

Original line number	Diff line number	Diff line
		@@ -226,10 +226,10 @@ $clientdb_password = '';
		//** Test mysql root connection
		$finished = false;
		do {
		if(@mysql_connect($conf["mysql"]["host"], $conf["mysql"]["admin_user"], $conf["mysql"]["admin_password"])) {
		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').' '.mysql_error());
		swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_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(@mysql_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 . ':' . (int)$tmp_mysql_server_port, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
		$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').' '.mysql_error());
		swriteln($inst->lng('Unable to connect to mysql server').' '.mysqli_error());
		}
		} while ($finished == false);
		unset($finished);