* Uses a function to output the string

* Checks for if $left_refresh is < one val but > another, selects bigger value
* Added back a couple options
* Removed some options (> 15 min = pointless due to session timing out)

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

diff --git a/src/options_display.php b/src/options_display.php
index 7c5e34ce1f616341d8c8188bf6c4d3e0e5f89a60..a117f118009dd6e9989a6c788c49f197a0f4d0ee 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -163,31 +163,43 @@
    $minutes_str = _("Minutes");
 
    echo '               <SELECT name="leftrefresh">';
    $minutes_str = _("Minutes");
 
    echo '               <SELECT name="leftrefresh">';

-   if (($left_refresh == 'None') || ($left_refresh == ''))
-      echo '                  <OPTION VALUE="None" SELECTED>'.$none_str;
-   else
-      echo '                  <OPTION VALUE="None">'.$none_str;
- 
-   if (($left_refresh <= 300))
-      echo '                  <OPTION VALUE="300" SELECTED>5 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="300">5 '.$minutes_str;
- 
-   if (($left_refresh == 720))
-      echo '                  <OPTION VALUE="720" SELECTED>12 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="720">12 '.$minutes_str;
- 
-   if (($left_refresh == 1200))
-      echo '                  <OPTION VALUE="1200" SELECTED>20 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="1200">20 '.$minutes_str;
- 
-   if (($left_refresh == 3600))
-      echo '                  <OPTION VALUE="3600" SELECTED>60 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="3600">60 '.$minutes_str;
- 
+   
+   if ($left_refresh == '')
+      $left_refresh = 'None';
+   if ($left_refresh > 600)
+      $left_refresh = 600;
+   RefreshOption($left_refresh, '', 'None', _("None"));
+   RefreshOption($left_refresh, 30);
+   RefreshOption($left_refresh, 60);
+   RefreshOption($left_refresh, 120);
+   RefreshOption($left_refresh, 180);
+   RefreshOption($left_refresh, 300);
+   RefreshOption($left_refresh, 600);
+   // Refreshes after the session auto-timeout (default 15 min) is pointless
+
+function RefreshOption(&$current, $val, $str = '') {
+   static $lastVal = 0;
+   
+   if (is_int($val) && is_int($current)) {
+      if ($current > $lastVal && $current <= $val)
+         $current = $val;
+   }
+   
+   if ($str == '') {
+      if ($val > 60) {
+         $str = ($val / 60) . ' ' . _("Minutes");
+      } elseif ($val == 60) {
+         $str = '1 ' . _("Minute");
+      } else {
+         $str = $val . ' ' . _("Seconds");
+      }
+   }
+   
+   echo '<option value="' . $val . '"';
+   if ($val == $current)
+      echo ' SELECTED';
+   echo '>' . $str . "\n";
+}

       echo '               </SELECT>'; 
 ?>
             </td>
       echo '               </SELECT>'; 
 ?>
             </td>