X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=241a3a6f1bbedf395c452e83aed24814cc05884f;hb=db5910ac606acd806802515fd35e256e63e6254c;hp=7e2b1aa479b89538dfb30a32a5dd20c45eb19cca;hpb=9a732bb67ea88537b219f500b9ef3faf487a893b;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index 7e2b1aa4..241a3a6f 100644
--- a/src/options.php
+++ b/src/options.php
@@ -8,112 +8,106 @@
     **  Displays the options page. Pulls from proper user preference files
     **  and config.php. Displays preferences as selected and other options.
     **
+    **  $Id$
     **/
 
    session_start();
 
-   if (!isset($config_php))
-      include("../config/config.php");
    if (!isset($strings_php))
-      include("../functions/strings.php");
+      include'../functions/strings.php');
+   if (!isset($config_php))
+      include('../config/config.php');
    if (!isset($page_header_php))
-      include("../functions/page_header.php");
+      include('../functions/page_header.php');
    if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
+      include('../functions/display_messages.php');
    if (!isset($imap_php))
-      include("../functions/imap.php");
+      include('../functions/imap.php');
    if (!isset($array_php))
-      include("../functions/array.php");
+      include('../functions/array.php');
    if (!isset($i18n_php))
-      include("../functions/i18n.php");
+      include('../functions/i18n.php');
    if (!isset($auth_php))
-      include ("../functions/auth.php"); 
+      include ('../functions/auth.php'); 
 
    if (isset($language)) {
-      setcookie("squirrelmail_language", $language, time()+2592000);
+      setcookie('squirrelmail_language', $language, time()+2592000);
       $squirrelmail_language = $language;
    }   
 
-   include("../src/load_prefs.php");
-   displayPageHeader($color, "None");
+   include('../src/load_prefs.php');
+   displayPageHeader($color, 'None');
    is_logged_in(); 
 ?>
 
 <br>
-<table width=95% align=center cellpadding=2 cellspacing=2 border=0>
+<table width="95%" align="center" cellpadding="2" cellspacing="2" border="0">
 <tr><td bgcolor="<?php echo $color[0] ?>">
    <center><b><?php echo _("Options") ?></b></center>
 </td></tr></table>
 
 <?php
