Multiple changes.

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 4ead9c949bd7801d3cf65a590665081bf6629690..01692c2d0e1c3f46e777ef2e9c2b3a4f199aba0b 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -11,13 +11,16 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   
+  ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
+  $base_uri = $regs[1];   
 
    if (isset($language)) {
-      setcookie('squirrelmail_language', $language, time()+2592000);
+      setcookie('squirrelmail_language', $language, time()+2592000, $base_uri);
       $squirrelmail_language = $language;
    }   
 
@@ -37,19 +40,28 @@
 <?php
    if (isset($submit_personal)) {
       # Save personal information
-      if (isset($full_name)) 
+      if (isset($full_name)) {
          setPref($data_dir, $username, 'full_name', $full_name);
-      if (isset($email_address)) 
+      }
+      if (isset($email_address)) {
          setPref($data_dir, $username, 'email_address', $email_address);
-      if (isset($reply_to)) 
+      }
+      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))
+      if (! isset($prefixsig)) {
          $prefixsig = 0;
+      }
       setPref($data_dir, $username, 'prefix_sig', $prefixsig);
-      if (isset($signature_edit)) setSig($data_dir, $username, $signature_edit);
+      if (isset($signature_edit)) {
+         setSig($data_dir, $username, $signature_edit);
+      }
       
       do_hook('options_personal_save');
       
@@ -70,28 +82,42 @@
    
       # Save display preferences
       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, '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);
-      if (isset($altIndexColors) && $altIndexColors == 1)
+
+      if (isset($altIndexColors) && $altIndexColors == 1) {
          setPref($data_dir, $username, 'alt_index_colors', 1);
-      else
+      } else {
          setPref($data_dir, $username, 'alt_index_colors', 0);
-      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, 'show_html_default', ($showhtmldefault?1:0) );
+
+      if (isset($includeselfreplyall)) {
          setPref($data_dir, $username, 'include_self_reply_all', 1);
-      else
+      } else {
          removePref($data_dir, $username, 'include_self_reply_all');
-    
+      }
+
+      if (isset($pageselectormax)) {
+         setPref($data_dir, $username, 'page_selector_max', $pageselectormax);
+      } else {
+         removePref($data_dir, $username, 'page_selector_max', 0 );
+      }
+
+      if (isset($pageselector)) {
+         removePref($data_dir, $username, 'page_selector');
+      } else {
+         setPref($data_dir, $username, 'page_selector', 1);
+      }
+
       do_hook('options_display_save');
 
       echo '<br><b>'._("Successfully saved display preferences!").'</b><br>';
@@ -112,6 +138,13 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       }
+      if ($draft != 'none') {
+         setPref($data_dir, $username, 'save_as_draft', true);
+         setPref($data_dir, $username, 'draft_folder', $draft);
+      } else {
+         setPref($data_dir, $username, 'save_as_draft', '0');
+         setPref($data_dir, $username, 'draft_folder', 'none');
+      }
       if (isset($folderprefix)) {
          setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       } else {
@@ -123,6 +156,8 @@
           setPref($data_dir, $username, 'collapse_folders', $collapsefolders);
       else
           removePref($data_dir, $username, 'collapse_folders');
+      setPref($data_dir, $username, 'date_format', $dateformat);
+      setPref($data_dir, $username, 'hour_format', $hourformat);
       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>';