X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=72f65c4e797c8e0ac823965c56a3fb04bcde2eaa;hp=a38c28b6cc6385c79cc2163c3eb7723f4679e837;hb=c997cbe6f5a46d432d7733acb207dfcdfd00e49e;hpb=22387c8d44f3ab104db6e19180d3775a45762359

diff --git a/include/options/display.php b/include/options/display.php
index a38c28b6..72f65c4e 100644
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -5,7 +5,7 @@
  *
  * Displays all optinos about display preferences
  *
- * @copyright 1999-2017 The SquirrelMail Project Team
+ * @copyright 1999-2021 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -408,6 +408,13 @@ FIXME!
         'refresh' => SMOPT_REFRESH_ALL
     );
 
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'return_to_message_list_after_move',
+        'caption' => _("Return To Message List After Move"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
 
 
     /*** Load the Address Book Options into the array ***/
@@ -516,9 +523,11 @@ function icon_theme_save($option) {
     // Don't assume the new value is there, double check
     // and only save if found
     $found = false;
-    while (!$found && (list($index, $data) = each($icon_themes))) {
-        if ($data['PATH'] == $option->new_value)
+    foreach ($icon_themes as $data) {
+        if ($data['PATH'] == $option->new_value) {
             $found = true;
+            break;
+        }
     }
     
     if (!$found)
@@ -533,17 +542,20 @@ function css_theme_save ($option) {
     // Don't assume the new value is there, double check
     // and only save if found
     $found = false;
-    reset($user_themes);
-    while (!$found && (list($index, $data) = each($user_themes))) {
-        if ($data['PATH'] == $option->new_value)
+    foreach ($user_themes as $data) {
+        if ($data['PATH'] == $option->new_value) {
             $found = true;
+            break;
+        }
     }
     
     if (!$found) {
         $template_themes = $oTemplate->get_alternative_stylesheets(true);
-        while (!$found && (list($path, $name) = each($template_themes))) {
-            if ($path == $option->new_value)
+        foreach ($template_themes as $path => $name) {
+            if ($path == $option->new_value) {
                 $found = true;
+                break;
+            }
         }
     }