-   if ($submit_personal) {
+   if (isset($submit_personal)) {
       # Save personal information
-      if (isset($full_name)) setPref($data_dir, $username, "full_name", sqStripSlashes($full_name));
-      if (isset($email_address)) setPref($data_dir, $username, "email_address", sqStripSlashes($email_address));
-      if (isset($reply_to)) setPref($data_dir, $username, "reply_to", sqStripSlashes($reply_to));  
-      setPref($data_dir, $username, "use_signature", sqStripSlashes($usesignature));  
-      if (isset($signature_edit)) setSig($data_dir, $username, sqStripSlashes($signature_edit)); 
+      if (isset($full_name)) setPref($data_dir, $username, 'full_name', $full_name);
+      if (isset($email_address)) setPref($data_dir, $username, 'email_address', $email_address);
+      if (isset($reply_to)) setPref($data_dir, $username, 'reply_to', $reply_to);  
+      setPref($data_dir, $username, 'use_signature', $usesignature);  
+      if (isset($signature_edit)) setSig($data_dir, $username, $signature_edit);
       
-      do_hook("options_personal_save");
+      do_hook('options_personal_save');
       
-      echo "<br><center><b>"._("Successfully saved personal information!")."</b></center><br>";
-   } else if ($submit_display) {  
+      echo '<br><center><b>'._("Successfully saved personal information!").'</b></center><br>';
+   } else if (isset($submit_display)) {  
       # Save display preferences
-      setPref($data_dir, $username, "chosen_theme", $chosentheme);
-      setPref($data_dir, $username, "show_num", $shownum);
-      setPref($data_dir, $username, "wrap_at", $wrapat);
-      setPref($data_dir, $username, "editor_size", $editorsize);
-      setPref($data_dir, $username, "left_refresh", $leftrefresh);
-      setPref($data_dir, $username, "language", $language);
+      setPref($data_dir, $username, 'chosen_theme', $chosentheme);
+      setPref($data_dir, $username, 'show_num', $shownum);
+      setPref($data_dir, $username, 'wrap_at', $wrapat);
+      setPref($data_dir, $username, 'editor_size', $editorsize);
+      setPref($data_dir, $username, 'left_refresh', $leftrefresh);
+      setPref($data_dir, $username, 'language', $language);
       setPref($data_dir, $username, 'location_of_bar', $folder_new_location);
-      setPref($data_dir, $username, "left_size", $leftsize);
-      setPref($data_dir, $username, "use_javascript_addr_book", $javascript_abook);
+      setPref($data_dir, $username, 'location_of_buttons', $button_new_location);
+      setPref($data_dir, $username, 'left_size', $leftsize);
+      setPref($data_dir, $username, 'use_javascript_addr_book', $javascript_abook);
     
-      do_hook("options_display_save");
+      do_hook('options_display_save');
 
-      echo "<center><table width=90% cellpadding=2 cellspacing=0 border=0 bgcolor=\"$color[2]\"><tr><td>";
-      ecHO "<table width=100% cellpadding=5 cellspacing=0 border=0 bgcolor=\"$color[4]\"><tr><td>";
-      echo "<br><center><b>"._("Successfully saved display preferences!")."</b><br>";
-      echo "<a href=\"webmail.php?right_frame=options.php\" target=_top>"._("Refresh Page")."</a></center><br>";
-      echo "</td></tr></table>";
-      echo "</td></tr></table></center>";
-   } else if ($submit_folder) { 
+      echo '<br><center><b>'._("Successfully saved display preferences!").'</b><br>';
+      echo '<a href="../src/webmail.php" target=_top>' . _("Refresh Page") . '</a></center><br>';
+   } else if (isset($submit_folder)) { 
       # Save folder preferences
-      if ($trash != "none") {
-         setPref($data_dir, $username, "move_to_trash", true);
-         setPref($data_dir, $username, "trash_folder", $trash);
+      if ($trash != 'none') {
+         setPref($data_dir, $username, 'move_to_trash', true);
+         setPref($data_dir, $username, 'trash_folder', $trash);
       } else {
-         setPref($data_dir, $username, "move_to_trash", "0");
-         setPref($data_dir, $username, "trash_folder", "none");
+         setPref($data_dir, $username, 'move_to_trash', '0');
+         setPref($data_dir, $username, 'trash_folder', 'none');
       }
-      if ($sent != "none") {
-         setPref($data_dir, $username, "move_to_sent", true);
-         setPref($data_dir, $username, "sent_folder", $sent);
+      if ($sent != 'none') {
+         setPref($data_dir, $username, 'move_to_sent', true);
+         setPref($data_dir, $username, 'sent_folder', $sent);
       } else {
-         setPref($data_dir, $username, "move_to_sent", "0");
-         setPref($data_dir, $username, "sent_folder", "none");
+         setPref($data_dir, $username, 'move_to_sent', '0');
+         setPref($data_dir, $username, 'sent_folder', 'none');
       } 
-      setPref($data_dir, $username, "folder_prefix", $folderprefix);
-      setPref($data_dir, $username, "unseen_notify", $unseennotify);
-      setPref($data_dir, $username, "unseen_type", $unseentype);
-      do_hook("options_folders_save");
-      echo "<center><table width=90% cellpadding=2 cellspacing=0 border=0 bgcolor=\"$color[2]\"><tr><td>";
-      ecHO "<table width=100% cellpadding=5 cellspacing=0 border=0 bgcolor=\"$color[4]\"><tr><td>";
-      echo "<br><center><b>"._("Successfully saved folder preferences!")."</b><br>";
-      echo "<a href=\"left_main.php\" target=left>"._("Refresh Folders")."</a></center><br>";
-      echo "</td></tr></table>";
-      echo "</td></tr></table></center>";
+      setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      setPref($data_dir, $username, 'unseen_notify', $unseennotify);
+      setPref($data_dir, $username, 'unseen_type', $unseentype);
+      do_hook('options_folders_save');
+      echo '<br><center><b>'._("Successfully saved folder preferences!").'</b><br>';
+      echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a></center><br>';
    } else {
-      do_hook("options_save");
+      do_hook('options_save');
    }
    
 ?>
 
 
-<table width=90% cellpadding=0 cellspacing=10 border=0 align=center>
+<table width="90%" cellpadding="0" cellspacing="10" border="0" align="center">
 <tr>
-   <td width=50% valign=top>
-      <table width=100% cellpadding=3 cellspacing=0 border=0>
+   <td width="50%" valign="top">
+      <table width="100%" cellpadding="3" cellspacing="0" border="0">
          <tr>
             <td bgcolor="<?php echo $color[9] ?>">
                <a href="options_personal.php"><?php echo _("Personal Information"); ?></a>
@@ -125,7 +119,7 @@
             </td>
          </tr>   
       </table><br>
-      <table width=100% cellpadding=3 cellspacing=0 border=0>
+      <table width="100%" cellpadding="3" cellspacing="0" border="0">
          <tr>
             <td bgcolor="<?php echo $color[9] ?>">
                <a href="options_highlight.php"><?php echo _("Message Highlighting"); ?></a>
@@ -137,9 +131,21 @@
             </td>
          </tr>   
       </table><br>
+      <table width="100%" cellpadding="3" cellspacing="0" border="0">
+         <tr>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_order.php"><?php echo _("Index Order"); ?></a>
+            </td>
+         </tr>
+         <tr>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("The order of the message index can be rearanged and changed to contain the headers in any order you want.") ?>
+            </td>
+         </tr>   
+      </table><br>
    </td>
-   <td valign=top width=50%>
-      <table width=100% cellpadding=3 cellspacing=0 border=0>
+   <td valign="top" width="50%">
+      <table width="100%" cellpadding="3" cellspacing="0" border="0">
          <tr>
             <td bgcolor="<?php echo $color[9] ?>">
                <a href="options_display.php"><?php echo _("Display Preferences"); ?></a>
@@ -151,7 +157,7 @@
             </td>
          </tr>   
       </table><br>
-      <table width=100% cellpadding=3 cellspacing=0 border=0>
+      <table width="100%" cellpadding="3" cellspacing="0" border="0">
          <tr>
             <td bgcolor="<?php echo $color[9] ?>">
                <a href="options_folder.php"><?php echo _("Folder Preferences"); ?></a>
@@ -167,6 +173,6 @@
 </tr>
 </table>
    <?php
-      do_hook("options_link_and_description")
+      do_hook('options_link_and_description')
    ?>
 </body></html>