X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_display.php;h=88b8c265083c316dd7b9850fcc0633d0d56e386e;hb=40c9b37a16319f362369c122314c28fdc3ff14e5;hp=a8ea08526f5bd61d3788c73ffded497d9819011a;hpb=6ee631f7b92f6a205e0841ac40e6b0e763a5a734;p=squirrelmail.git

diff --git a/src/options_display.php b/src/options_display.php
index a8ea0852..88b8c265 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -11,23 +11,25 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
    include('../functions/plugin.php');
-   include('../src/load_prefs.php');
    
    displayPageHeader($color, 'None');
    $chosen_language = getPref($data_dir, $username, 'language');  
 ?>
    <br>
-   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0"><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . ' - ' . _("Display Preferences"); ?></b></center>
-   </td></tr></table>
+<table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
 
-   <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="2" border="0">
+      <b><?php echo _("Options") . ' - ' . _("Display Preferences"); ?></b><br>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+   <form name="f" action="options.php" method="post"><br>
+      <table width="100%" cellpadding="2" cellspacing="0" border="0">
          <tr>
             <td align="right" nowrap><?php echo _("Theme"); ?>:
             </td><td>
@@ -49,10 +51,12 @@
 <?php
    echo '         <tt><select name="language">' . "\n";
    foreach ($languages as $code => $name) {
-      if ($code==$chosen_language)
-         echo '         <OPTION SELECTED VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
-      else
-         echo '         <OPTION VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
+      if (! isset($name['ALIAS'])) {
+         if ($code==$chosen_language)
+            echo '         <OPTION SELECTED VALUE="'.$code.'">'.$name['NAME']."\n";
+         else
+            echo '         <OPTION VALUE="'.$code.'">'.$name['NAME']."\n";
+      }
    }
    echo '         </select></tt>';  
    if (! $use_gettext)
@@ -159,86 +163,43 @@
    $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 == 10))
-      echo '                  <OPTION VALUE="10" SELECTED>10 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="10">10 '.$seconds_str;
- 
-   if (($left_refresh == 20))
-      echo '                  <OPTION VALUE="20" SELECTED>20 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="20">20 '.$seconds_str;
- 
-   if (($left_refresh == 30))
-      echo '                  <OPTION VALUE="30" SELECTED>30 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="30">30 '.$seconds_str;
- 
-   if (($left_refresh == 60))
-      echo '                  <OPTION VALUE="60" SELECTED>1 '.$minute_str;
-   else
-      echo '                  <OPTION VALUE="60">1 '.$minute_str;
- 
-   if (($left_refresh == 120))
-      echo '                  <OPTION VALUE="120" SELECTED>2 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="120">2 '.$minutes_str;
- 
-   if (($left_refresh == 180))
-      echo '                  <OPTION VALUE="180" SELECTED>3 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="180">3 '.$minutes_str;
- 
-   if (($left_refresh == 240))
-      echo '                  <OPTION VALUE="240" SELECTED>4 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="240">4 '.$minutes_str;
- 
-   if (($left_refresh == 300))
-      echo '                  <OPTION VALUE="300" SELECTED>5 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="300">5 '.$minutes_str;
- 
-   if (($left_refresh == 420))
-      echo '                  <OPTION VALUE="420" SELECTED>7 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="420">7 '.$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
 
-   if (($left_refresh == 600))
-      echo '                  <OPTION VALUE="600" SELECTED>10 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="600">10 '.$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 == 900))
-      echo '                  <OPTION VALUE="900" SELECTED>15 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="900">15 '.$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 == 1500))
-      echo '                  <OPTION VALUE="1500" SELECTED>25 '.$minutes_str;
-   else
-      echo'                  <OPTION VALUE="1500">25 '.$minutes_str;
- 
-   if (($left_refresh == 1800))
-      echo '                  <OPTION VALUE="1800" SELECTED>30 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="1800">30 '.$minutes_str;
- 
+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>
@@ -280,7 +241,14 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
                <input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display">
             </td>
          </tr>
-      </table>   
+      </table>
    </form>
+
    <?php do_hook('options_display_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>