Fix for occasions when older prefs would contain "None" for left_refresh.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2700 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/left_main.php b/src/left_main.php
index f1a58680ac2d4cbbb0d472b9b4242b819e1768d5..c9b1c217b6d0a5e98ac2b10ce02e3fd3b6c78b66 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -200,8 +200,11 @@ global $delimiter, $default_folder_prefix;
 // open a connection on the imap port (143)
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
 
-
-if (isset($left_refresh) && ($left_refresh != 'none') && ($left_refresh != '')) {
+/**
+ * Using stristr since older preferences may contain "None" and "none".
+ */
+if (isset($left_refresh) && ($left_refresh != '') &&
+    !stristr($left_refresh, "none")){
     $xtra =  "\n<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">\n" .
              "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n".
              "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">\n";