Made the option to keep your address in the CC when you hit Reply All

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

diff --git a/src/options.php b/src/options.php
index 3e079ebe437aacdae2673305c9035bc23dd33a94..905252176209b3c4e3b8eddb4891d2fdff259bdf 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -87,6 +87,10 @@
          setPref($data_dir, $username, 'show_html_default', 1);
       else
          removePref($data_dir, $username, 'show_html_default');
          setPref($data_dir, $username, 'show_html_default', 1);
       else
          removePref($data_dir, $username, 'show_html_default');

+      if (isset($includeselfreplyall))
+         setPref($data_dir, $username, 'include_self_reply_all', 1);
+      else
+         removePref($data_dir, $username, 'include_self_reply_all');

     
       do_hook('options_display_save');
 
     
       do_hook('options_display_save');
 

diff --git a/src/options_display.php b/src/options_display.php
index 88b8c265083c316dd7b9850fcc0633d0d56e386e..0882b7ef16b9c0cac7627ac1973d21cf5050ddba 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -234,6 +234,20 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
                  ?>
             </td>
          </tr>
                  ?>
             </td>
          </tr>

+         <tr>
+            <td align=right>
+               <?php echo _("Include Self"); ?>:
+            </td>
+            <td>
+               <input type=checkbox name=includeselfreplyall <?php 
+              if (getPref($data_dir, $username, 'include_self_reply_all')
+                  != '')
+              echo " checked"; ?>>
+                <?php 
+echo _("Don't remove me from the CC addresses when I use \"Reply All\"");
+                 ?>
+            </td>
+         </tr>

          <?php do_hook('options_display_inside'); ?>
          <tr>
             <td>&nbsp;
          <?php do_hook('options_display_inside'); ?>
          <tr>
             <td>&nbsp;

diff --git a/src/read_body.php b/src/read_body.php
index 28733de08ed9055196ef583c9a9d064b04049c01..5010dd15730d20773d766a0ae2411066c63d52cd 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -190,18 +190,22 @@
    }
    
    // 6) Remove our identities from the CC list (they still can be in the
    }
    
    // 6) Remove our identities from the CC list (they still can be in the

-   // TO list)
-   RemoveAddress($url_replytoall_extra_addrs, getPref($data_dir, $username,
-                                                      'email_address'));
-   $idents = getPref($data_dir, $username, 'identities');
-   if ($idents != '' && $idents > 1)
+   // TO list) only if $include_self_reply_all isn't set or it is ''.
+   if (getPref($data_dir, $username, 'include_self_reply_all') == '')

    {
    {

-       for ($i = 1; $i < $idents; $i ++)
+       RemoveAddress($url_replytoall_extra_addrs, 
+                     getPref($data_dir, $username, 'email_address'));
+       $idents = getPref($data_dir, $username, 'identities');
+       if ($idents != '' && $idents > 1)

        {
        {

-           RemoveAddress($url_replytoall_extra_addrs, 
-                        getPref($data_dir, $username, 'email_address' . $i));
+           for ($i = 1; $i < $idents; $i ++)
+           {
+               RemoveAddress($url_replytoall_extra_addrs, 
+                            getPref($data_dir, $username, 'email_address' .
+                                    $i));
+           }

        }
        }

-   }
+   } 

    
    // 7) Smoosh back into one nice line
    $url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs);
    
    // 7) Smoosh back into one nice line
    $url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs);