Code cleanup

CHANGELOG

@@ -9,6 +9,7 @@ CHANGELOG Roundcube Webmail
 - Use constant prefix for temp file names, don't remove temp files from other apps (#6511)
 - Ignore 'Sender' header on Reply-All action (#6506)
 - deluser.sh: Add option to delete users who have not logged in for more than X days (#6340)
+- HTML5 Upload Progress - as a replacement for the old server-side solution (#6177)
 - Update to TinyMCE 4.8.2
 - Update to jQuery-MiniColors 2.3.4
 - Prevent from using deprecated timezone names from jsTimezoneDetect

program/include/rcmail_output_html.php

@@ -1377,30 +1377,28 @@ EOF;
 
                     $content = $this->frame($attrib, true);
                 }
-                else if (in_array($object, array('meta', 'links'))) {
+                else if ($object == 'meta' || $object == 'links') {
                     if ($object == 'meta') {
                         $source = 'meta_tags';
-                        $tag = 'meta';
-                        $key = 'name';
-                        $param = 'content';
+                        $tag    = 'meta';
+                        $key    = 'name';
+                        $param  = 'content';
                     }
-                    elseif ($object == 'links') {
+                    else if ($object == 'links') {
                         $source = 'link_tags';
-                        $tag = 'link';
-                        $key = 'rel';
-                        $param = 'href';
+                        $tag    = 'link';
+                        $key    = 'rel';
+                        $param  = 'href';
                     }
 
                     foreach ($this->$source as $name => $vars) {
-                        /*
-                        $vars can be in many forms:
-                          *) string
-                          *) array('key' => 'val')
-                          *) array(string, string)
-                          *) array(array(), string)
-                          *) array(array('key' => 'val'), array('key' => 'val'))
-                        normalise this for processing by checking for string array keys
-                        */
+                        // $vars can be in many forms:
+                        // - string
+                        // - array('key' => 'val')
+                        // - array(string, string)
+                        // - array(array(), string)
+                        // - array(array('key' => 'val'), array('key' => 'val'))
+                        // normalise this for processing by checking for string array keys
                         $vars = is_array($vars) ? (count(array_filter(array_keys($vars), 'is_string')) > 0 ? array($vars) : $vars) : array($vars);
 
                         foreach ($vars as $args) {