* Got bored and copied all the validate.php and define() stuff to 1.1

[squirrelmail.git] / src / options_display.php

diff --git a/src/options_display.php b/src/options_display.php
index 607f8e0522af4bb01097ba5aa6d699d9082cae06..9b433ec4e60d4469df0098f90651db71eee37cfc 100644 (file)
--- 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('../functins/plugin.php');
    include('../src/load_prefs.php');
+   
    displayPageHeader($color, 'None');
    $chosen_language = getPref($data_dir, $username, 'language');  
 ?>
@@ -68,7 +59,7 @@
    }
    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>
@@ -262,7 +253,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 +284,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;