X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=769a48c213f4d64320f0b1c8248bddf1e170af0a;hb=8442ac0819d9e82e8c8bd8ac67f8cabedef9ca3f;hp=bf3231662064bb3b09d53ae2146095e306750fcc;hpb=c36ed9cfc1635cd9a8f80d9cdf8200628777903f;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index bf323166..769a48c2 100644
--- a/src/options.php
+++ b/src/options.php
@@ -39,13 +39,13 @@
    is_logged_in(); 
 ?>
 
-<table width=100% cellpadding=2 cellspacing=2 border=0>
-<tr><td bgcolor="<? echo $color[0] ?>">
-   <center><b><? echo _("Options") ?></b></center>
-</td></tr></table>
 <br>
+<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) {
       # Save personal information
       if (isset($full_name)) setPref($data_dir, $username, "full_name", stripslashes($full_name));
@@ -54,7 +54,7 @@
       setPref($data_dir, $username, "use_signature", stripslashes($usesignature));  
       if (isset($signature_edit)) setSig($data_dir, $username, stripslashes($signature_edit)); 
       
-      echo "<center><b>"._("Successfully saved personal information!")."</b></center><br>";
+      echo "<br><center><b>"._("Successfully saved personal information!")."</b></center><br>";
    } else if ($submit_display) {  
       # Save display preferences
       setPref($data_dir, $username, "chosen_theme", $chosentheme);
@@ -66,7 +66,7 @@
       setPref($data_dir, $username, "left_size", $leftsize);
       setPref($data_dir, $username, "use_javascript_addr_book", $javascript_abook);
     
-      echo "<center><b>"._("Successfully saved display preferences!")."</b><br>";
+      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>";
    } else if ($submit_folder) { 
       # Save folder preferences
@@ -74,79 +74,85 @@
          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);
-      echo "<center><b>"._("Successfully saved folder preferences!")."</b><br>";
+      setPref($data_dir, $username, "unseen_notify", $unseennotify);
+      setPref($data_dir, $username, "unseen_type", $unseentype);
+      echo "<br><center><b>"._("Successfully saved folder preferences!")."</b><br>";
       echo "<a href=\"left_main.php\" target=left>"._("Refresh Folders")."</a></center><br>";
+   } else {
+      do_hook("options_save");
    }
+   
 ?>
 
 
 <table width=90% cellpadding=0 cellspacing=10 border=0 align=center>
 <tr>
-   <td valign=top>
+   <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="<? 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 _("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="<? echo $color[9] ?>">
-               <a href="options_highlight.php"><? echo _("Message Highlighting"); ?></a>
+            <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 _("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 _("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>
    </td>
-   <td valign=top>
+   <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>