From 81f67a4de2be1d54457406b10b93ff0e905c8ac8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 6 Feb 2017 15:46:18 +0100
Subject: [PATCH] Don't use each() deprecated in PHP 7.2

---
 installer/config.php                               |  3 +--
 plugins/debug_logger/debug_logger.php              |  2 +-
 plugins/debug_logger/runlog/runlog.php             |  2 +-
 plugins/enigma/lib/enigma_mime_message.php         |  4 ++--
 .../lib/Roundcube/rcube_sieve_engine.php           |  2 +-
 .../lib/Roundcube/rcube_sieve_script.php           |  2 +-
 plugins/password/drivers/ximss.php                 |  2 +-
 .../squirrelmail_usercopy.php                      |  2 +-
 program/include/rcmail.php                         |  8 ++++----
 program/lib/Roundcube/rcube_imap.php               |  2 +-
 program/lib/Roundcube/rcube_imap_generic.php       | 10 ++++------
 program/lib/Roundcube/rcube_message.php            |  3 ++-
 program/lib/Roundcube/rcube_mime.php               |  2 +-
 program/lib/Roundcube/rcube_mime_decode.php        | 14 +++++---------
 program/lib/Roundcube/rcube_utils.php              |  2 +-
 program/lib/Roundcube/rcube_vcard.php              |  6 +++---
 program/steps/addressbook/func.inc                 |  2 +-
 program/steps/settings/edit_identity.inc           |  2 +-
 18 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/installer/config.php b/installer/config.php
index 95057ef3c..19a65bbca 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -673,8 +673,7 @@ echo $select_param_folding->show(strval($RCI->getprop('mime_param_folding')));
 
 <?php
 $plugins = $RCI->list_plugins();
