Fixed IE/SSL/Attachment Bug!!!

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 1f7d38b33ccd78bf96db882b0ac449443a0acd29..7c684247c8fcfe66411ef8fc5452a5bd2e1fca5d 100644 (file)
--- 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;
    }   
@@ -48,11 +48,13 @@
 <?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,11 +65,15 @@
       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") {
@@ -87,8 +93,9 @@
       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");
    }
@@ -123,6 +130,18 @@
             </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>
@@ -152,7 +171,7 @@
    </td>
 </tr>
 </table>
-   <?
+   <?php
       do_hook("options_link_and_description")
    ?>
 </body></html>