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

diff --git a/src/options_display.php b/src/options_display.php
index 288d6636..22254bbf 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -10,297 +10,227 @@
     **  $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/load_prefs.php');
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
+   require_once('../functions/options.php');
+
    displayPageHeader($color, 'None');
-   $chosen_language = getPref($data_dir, $username, 'language');  
+   $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>
-
-   <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="2" border="0">
-         <tr>
-            <td align="right" nowrap><?php echo _("Theme"); ?>:
-            </td><td>
-<?php
-   echo '         <tt><select name="chosentheme">' . "\n";
-   for ($i = 0; $i < count($theme); $i++) {
-      if ($theme[$i]['PATH'] == $chosen_theme)
-         echo '         <option selected value="'.$theme[$i]['PATH'].'">'.$theme[$i]['NAME']."\n";
-      else
-         echo '         <option value="'.$theme[$i]['PATH'].'">'.$theme[$i]['NAME']."\n";
-   }
-   echo '         </select></tt>';  
-?>
-            </td>
-         </tr>
-         <tr>
-            <td valign="top" align="right" nowrap><?php echo _("Language"); ?>:
-            </td><td>
-<?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";
-   }
-   echo '         </select></tt>';  
-   if (! $use_gettext)
-      echo '<br><small>This system doesn't support multiple languages</small>';
-      
-?>
-            </td>
-         <tr>
-            <td align=right nowrap>&nbsp;
-               <?php echo _("Use Javascript or HTML addressbook?") . '</td><td>'; 
-               if ($use_javascript_addr_book == true) {
-                  echo '         <input type="radio" name="javascript_abook" value="1" checked> ' . _("JavaScript") . '&nbsp;&nbsp;&nbsp;&nbsp;';
-                  echo '         <input type="radio" name="javascript_abook" value="0"> ' . _("HTML"); 
-               } else {
-                  echo '         <input type="radio" name="javascript_abook" value="1"> ' . _("JavaScript") . '&nbsp;&nbsp;&nbsp;&nbsp;';
-                  echo '         <input type="radio" name="javascript_abook" value="0" checked> ' . _("HTML"); 
-               }  
-               ?>
-            </td>
-         </tr>
-         <tr>
-            <td align=right nowrap><?php echo _("Number of Messages to Index"); ?>:
-            </td><td>
-<?php
-   if (isset($show_num))
-      echo '         <tt><input type="text" size="5" name="shownum" value="'.$show_num.'"></tt><br>';
-   else
-      echo '         <tt><input type="text" size="5" name="shownum" value="25"></tt><br>'; 
-?>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?php echo _("Wrap incoming text at"); ?>:
-            </td><td>
-<?php
-   if (isset($wrap_at))
-      echo '         <tt><input type="text" size="5" name="wrapat" value="'.$wrap_at.'"></tt><br>';
-   else
-      echo '         <tt><input type="tex" size="5" name="wrapat" value="86"></tt><br>'; 
-?>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?php echo _("Size of editor window"); ?>:
-            </td><td>
-<?php
-   if ($editor_size >= 10 && $editor_size <= 255)
-      echo '         <tt><input type="text" size="5" name="editorsize" value="'.$editor_size.'"></tt><br>';
-   else
-      echo '         <tt><input type="text" size="5" name="editorsize" value="76"></tt><br>'; 
-?>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?PHP echo _("Location of folder list") ?>:</td>
-            <td><select name="folder_new_location">
-                <option value="left"<?PHP
-                    if ($location_of_bar != 'right') echo ' SELECTED';
-                    ?>><?PHP echo _("Left"); ?></option>
-                <option value="right"<?PHP
-                    if ($location_of_bar == 'right') echo ' SELECTED';
-                    ?>><?PHP echo _("Right"); ?></option>
-                </select>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?PHP echo _("Location of buttons when composing") ?>:</td>
-            <td><select name="button_new_location">
-                <option value="top"<?PHP
-                    if ($location_of_buttons == 'top') echo ' SELECTED';
-                    ?>><?PHP echo _("Before headers"); ?></option>
-                <option value="between"<?PHP
-                    if ($location_of_buttons == 'between') echo ' SELECTED';
-                    ?>><?PHP echo _("Between headers and message body"); ?></option>
-                <option value="bottom"<?PHP
-                    if ($location_of_buttons == 'bottom') echo ' SELECTED';
-                    ?>><?PHP echo _("After message body"); ?></option>
-                </select>
-            </td>
-         </tr>
-         <tr>
-            <td align=right nowrap><?php echo _("Width of folder list"); ?>:
-            </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";
- 
-   echo '         </select>';  
-?>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?php echo _("Auto refresh folder list"); ?>:
-            </td><td>
+<table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
+
+   <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">
 <?php
