remove each() keyword as it is deprecated as of php-7.2, fixes #479

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2017-10-31 13:03:06 +01:00
parent 15b62aae04
commit 421c29c491
10 changed files with 23 additions and 26 deletions

View File

@@ -440,7 +440,7 @@ if ($page == 'admins'
} else { } else {
$language_options = ''; $language_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options.= makeoption($language_name, $language_file, $userinfo['language'], true); $language_options.= makeoption($language_name, $language_file, $userinfo['language'], true);
} }
@@ -840,7 +840,7 @@ if ($page == 'admins'
} }
$language_options = ''; $language_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options.= makeoption($language_name, $language_file, $result['def_language'], true); $language_options.= makeoption($language_name, $language_file, $result['def_language'], true);
} }

View File

@@ -1024,7 +1024,7 @@ if ($page == 'customers'
} else { } else {
$language_options = ''; $language_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); $language_options.= makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true);
} }
@@ -1630,7 +1630,7 @@ if ($page == 'customers'
} else { } else {
$language_options = ''; $language_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options.= makeoption($language_name, $language_file, $result['def_language'], true); $language_options.= makeoption($language_name, $language_file, $result['def_language'], true);
} }

View File

@@ -280,7 +280,7 @@ if ($page == 'overview') {
$default_lang = $userinfo['def_language']; $default_lang = $userinfo['def_language'];
} }
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options.= makeoption($language_name, $language_file, $default_lang, true); $language_options.= makeoption($language_name, $language_file, $default_lang, true);
} }

View File

@@ -99,7 +99,7 @@ if ($action == '') {
} }
$add = false; $add = false;
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$templates_done = array(); $templates_done = array();
$result_stmt = Database::prepare(" $result_stmt = Database::prepare("
@@ -328,7 +328,7 @@ if ($action == '') {
$language_options = ''; $language_options = '';
$template_options = ''; $template_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$templates = array(); $templates = array();
$result_stmt = Database::prepare(" $result_stmt = Database::prepare("
SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "`

View File

@@ -96,7 +96,8 @@ if ($page == 'overview') {
$row['destination'] = explode(' ', $row['destination']); $row['destination'] = explode(' ', $row['destination']);
uasort($row['destination'], 'strcasecmp'); uasort($row['destination'], 'strcasecmp');
while (list($dest_id, $destination) = each($row['destination'])) { $dest_list = $row['destination'];
foreach ($dest_list as $dest_id => $destination) {
$row['destination'][$dest_id] = $idna_convert->decode($row['destination'][$dest_id]); $row['destination'][$dest_id] = $idna_convert->decode($row['destination'][$dest_id]);
if ($row['destination'][$dest_id] == $row['email_full']) { if ($row['destination'][$dest_id] == $row['email_full']) {
@@ -323,7 +324,7 @@ if ($page == 'overview') {
$forwarders = ''; $forwarders = '';
$forwarders_count = 0; $forwarders_count = 0;
while (list($dest_id, $destination) = each($result['destination'])) { foreach ($row['destination'] as $dest_id => $destination) {
$destination = $idna_convert->decode($destination); $destination = $idna_convert->decode($destination);
if ($destination != $result['email_full'] && $destination != '') { if ($destination != $result['email_full'] && $destination != '') {

View File

@@ -204,7 +204,7 @@ if ($page == 'overview') {
} }
$language_options = ''; $language_options = '';
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options .= makeoption($language_name, $language_file, $default_lang, true); $language_options .= makeoption($language_name, $language_file, $default_lang, true);
} }

View File

@@ -250,7 +250,7 @@ if ($action == 'login') {
$language_options = ''; $language_options = '';
$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true); $language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
while (list($language_file, $language_name) = each($languages)) { foreach ($languages as $language_file => $language_name) {
$language_options .= makeoption($language_name, $language_file, 'profile', true); $language_options .= makeoption($language_name, $language_file, 'profile', true);
} }

View File

@@ -702,7 +702,7 @@ class FroxlorInstall
} }
// language selection // language selection
$language_options = ''; $language_options = '';
while (list ($language_file, $language_name) = each($this->_languages)) { foreach ($this->_languages as $language_name => $language_file) {
$language_options .= makeoption($language_name, $language_file, $this->_activelng, true, true); $language_options .= makeoption($language_name, $language_file, $this->_activelng, true, true);
} }
// get language-form-template // get language-form-template

View File

@@ -20,27 +20,22 @@
/** /**
* Returns Array, whose elements have been checked whether thay are empty or not * Returns Array, whose elements have been checked whether thay are empty or not
* *
* @param array The array to trim * @param array $source
* The array to trim
* @return array The trim'med array * @return array The trim'med array
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
*/ */
function array_trim($source) function array_trim($source)
{ {
$returnval = array(); $returnval = array();
if (is_array($source)) {
if(is_array($source)) foreach ($source as $var => $val) {
{ if ($val != ' ' && $val != '') {
while(list($var, $val) = each($source)) $returnval[$var] = $val;
{ }
if($val != ' '
&& $val != '')$returnval[$var] = $val;
} }
} } else {
else
{
$returnval = $source; $returnval = $source;
} }
return $returnval; return $returnval;
} }

View File

@@ -156,7 +156,8 @@ if (version_compare(PHP_VERSION, "5.4.0", "<")) {
if (get_magic_quotes_gpc()) { if (get_magic_quotes_gpc()) {
$in = array(&$_GET, &$_POST, &$_COOKIE); $in = array(&$_GET, &$_POST, &$_COOKIE);
while (list($k, $v) = each($in)) { $_in = $in;
foreach ($in as $k => $v) {
foreach ($v as $key => $val) { foreach ($v as $key => $val) {
if (!is_array($val)) { if (!is_array($val)) {
$in[$k][$key] = stripslashes($val); $in[$k][$key] = stripslashes($val);