X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=97dfd2ad868e10dc509daa12591e4f54f332baa2;hb=709a1a6d2b6881c1e57e542579436a8f9a909ac3;hp=3e7ddd05b2a5f8a24a225ee07376828e7e9e378d;hpb=8d6369676a333a6a65a174bfb3b9ec9ea5eb8308;p=squirrelmail.git

diff --git a/src/options.php b/src/options.php
index 3e7ddd05..97dfd2ad 100644
--- a/src/options.php
+++ b/src/options.php
@@ -37,19 +37,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,27 +79,33 @@
    
       # 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))
+      }
+
+      if (isset($showhtmldefault)) {
          setPref($data_dir, $username, 'show_html_default', 1);
-      else
+      } else {
          removePref($data_dir, $username, 'show_html_default');
-      if (isset($includeselfreplyall))
+      }
+
+      if (isset($includeselfreplyall)) {
          setPref($data_dir, $username, 'include_self_reply_all', 1);
-      else
+      } else {
          removePref($data_dir, $username, 'include_self_reply_all');
+      }
     
       do_hook('options_display_save');
 
@@ -112,7 +127,7 @@
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
       }
-      if (isset($folder_prefix)) {
+      if (isset($folderprefix)) {
          setPref($data_dir, $username, 'folder_prefix', $folderprefix);
       } else {
          setPref($data_dir, $username, 'folder_prefix', '');