Implemented #5651 Make ISPConfig code base compatible with PHP 7.4

Author: Till Brehm

install/lib/install.lib.php

@@ -691,8 +691,7 @@ function ini_to_array($ini) {
 
 
 //* Converts a config array to a string
-function array_to_ini($config_array = '') {
-	if($config_array == '') $config_array = $this->config;
+function array_to_ini($config_array) {
 	$content = '';
 	foreach($config_array as $section => $data) {
 		$content .= "[$section]\n";

install/lib/installer_base.lib.php

@@ -3228,6 +3228,9 @@ protected function get_template_file($tLocal, $tRf=false, $tDBCred=false) {
 	 * @return bool
 	 */
 	protected function write_config_file($tConf, $tContents) {
+
+		$args = func_get_args();
+
 		// Backup config file before writing new contents and stat file
 		if ( is_file($tConf) ) {
 			$stat = exec('stat -c \'%a %U %G\' '.escapeshellarg($tConf), $output, $res);
@@ -3241,10 +3244,9 @@ protected function write_config_file($tConf, $tContents) {
 		}
 
 		wf($tConf, $tContents); // write file
-
 		if (func_num_args() >= 4) // override rights and/or ownership
 			{
-			$args = func_get_args();
+			
 			$output = array_slice($args, 2);
 
 			switch (sizeof($output)) {

install/lib/mysql.lib.php

@@ -192,6 +192,8 @@ private function _setCharset() {
 	}
 
 	private function _query($sQuery = '') {
+		
+		$aArgs = func_get_args();
 		$this->do_connect();
 
 		if ($sQuery == '') {
@@ -227,7 +229,6 @@ private function _query($sQuery = '') {
 			}
 		} while($ok == false);
 
-		$aArgs = func_get_args();
 		$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
 
 		$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
@@ -283,9 +284,11 @@ public function query($sQuery = '') {
 	 * @return array result row or NULL if none found
 	 */
 	public function queryOneRecord($sQuery = '') {
-		if(!preg_match('/limit \d+\s*,\s*\d+$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
-
+		
 		$aArgs = func_get_args();
+		
+		if(!preg_match('/limit \d+\s*,\s*\d+$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
+		
 		$oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
 		if(!$oResult) return null;
 
@@ -956,7 +959,7 @@ public function get() {
 
 		if(!is_array($this->aLimitedData)) return $aItem;
 
-		if(list($vKey, $aItem) = each($this->aLimitedData)) {
+		foreach($this->aLimitedData as $vKey => $aItem) {
 			if(!$aItem) $aItem = null;
 		}
 		return $aItem;

interface/lib/classes/cmstree.inc.php

@@ -258,6 +258,8 @@ private function securityScan($string) {
 
 	private function _query($sQuery = '') {
 		global $app;
+		
+		$aArgs = func_get_args();
 
 		if ($sQuery == '') {
 			$this->_sqlerror('Keine Anfrage angegeben / No query given');
@@ -297,7 +299,6 @@ private function _query($sQuery = '') {
 			}
 		} while($ok == false);
 
-		$aArgs = func_get_args();
 		$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
 		$this->securityScan($sQuery);
 		$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
@@ -353,9 +354,11 @@ public function query($sQuery = '') {
 	 * @return array result row or NULL if none found
 	 */
 	public function queryOneRecord($sQuery = '') {
+		
+		$aArgs = func_get_args();
+		
 		if(!preg_match('/limit \d+\s*(,\s*\d+)?$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
 
-		$aArgs = func_get_args();
 		$oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
 		if(!$oResult) return null;
 
@@ -1300,7 +1303,7 @@ public function get() {
 
 		if(!is_array($this->aLimitedData)) return $aItem;
 
-		if(list($vKey, $aItem) = each($this->aLimitedData)) {
+		foreach($this->aLimitedData as $vKey => $aItem) {
 			if(!$aItem) $aItem = null;
 		}
 		return $aItem;