X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_display.php;h=b79c930d8dd69ebbe3c08354d7bbbe3b49b4b070;hp=288d6636c3d688df2d81787a587e587b5ac515bb;hb=176ed7de0208e847edf51b52f1f1b16b3d087bc0;hpb=38bb54bab40d7d929d2036b00b0ec62129c1ef22

diff --git a/src/options_display.php b/src/options_display.php
index 288d6636..b79c930d 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -10,26 +10,17 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($strings_php))
-      include('../functions/strings.php');
-   if (!isset($config_php))
-      include('../config/config.php');
-   if (!isset($page_header_php))
-      include('../functions/page_header.php');
-   if (!isset($display_messages_php))
-      include('../functions/display_messages.php');
-   if (!isset($imap_php))
-      include('../functions/imap.php');
-   if (!isset($array_php))
-      include('../functions/array.php');
-   if (!isset($i18n_php))
-      include('../functions/i18n.php');
-   if (!isset($plugin_php))
-      include('../functins/plugin.php');
-
+   include('../src/validate.php');
+   include('../functions/strings.php');
+   include('../config/config.php');
+   include('../functions/page_header.php');
+   include('../functions/display_messages.php');
+   include('../functions/imap.php');
+   include('../functions/array.php');
+   include('../functions/i18n.php');
+   include('../functions/plugin.php');
    include('../src/load_prefs.php');
+   
    displayPageHeader($color, 'None');
    $chosen_language = getPref($data_dir, $username, 'language');  
 ?>
@@ -64,11 +55,11 @@
       if ($code==$chosen_language)
          echo '         <OPTION SELECTED VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
       else
-         echo '         <OPTION VALUE=\"".$code.'">'.$languages[$code]['NAME']."\n";
+         echo '         <OPTION VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
    }
    echo '         </select></tt>';  
    if (! $use_gettext)
-      echo '<br><small>This system doesn't support multiple languages</small>';
+      echo '<br><small>This system doesn\'t support multiple languages</small>';
       
 ?>
             </td>
@@ -150,51 +141,13 @@
             </td><td>
 <?php
    echo '         <select name="leftsize">' . "\n";
-   if ($left_size == 100)
-      echo '<option value="100" selected>100 pixels' . "\n";
-   else
-      echo '<option value="100">100 pixels' . "\n";
- 
-   if ($left_size == 125)
-      echo '<option value="125" selected>125 pixels' . "\n";
-   else
-      echo '<option value="125">125 pixels' . "\n";
- 
-   if ($left_size == 150)
-      echo '<option value="150" selected>150 pixels' . "\n";
-   else
-      echo '<option value="150">150 pixels' . "\n";
- 
-   if ($left_size == 175)
-      echo '<option value="175" selected>175 pixels' . "\n";
-   else
-      echo '<option value="175">175 pixels' . "\n";
- 
-   if (($left_size == 200) || ($left_size == ""))
-      echo '<option value="200" selected>200 pixels' . "\n";
-   else
-      echo '<option value="200">200 pixels' . "\n";
- 
-   if (($left_size == 225))
-      echo '<option value="225" selected>225 pixels' . "\n";
-   else
-      echo '<option value="225">225 pixels' . "\n";
- 
-   if (($left_size == 250))
-      echo '<option value="250" selected>250 pixels' . "\n";
-   else
-      echo '<option value="250">250 pixels' . "\n";
- 
-   if ($left_size == 275)
-      echo '<option value="275" selected>275 pixels' . "\n";
-   else
-      echo '<option value="275">275 pixels' . "\n";
- 
-   if (($left_size == 300))
-      echo '<option value="300" selected>300 pixels' . "\n";
-   else
-      echo '<option value="300">300 pixels' . "\n";
- 
+   for ($i = 100; $i <= 300; $i += 10)
+   {
+       if ($left_size >= $i && $left_size < $i + 10)
+          echo "<option value=\"$i\" selected>$i pixels\n";
+       else
+          echo "<option value=\"$i\">$i pixels\n";
+   }
    echo '         </select>';  
 ?>
             </td>
@@ -262,7 +215,7 @@
    if (($left_refresh == 600))
       echo '                  <OPTION VALUE="600" SELECTED>10 '.$minutes_str;
    else
-      echo '                  <OPTION VALUE="600">10 '$minutes_str;
+      echo '                  <OPTION VALUE="600">10 '.$minutes_str;
  
    if (($left_refresh == 720))
       echo '                  <OPTION VALUE="720" SELECTED>12 '.$minutes_str;
@@ -293,6 +246,19 @@
 ?>
             </td>
          </tr>
+         <tr>
+            <td valign=top align=right>
+               <?php echo _("Show HTML version by default"); ?>:
+            </td>
+            <td>
+               <input type=checkbox name=showhtmldefault <?php 
+	       if (isset($show_html_default) && $show_html_default) 
+	       echo " checked"; ?>>
+	         <?php 
+echo _("Yes, show me the HTML version of a mail message, if it is available."); 
+                 ?>
+            </td>
+         </tr>
          <?php do_hook('options_display_inside'); ?>
          <tr>
             <td>&nbsp;