Moved reply citation stuff to personal options.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1510 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/options.php b/src/options.php
index 7516d1bb98193966cc3004cf7ff52add3b60f41e..97dfd2ad868e10dc509daa12591e4f54f332baa2 100644 (file)
--- 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');
       
@@ -75,9 +84,6 @@
       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, '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);
       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);

diff --git a/src/options_display.php b/src/options_display.php
index b99ecb092199112156368675b249b407f152f448..d32d67496d6d098bbcbb73d0b3af91b29867b2b2 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -110,35 +110,6 @@
 ?>
             </td>
          </tr>
-         <tr>
-            <td align="right" nowrap><?PHP echo _("Reply Citation Style") ?>:</td>
-            <td><select name="new_reply_citation_style">
-                <option value="none"<?PHP
-                    if ($reply_citation_style == 'none') echo ' SELECTED';
-                    ?>>- <?PHP echo _("No Citation"); ?> -</option>
-                <option value="author_said"<?PHP
-                    if ($reply_citation_style == 'author_said') echo ' SELECTED';
-                    ?>><?PHP echo _("AUTHOR Said"); ?></option>
-                <option value="quote_who"<?PHP
-                    if ($reply_citation_style == 'quote_who') echo ' SELECTED';
-                    ?>><?PHP echo _("Quote Who XML"); ?></option>
-                <option value="user-defined"<?PHP
-                    if ($reply_citation_style == 'user-defined') echo ' SELECTED';
-                    ?>><?PHP echo _("User-Defined"); ?></option>
-                </select>
-            </td>
-         </tr>
-         <tr>
-            <td align="right" nowrap><?php echo _("User-Defined Reply Citation"); ?>:</td>
-            <td>
-               <tt><input type="text" size="15" name="new_reply_citation_start" value="<?php
-                  echo $reply_citation_start;
-               ?>"></tt> &lt;<?PHP echo _("Author's Name"); ?>&gt;
-               <tt><input type="text" size="15" name="new_reply_citation_end" value="<?php
-                  echo $reply_citation_end;
-               ?>"></tt>
-            </td>
-         </tr>
          <tr>
             <td align="right" nowrap><?PHP echo _("Location of buttons when composing") ?>:</td>
             <td><select name="button_new_location">

diff --git a/src/options_personal.php b/src/options_personal.php
index e80f6934f2fc1b3d7fa7a72c5e2f9ac84cc06143..c4c8e039e0981fc5c75e04c494d6c1e199ef5a51 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -52,6 +52,37 @@
                <input size=50 type=text value="<?php echo $replyto ?>" name=reply_to> 
             </td>
          </tr>
+         <tr>
+            <td align="right" nowrap><?PHP echo _("Reply Citation Style") ?>:</td>
+            <td><select name="new_reply_citation_style">
+                <option value="none"<?PHP
+                    if ($reply_citation_style == 'none') echo ' SELECTED';
+                    ?>>- <?PHP echo _("No Citation"); ?> -</option>
+                <option value="author_said"<?PHP
+                    if ($reply_citation_style == 'author_said') echo ' SELECTED';
+                    ?>><?PHP echo _("AUTHOR Said"); ?></option>
+                <option value="quote_who"<?PHP
+                    if ($reply_citation_style == 'quote_who') echo ' SELECTED';
+                    ?>><?PHP echo _("Quote Who XML"); ?></option>
+                <option value="user-defined"<?PHP
+                    if ($reply_citation_style == 'user-defined') echo ' SELECTED';
+                    ?>><?PHP echo _("User-Defined"); ?></option>
+                </select>
+            </td>
+         </tr>
+         <tr>
+            <td align="right" nowrap><?php echo _("User-Defined Reply Citation"); ?>:</td>
+            <td>
+               <tt><input type="text" size="20" name="new_reply_citation_start" value="<?php
+                  echo $reply_citation_start;
+               ?>"></tt> &lt;<?php
+                  echo _("Author's Name");
+               ?>&gt;
+               <tt><input type="text" size="20" name="new_reply_citation_end" value="<?php
+                  echo $reply_citation_end;
+               ?>"></tt>
+            </td>
+         </tr>
         <tr>
            <td align=right nowrap><?PHP echo _("Multiple Identities"); ?>:
            </td><td>