X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_display.php;h=b258a075c1bd6fb1302ddefb1167fd908902683a;hb=2016e64507116836c60613a7e0569a9e9f7b5f57;hp=935f2d0c61643945689e4b66462aa234cdaaf3eb;hpb=1de36f81f2a4f2f16c44f3ce4af3739d97f409c0;p=squirrelmail.git

diff --git a/src/options_display.php b/src/options_display.php
index 935f2d0c..b258a075 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -7,299 +7,104 @@
     **
     **  Displays all optinos about display preferences
     **
+    **  $Id$
     **/
 
-   session_start();
+   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');
 
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.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");
-   displayPageHeader($color, "None");
-   $chosen_language = getPref($data_dir, $username, "language");  
+   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>
-         <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>
+   <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
-   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";
+    OptionSelect( _("Theme"), 'chosentheme', $theme, $chosen_theme, 'NAME', 'PATH' );
+    OptionSelect( _("Language"), 'language', $languages, $chosen_language, 'NAME' );
+    OptionRadio( _("Use Javascript or HTML addressbook?"),
+                 'javascript_abook',
+                 array( '1' => _("JavaScript"),
+                        '0' => _("HTML") ),
+                 $use_javascript_addr_book );
+    OptionText( _("Number of Messages to Index"), 'shownum', $show_num, 5 );
+    OptionText( _("Wrap incoming text at"), 'wrapat', $wrap_at, 5 );
+    OptionText( _("Size of editor window"), 'editorsize', $editor_size, 5 );
+    OptionSelect( _("Location of buttons when composing"),
+                  'button_new_location',
+                  array( 'top' => _("Before headers"),
+                         'between' => _("Between headers and message body"),
+                         'bottom' => _("After message body") ),
+                  $location_of_buttons );
+    OptionSelect( _("Location of folder list"),
+                  'folder_new_location',
+                  array( '' => _("Left"),
+                         'right' => _("Right") ),
+                  $location_of_bar );
+   for ($i = 100; $i <= 300; $i += 10) {
+        $res[$i] = $i . _("pixels");
    }
-   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=text 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>
-<?php
-   $seconds_str = _("Seconds");
-   $none_str = _("None");
-   $minute_str = _("Minute");
+   OptionSelect( _("Width of folder list"),
+                 'leftsize',
+                 $res,
+                 $left_size );
    $minutes_str = _("Minutes");
+   OptionSelect( _("Auto refresh folder list"),
+                 'leftrefresh',
+                 array( 'None' => _("Never"),
+                        30 => '30 '. _("Seconds"),
+                        60 => '1 ' . _("Minute"),
+                        120 => "2 $minutes_str",
+                        180 => "3 $minutes_str",
+                        300 => "5 $minutes_str",
+                        600 => "10 $minutes_str" ),
+                 $left_refresh );
+   OptionRadio( _("Use alternating row colors?"),
+                'altIndexColors',
+                array( 1 => _("Yes"),
+                       0 => _("No") ),
+                $alt_index_colors );
+   OptionCheck( _("Show HTML version by default"),
+                'showhtmldefault',
+                $show_html_default,
+                _("Yes, show me the HTML version of a mail message, if it is available.") );
+   OptionCheck( _("Include Self"),
+                'includeselfreplyall',
+                getPref($data_dir, $username, 'include_self_reply_all', FALSE ),
+                _("Don't remove me from the CC addresses when I use \"Reply All\"") );
+   $psw = getPref($data_dir, $username, 'page_selector_max', 10 );
+   OptionCheck( _("Page Selector"),
+                'pageselector',
+                !getPref($data_dir, $username, 'page_selector', FALSE ),
+                _("Show page selector") .
+                " <input name=pageselectormax size=3  value=\"$psw\"> &nbsp;" .
+                _("pages max") );
 
-   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_strs";
-   else
-      echo "                  <OPTION VALUE=10>10 $seconds_strs";
- 
-   if (($left_refresh == "20"))
-      echo "                  <OPTION VALUE=20 SELECTED>20 $seconds_strs";
-   else
-      echo "                  <OPTION VALUE=20>20 $seconds_strs";
- 
-   if (($left_refresh == "30"))
-      echo "                  <OPTION VALUE=30 SELECTED>30 $seconds_strs";
-   else
-      echo "                  <OPTION VALUE=30>30 $seconds_strs";
- 
-   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>"; 
+   echo '<tr><td colspan=2><hr noshade></td></tr>';
+   do_hook('options_display_inside');
+   OptionSubmit();
 ?>
-            </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"); ?>
-</body></html>
+
+   <?php do_hook('options_display_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+</body></html>
\ No newline at end of file