X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=7c684247c8fcfe66411ef8fc5452a5bd2e1fca5d;hb=b67e316dea5c3f9e411784dbcde3ace4fc0f9ecd;hp=c099cb8c4c52da81e54589883b5d0f3594177e7b;hpb=e9f8ea4ecb40efdb6f19631f8359ebd1fbf588be;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index c099cb8c..7c684247 100644
--- a/src/options.php
+++ b/src/options.php
@@ -29,7 +29,7 @@
    if (!isset($auth_php))
       include ("../functions/auth.php"); 
 
-   if ($language) {
+   if (isset($language)) {
       setcookie("squirrelmail_language", $language, time()+2592000);
       $squirrelmail_language = $language;
    }   
@@ -41,18 +41,20 @@
 
 <br>
 <table width=95% align=center cellpadding=2 cellspacing=2 border=0>
-<tr><td bgcolor="<? echo $color[0] ?>">
-   <center><b><? echo _("Options") ?></b></center>
+<tr><td bgcolor="<?php echo $color[0] ?>">
+   <center><b><?php echo _("Options") ?></b></center>
 </td></tr></table>
 
-<?
+<?php
    if ($submit_personal) {
       # Save personal information
-      if (isset($full_name)) setPref($data_dir, $username, "full_name", stripslashes($full_name));
-      if (isset($email_address)) setPref($data_dir, $username, "email_address", stripslashes($email_address));
-      if (isset($reply_to)) setPref($data_dir, $username, "reply_to", stripslashes($reply_to));  
-      setPref($data_dir, $username, "use_signature", stripslashes($usesignature));  
-      if (isset($signature_edit)) setSig($data_dir, $username, stripslashes($signature_edit)); 
+      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)); 
+      
+      do_hook("options_personal_save");
       
       echo "<br><center><b>"._("Successfully saved personal information!")."</b></center><br>";
    } else if ($submit_display) {  
@@ -63,31 +65,41 @@
       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, '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");
+
       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 "<a href=\"../src/webmail.php\" target=_top>" . _("Refresh Page") . "</a></center><br>";
    } else if ($submit_folder) { 
       # Save folder preferences
       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", false);
-         setPref($data_dir, $username, "trash_folder", "");
+         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);
       } else {
-         setPref($data_dir, $username, "move_to_sent", false);
-         setPref($data_dir, $username, "sent_folder", "");
+         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 "<br><center><b>"._("Successfully saved folder preferences!")."</b><br>";
-      echo "<a href=\"left_main.php\" target=left>"._("Refresh Folders")."</a></center><br>";
+      echo "<a href=\"../src/left_main.php\" target=left>" . _("Refresh Folder List") . "</a></center><br>";
+   } else {
+      do_hook("options_save");
    }
+   
 ?>
 
 
@@ -96,25 +108,37 @@
    <td width=50% valign=top>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_personal.php"><? echo _("Personal Information"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_personal.php"><?php echo _("Personal Information"); ?></a>
+            </td>
+         </tr>
+         <tr>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("This contains personal information about yourself such as your name, your email address, etc.") ?>
+            </td>
+         </tr>   
+      </table><br>
+      <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>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("This contains personal information about yourself such as your name, your email address, etc.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("Based upon given criteria, incoming messages can have different background colors in the message list.  This helps to easily distinguish who the messages are from, especially for mailing lists.") ?>
             </td>
          </tr>   
       </table><br>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_highlight.php"><? echo _("Message Highlighting"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_order.php"><?php echo _("Index Order"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("Based upon given criteria, incoming messages can have different background colors in the message list.  This helps to easily distinguish who the messages are from, especially for mailing lists.") ?>
+            <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>
@@ -122,31 +146,32 @@
    <td valign=top width=50%>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_display.php"><? echo _("Display Preferences"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_display.php"><?php echo _("Display Preferences"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("You can change the way that SquirrelMail looks and displays information to you, such as the colors, the language, and other settings.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("You can change the way that SquirrelMail looks and displays information to you, such as the colors, the language, and other settings.") ?>
             </td>
          </tr>   
       </table><br>
       <table width=100% cellpadding=3 cellspacing=0 border=0>
          <tr>
-            <td bgcolor="<? echo $color[9] ?>">
-               <a href="options_folder.php"><? echo _("Folder Preferences"); ?></a>
+            <td bgcolor="<?php echo $color[9] ?>">
+               <a href="options_folder.php"><?php echo _("Folder Preferences"); ?></a>
             </td>
          </tr>
          <tr>
-            <td bgcolor="<? echo $color[0] ?>">
-               <? echo _("These settings change the way your folders are displayed and manipulated.") ?>
+            <td bgcolor="<?php echo $color[0] ?>">
+               <?php echo _("These settings change the way your folders are displayed and manipulated.") ?>
             </td>
          </tr>   
       </table><br>
    </td>
 </tr>
 </table>
-<?
-?>
+   <?php
+      do_hook("options_link_and_description")
+   ?>
 </body></html>