Removed body formatting when saving as a draft. This is OK with IMAP but

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 3ad2191bb8fd7ff64a382d0b30a2931a16044629..01692c2d0e1c3f46e777ef2e9c2b3a4f199aba0b 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -15,9 +15,12 @@
    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;
    }   
 
@@ -95,11 +98,7 @@
          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');
-      }
+      setPref($data_dir, $username, 'show_html_default', ($showhtmldefault?1:0) );
 
       if (isset($includeselfreplyall)) {
          setPref($data_dir, $username, 'include_self_reply_all', 1);
@@ -107,10 +106,16 @@
          removePref($data_dir, $username, 'include_self_reply_all');
       }
 
-      if (isset($pageselector)) {
-         setPref($data_dir, $username, 'page_selector', 1);
+      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');
@@ -133,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 {
@@ -144,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>';
@@ -231,4 +245,4 @@
 </td></tr>
 </table>
 
-</body></html>
\ No newline at end of file
+</body></html>