-   $seconds_str = _("Seconds");
-   $none_str = _("None");
-   $minute_str = _("Minute");
-   $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 == 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;
- 
-      echo '               </SELECT>'; 
+
+    /* Build a simple array into which we will build options. */
+    $optgrps = array();
+    $optvals = array();
+
+    /******************************************************/
+    /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
+    /******************************************************/
+    define('SMOPT_GRP_GENERAL', 0);
+    define('SMOPT_GRP_MAILBOX', 1);
+    define('SMOPT_GRP_MESSAGE', 2);
+
+    /*** Load the General Options into the array ***/
+    $optgrps[SMOPT_GRP_GENERAL] = _("General Display Options");
+    $optvals[SMOPT_GRP_GENERAL] = array();
+
+    /* Load the theme option. */
+    $theme_values = array();
+    foreach ($theme as $theme_key => $theme_attributes) {
+        $theme_values[$theme_attributes['PATH']] = $theme_attributes['NAME'];
+    }
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'chosen_theme',
+        'caption' => _("Theme"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => $theme_values
+    );
+
+    $language_values = array();
+    foreach ($languages as $lang_key => $lang_attributes) {
+        if (isset($lang_attributes['NAME'])) {
+            $language_values[$lang_key] = $lang_attributes['NAME'];
+        }
+    }
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'language',
+        'caption' => _("Language"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => $language_values
+    );
+
+    /* Set values for the "use javascript" option. */
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'javascript_setting',
+        'caption' => _("Use Javascript"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => array(SMPREF_JS_AUTODETECT => _("Autodetect"),
+                           SMPREF_JS_ON         => _("Always"),
+                           SMPREF_JS_OFF        => _("Never"))
+    );
+
+    $js_autodetect_results = SMPREF_JS_OFF;
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'js_autodetect_results',
+        'caption' => '',
+        'type'    => SMOPT_TYPE_HIDDEN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    /*** Load the General Options into the array ***/
+    $optgrps[SMOPT_GRP_MAILBOX] = _("Mailbox Display Options");
+    $optvals[SMOPT_GRP_MAILBOX] = array();
+
+    $optvals[SMOPT_GRP_MAILBOX][] = array(
+        'name'    => 'show_num',
+        'caption' => _("Number of Messages to Index"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    $optvals[SMOPT_GRP_MAILBOX][] = array(
+        'name'    => 'alt_index_colors',
+        'caption' => _("Enable Alternating Row Colors"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MAILBOX][] = array(
+        'name'    => 'page_selector',
+        'caption' => _("Enable Page Selector"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MAILBOX][] = array(
+        'name'    => 'page_selector_max',
+        'caption' => _("Maximum Number of Pages to Show"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    /*** Load the General Options into the array ***/
+    $optgrps[SMOPT_GRP_MESSAGE] = _("Message Display and Composition");
+    $optvals[SMOPT_GRP_MESSAGE] = array();
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'wrap_at',
+        'caption' => _("Wrap Incoming Text At"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'editor_size',
+        'caption' => _("Size of Editor Window"),
+        'type'    => SMOPT_TYPE_INTEGER,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'size'    => SMOPT_SIZE_TINY
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'location_of_buttons',
+        'caption' => _("Location of Buttons when Composing"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => array(SMPREF_LOC_TOP     => _("Before headers"),
+                           SMPREF_LOC_BETWEEN => _("Between headers and message body"),
+                           SMPREF_LOC_BOTTOM  => _("After message body"))
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'use_javascript_addr_book',
+        'caption' => _("Addressbook Display Format"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => array('1' => _("Javascript"),
+                           '0' => _("HTML"))
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'show_html_default',
+        'caption' => _("Show HTML Version by Default"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'include_self_reply_all',
+        'caption' => _("Include Me in CC when I Reply All"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'show_xmailer_default',
+        'caption' => _("Enable Mailer Display"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'attachment_common_show_images',
+        'caption' => _("Enable display of images with email, below attachment box"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'pf_subtle_link',
+        'caption' => _("Printer Friendly: Subtle Link"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    $optvals[SMOPT_GRP_MESSAGE][] = array(
+        'name'    => 'pf_cleandisplay',
+        'caption' => _("Printer Friendly: Clean Display"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+    /* Build and output the option groups. */
+    $option_groups = createOptionGroups($optgrps, $optvals);
+    printOptionGroups($option_groups);
+    
+    do_hook('options_display_inside');
+    echo "<TR><TD>&nbsp;</TD></TR>\n";
+
+    OptionSubmit( 'submit_display' );
 ?>
-            </td>
-         </tr>
-         <?php do_hook('options_display_inside'); ?>
-         <tr>
-            <td>&nbsp;
-            </td><td>
-               <input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display">
-            </td>
-         </tr>
-      </table>   
+
+      </table>
    </form>
+
    <?php do_hook('options_display_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+<SCRIPT LANGUAGE="JavaScript"><!--
+  document.forms[0].new_js_autodetect_results.value = '<?php echo SMPREF_JS_ON; ?>';
+// --></SCRIPT>
+
+</td></tr>
+</table>
 </body></html>