X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=3ad2191bb8fd7ff64a382d0b30a2931a16044629;hb=feb563a6db28342336de2fca7c6d94ce69e07c42;hp=f37155fe2bb57ddc3874e72e2688a2dbc9282c55;hpb=d51894be063bf2e1349762bc554358c62d368e36;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index f37155fe..3ad2191b 100644
--- a/src/options.php
+++ b/src/options.php
@@ -11,103 +11,152 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.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($auth_php))
-      include ("../functions/auth.php"); 
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.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");
-   is_logged_in(); 
+   displayPageHeader($color, _("None"));
+
 ?>
 
 <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>
+<table bgcolor="<?php echo $color[0] ?>" width="95%" align="center" cellpadding="2" cellspacing="0" border="0">
+<tr><td align="center">
+
+      <b><?php echo _("Options") ?></b><br>
+
+    <table width="100%" border="0" cellpadding="5" cellspacing="0">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 
 <?php
    if (isset($submit_personal)) {
       # Save personal information
-      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);
+      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, 'reply_citation_style', $new_reply_citation_style);
+      setPref($data_dir, $username, 'reply_citation_start', $new_reply_citation_start);
+      setPref($data_dir, $username, 'reply_citation_end', $new_reply_citation_end);
+      if (! isset($usesignature))
+         $usesignature = 0;
+      setPref($data_dir, $username, 'use_signature', $usesignature);  
+      if (! isset($prefixsig)) {
+         $prefixsig = 0;
+      }
+      setPref($data_dir, $username, 'prefix_sig', $prefixsig);
+      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 (isset($submit_display)) {  
+      echo '<br><b>'._("Successfully saved personal information!").'</b><br>';
+   } else if (isset($submit_display)) {
+      // Do checking to make sure $chosentheme is in the array
+      $in_ary = false;
+      for ($i=0; $i < count($theme); $i++)
+      {
+          if ($theme[$i]['PATH'] == $chosentheme)
+	  {
+	      $in_ary = true;
+	      break;
+	  }
+      }
+      if (! $in_ary)
+          $chosentheme = '';
+   
       # 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, 'language', $language);
+      setPref($data_dir, $username, 'use_javascript_addr_book', $javascript_abook);
+      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, '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");
+      setPref($data_dir, $username, 'left_size', $leftsize);
+
+      if (isset($altIndexColors) && $altIndexColors == 1) {
+         setPref($data_dir, $username, 'alt_index_colors', 1);
+      } else {
+         setPref($data_dir, $username, 'alt_index_colors', 0);
+      }
 
-      echo "<br><center><b>"._("Successfully saved display preferences!")."</b><br>";
-      echo "<a href=\"../src/webmail.php\" target=_top>" . _("Refresh Page") . "</a></center><br>";
+      if (isset($showhtmldefault)) {
+         setPref($data_dir, $username, 'show_html_default', 1);
+      } else {
+         removePref($data_dir, $username, 'show_html_default');
+      }
+
+      if (isset($includeselfreplyall)) {
+         setPref($data_dir, $username, 'include_self_reply_all', 1);
+      } else {
+         removePref($data_dir, $username, 'include_self_reply_all');
+      }
+
+      if (isset($pageselector)) {
+         setPref($data_dir, $username, 'page_selector', 1);
+      } else {
+         removePref($data_dir, $username, 'page_selector');
+      }
+
+      do_hook('options_display_save');
+
+      echo '<br><b>'._("Successfully saved display preferences!").'</b><br>';
+      echo '<a href="../src/webmail.php?right_frame=options.php" target=_top>' . _("Refresh Page") . '</a><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');
+      }
+      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_trash", "0");
-         setPref($data_dir, $username, "trash_folder", "none");
+         setPref($data_dir, $username, 'move_to_sent', '0');
+         setPref($data_dir, $username, 'sent_folder', 'none');
       }
-      if ($sent != "none") {
-         setPref($data_dir, $username, "move_to_sent", true);
-         setPref($data_dir, $username, "sent_folder", $sent);
+      if (isset($folderprefix)) {
+         setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       } else {
-         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=\"../src/left_main.php\" target=left>" . _("Refresh Folder List") . "</a></center><br>";
+         setPref($data_dir, $username, 'folder_prefix', '');
+      }
+      setPref($data_dir, $username, 'unseen_notify', $unseennotify);
+      setPref($data_dir, $username, 'unseen_type', $unseentype);
+      if (isset($collapsefolders))
+          setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
+      else
+          removePref($data_dir, $username, 'collapse_folders');
+      do_hook('options_folders_save');
+      echo '<br><b>'._("Successfully saved folder preferences!").'</b><br>';
+      echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a><br>';
    } else {
-      do_hook("options_save");
+      do_hook('options_save');
    }
    
 ?>
 
-
-<table width=90% cellpadding=0 cellspacing=10 border=0 align=center>
+<table bgcolor="<?php echo $color[4] ?>" width="100%" cellpadding="5" cellspacing="0" border="0">
 <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>
@@ -119,7 +168,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>
@@ -131,7 +180,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_order.php"><?php echo _("Index Order"); ?></a>
@@ -144,8 +193,8 @@
          </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>
@@ -157,7 +206,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>
@@ -172,7 +221,14 @@
    </td>
 </tr>
 </table>
-   <?php
-      do_hook("options_link_and_description")
-   ?>
-</body></html>
+
+   <?php do_hook('options_link_and_description'); ?>
+
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
+</body></html>
\ No newline at end of file