X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=01692c2d0e1c3f46e777ef2e9c2b3a4f199aba0b;hb=8dd8019fd8d7abc91830ac0225d80dccc27c3604;hp=4a29dd900fa25d6ca09dbaabe2bf0c38cd614ae0;hpb=ac53fb5645d47313e6efe3327b57f0e2a30327c1;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index 4a29dd90..01692c2d 100644
--- a/src/options.php
+++ b/src/options.php
@@ -11,48 +11,61 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/strings.php');
-   include('../config/config.php');
-   include('../functions/page_header.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
-   include('../functions/i18n.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;
    }   
 
-   include('../src/load_prefs.php');
-   displayPageHeader($color, 'None');
+   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);
+      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))
+      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');
       
-      echo '<br><center><b>'._("Successfully saved personal information!").'</b></center><br>';
+      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;
@@ -69,28 +82,46 @@
    
       # 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');
-    
+      }
+
+      setPref($data_dir, $username, 'show_html_default', ($showhtmldefault?1:0) );
+
+      if (isset($includeselfreplyall)) {
+         setPref($data_dir, $username, 'include_self_reply_all', 1);
+      } 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><center><b>'._("Successfully saved display preferences!").'</b><br>';
-      echo '<a href="../src/webmail.php?right_frame=options.php" target=_top>' . _("Refresh Page") . '</a></center><br>';
+      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') {
@@ -106,25 +137,37 @@
       } else {
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
-      } 
-      setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      }
+      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 {
+         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');
+      setPref($data_dir, $username, 'date_format', $dateformat);
+      setPref($data_dir, $username, 'hour_format', $hourformat);
       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>';
+      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');
    }
    
 ?>
 
-
-<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">
@@ -192,7 +235,14 @@
    </td>
 </tr>
 </table>
-   <?php
-      do_hook('options_link_and_description')
-   ?>
+
+   <?php do_hook('options_link_and_description'); ?>
+
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
 </body></html>