-foreach($plugins as $p) 
-{
+foreach ($plugins as $p) {
     $p_check = new html_checkbox(array('name' => '_plugins_'.$p['name'], 'id' => 'cfgplugin_'.$p['name'], 'value' => $p['name']));
     echo '<dt class="propname"><label>';
     echo $p_check->show($p['enabled'] ? $p['name'] : 0);
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
index 98758ae3c..0ca22b9f9 100644
--- a/plugins/debug_logger/debug_logger.php
+++ b/plugins/debug_logger/debug_logger.php
@@ -74,7 +74,7 @@ class debug_logger extends rcube_plugin
 
         $log_config = rcmail::get_instance()->config->get('debug_logger',array());
 
-        foreach($log_config as $type=>$file){
+        foreach ($log_config as $type => $file){
             $this->runlog->set_file(rcmail::get_instance()->config->get('log_dir').'/'.$file, $type);
         }
 
diff --git a/plugins/debug_logger/runlog/runlog.php b/plugins/debug_logger/runlog/runlog.php
index ae352bd58..6a3730035 100644
--- a/plugins/debug_logger/runlog/runlog.php
+++ b/plugins/debug_logger/runlog/runlog.php
@@ -68,7 +68,7 @@ class runlog {
         $this->indent--;
         if ($this->run_log[$lastk]['duration'] >= $this->threshold) {
             $tag_report = "";
-            foreach($this->tag_count as $tag => $count){
+            foreach ($this->tag_count as $tag => $count){
                 $tag_report .= "$tag: $count, ";
             }
             if (!empty($tag_report)) {
diff --git a/plugins/enigma/lib/enigma_mime_message.php b/plugins/enigma/lib/enigma_mime_message.php
index 0c93e3954..734377f75 100644
--- a/plugins/enigma/lib/enigma_mime_message.php
+++ b/plugins/enigma/lib/enigma_mime_message.php
@@ -157,8 +157,8 @@ class enigma_mime_message extends Mail_mime
      */
     public function get($params = null, $filename = null, $skip_head = false)
     {
-        if (isset($params)) {
-            while (list($key, $value) = each($params)) {
+        if (!empty($params)) {
+            foreach ($params as $key => $value) {
                 $this->build_params[$key] = $value;
             }
         }
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 5d725203b..88de04f2a 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -689,7 +689,7 @@ class rcube_sieve_engine
             if ($name == '')
                 $this->errors['name'] = $this->plugin->gettext('cannotbeempty');
             else {
-                foreach($this->script as $idx => $rule)
+                foreach ($this->script as $idx => $rule)
                     if($rule['name'] == $name && $idx != $fid) {
                         $this->errors['name'] = $this->plugin->gettext('ruleexist');
                         break;
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index e6ad6b0c5..5c8c6cfc0 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -1089,7 +1089,7 @@ class rcube_sieve_script
     static function escape_string($str)
     {
         if (is_array($str) && count($str) > 1) {
-            foreach($str as $idx => $val)
+            foreach ($str as $idx => $val)
                 $str[$idx] = self::escape_string($val);
 
             return '[' . implode(',', $str) . ']';
diff --git a/plugins/password/drivers/ximss.php b/plugins/password/drivers/ximss.php
index 54477f730..ec610a813 100644
--- a/plugins/password/drivers/ximss.php
+++ b/plugins/password/drivers/ximss.php
@@ -64,7 +64,7 @@ class rcube_ximss_password
 
         fclose($sock);
 
-        foreach( explode( "\0",$responseblob) as $response ) {
+        foreach (explode( "\0",$responseblob) as $response) {
             $resp = simplexml_load_string("<xml>".$response."</xml>");
 
             if( $resp->response[0]['id'] == 'A001' ) {
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index 70b33ca8f..c038a3292 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -194,7 +194,7 @@ class squirrelmail_usercopy extends rcube_plugin
 
                 // parse addres book file
                 if (filesize($abookfile)) {
-                    foreach(file($abookfile) as $line) {
+                    foreach (file($abookfile) as $line) {
                         $line = $this->convert_charset(rtrim($line), $file_charset);
                         list($rec['name'], $rec['firstname'], $rec['surname'], $rec['email']) = explode('|', $line);
                         if ($rec['name'] && $rec['email']) {
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index d71e2ea4b..e88161c62 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -537,8 +537,8 @@ class rcmail extends rcube
         // we'll only handle unset host (if possible)
         if (!$host && !empty($default_host)) {
             if (is_array($default_host)) {
-                list($key, $val) = each($default_host);
-                $host = is_numeric($key) ? $val : $key;
+                $key  = key($default_host);
+                $host = is_numeric($key) ? $default_host[$key] : $key;
             }
             else {
                 $host = $default_host;
@@ -749,8 +749,8 @@ class rcmail extends rcube
 
             // take the first entry if $host is still not set
             if (empty($host)) {
-                list($key, $val) = each($default_host);
-                $host = is_numeric($key) ? $val : $key;
+                $key  = key($default_host);
+                $host = is_numeric($key) ? $default_host[$key] : $key;
             }
         }
         else if (empty($default_host)) {
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 2d137e4da..4d90d5711 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -4241,7 +4241,7 @@ class rcube_imap extends rcube_storage
      */
     protected function sort_folder_specials($folder, &$list, &$specials, &$out)
     {
-        while (list($key, $name) = each($list)) {
+        foreach ($list as $key => $name) {
             if ($folder === null || strpos($name, $folder.$this->delimiter) === 0) {
                 $out[] = $name;
                 unset($list[$key]);
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 6174286f7..db9d743b1 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2643,7 +2643,7 @@ class rcube_imap_generic
 
         reset($messages);
 
-        while (list($key, $headers) = each($messages)) {
+        foreach ($messages as $key => $headers) {
             $value = null;
 
             switch ($field) {
@@ -2685,7 +2685,7 @@ class rcube_imap_generic
             }
 
             // form new array based on index
-            while (list($key, $val) = each($index)) {
+            foreach ($index as $key => $val) {
                 $result[$key] = $messages[$key];
             }
         }
@@ -3630,14 +3630,12 @@ class rcube_imap_generic
             $data['type'] = 'multipart';
         }
         else {
-            $data['type'] = strtolower($part_a[0]);
-
-            // encoding
+            $data['type']     = strtolower($part_a[0]);
             $data['encoding'] = strtolower($part_a[5]);
 
             // charset
             if (is_array($part_a[2])) {
-               while (list($key, $val) = each($part_a[2])) {
+               foreach ($part_a[2] as $key => $val) {
                     if (strcasecmp($val, 'charset') == 0) {
                         $data['charset'] = $part_a[2][$key+1];
                         break;
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 5fa6f9e13..6d3aa494e 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -125,7 +125,8 @@ class rcube_message
 
         $this->mime    = new rcube_mime($this->headers->charset);
         $this->subject = $this->headers->get('subject');
-        list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));
+        $from          = $this->mime->decode_address_list($this->headers->from, 1);
+        $this->sender  = current($from);
 
         // notify plugins and let them analyze this structured message object
         $this->app->plugins->exec_hook('message_load', array('object' => $this));
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index f860e5482..d9d9c55be 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -791,7 +791,7 @@ class rcube_mime
 
         $mime_types = $mime_extensions = array();
         $regex = "/([\w\+\-\.\/]+)\s+([\w\s]+)/i";
-        foreach((array)$lines as $line) {
+        foreach ((array)$lines as $line) {
              // skip comments or mime types w/o any extensions
             if ($line[0] == '#' || !preg_match($regex, $line, $matches))
                 continue;
diff --git a/program/lib/Roundcube/rcube_mime_decode.php b/program/lib/Roundcube/rcube_mime_decode.php
index a865c25ab..fa3de2a87 100644
--- a/program/lib/Roundcube/rcube_mime_decode.php
+++ b/program/lib/Roundcube/rcube_mime_decode.php
@@ -101,7 +101,7 @@ class rcube_mime_decode
         $return  = new stdClass;
         $headers = $this->parseHeaders($headers);
 
-        while (list($key, $value) = each($headers)) {
+        foreach ($headers as $value) {
             $header_name = strtolower($value['name']);
 
             if (isset($return->headers[$header_name]) && !is_array($return->headers[$header_name])) {
@@ -124,10 +124,8 @@ class rcube_mime_decode
                     $return->ctype_secondary = $regs[2];
                 }
 
-                if (isset($content_type['other'])) {
-                    while (list($p_name, $p_value) = each($content_type['other'])) {
-                        $return->ctype_parameters[$p_name] = $p_value;
-                    }
+                if (!empty($content_type['other'])) {
+                    $return->ctype_parameters = array_merge((array) $return->ctype_parameters, (array) $content_type['other']);
                 }
 
                 break;
@@ -136,10 +134,8 @@ class rcube_mime_decode
                 $content_disposition = $this->parseHeaderValue($value['value']);
                 $return->disposition = $content_disposition['value'];
 
-                if (isset($content_disposition['other'])) {
-                    while (list($p_name, $p_value) = each($content_disposition['other'])) {
-                        $return->d_parameters[$p_name] = $p_value;
-                    }
+                if (!empty($content_disposition['other'])) {
+                    $return->d_parameters = array_merge((array) $return->d_parameters, (array) $content_disposition['other']);
                 }
 
                 break;
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 52d328358..10f96c7b4 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -633,7 +633,7 @@ class rcube_utils
             $proxy_whitelist = rcube::get_instance()->config->get('proxy_whitelist', array());
             if (in_array($_SERVER['REMOTE_ADDR'], $proxy_whitelist)) {
                 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-                    foreach(array_reverse(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])) as $forwarded_ip) {
+                    foreach (array_reverse(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])) as $forwarded_ip) {
                         if (!in_array($forwarded_ip, $proxy_whitelist)) {
                             return $forwarded_ip;
                         }
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index fcd7a0998..1ebfc35f7 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -626,7 +626,7 @@ class rcube_vcard
                 $field = strtoupper($regs2[1][0]);
                 $enc   = null;
 
-                foreach($regs2[1] as $attrid => $attr) {
+                foreach ($regs2[1] as $attrid => $attr) {
                     $attr = preg_replace('/[\s\t\n\r\0\x0B]/', '', $attr);
                     if ((list($key, $value) = explode('=', $attr)) && $value) {
                         if ($key == 'ENCODING') {
@@ -752,7 +752,7 @@ class rcube_vcard
                             }
                         }
                         else {
-                            foreach((array)$attrvalues as $attrvalue) {
+                            foreach ((array)$attrvalues as $attrvalue) {
                                 $attr .= strtoupper(";$attrname=") . self::vcard_quote($attrvalue, ',');
                             }
                         }
@@ -785,7 +785,7 @@ class rcube_vcard
     public static function vcard_quote($s, $sep = ';')
     {
         if (is_array($s)) {
-            foreach($s as $part) {
+            foreach ($s as $part) {
                 $r[] = self::vcard_quote($part, $sep);
             }
             return(implode($sep, (array)$r));
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 36ceec85e..e2f9e4542 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -656,7 +656,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
                     if (is_array($colprop['subtypes'])) {
                         $values = $subtypes = array();
                         foreach (rcube_addressbook::get_col_values($field, $record) as $st => $vals) {
-                            foreach((array)$vals as $value) {
+                            foreach ((array)$vals as $value) {
                                 $i = count($values);
                                 $subtypes[$i] = $st;
                                 $values[$i] = $value;
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index a64527785..bac122404 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -121,7 +121,7 @@ function rcube_identity_form($attrib)
     }
 
     if (IDENTITIES_LEVEL == 4) {
-        foreach($form['addressing']['content'] as $formfield => $value){
+        foreach ($form['addressing']['content'] as $formfield => $value){
             $form['addressing']['content'][$formfield]['disabled'] = true;
             $form['addressing']['content'][$formfield]['class']    = 'disabled';
         }