Bug 483629 - Add BCC to AllAddresses term in local search; r=bugzilla@standard8.plus.com sr=bienvenu

mail/locales/en-US/chrome/messenger/search-attributes.properties

@@ -47,7 +47,7 @@
 40=reserved for AB
 41=reserved for AB
 42=reserved for AB
-43=From, To or CC
+43=From, To, CC or BCC
 44=Junk Score Origin
 45=Junk Percent
 46=Attachment Status

mailnews/base/search/src/nsMsgLocalSearch.cpp

@@ -499,16 +499,22 @@ nsresult nsMsgSearchOfflineMail::ProcessSearchTerm(nsIMsgDBHdr *msgToMatch,
         PRBool boolKeepGoing;
         aTerm->GetMatchAllBeforeDeciding(&boolKeepGoing);
         msgToMatch->GetRecipients(getter_Copies(recipients));
-        err = aTerm->MatchRfc822String (recipients.get(), charset, charsetOverride, &result);
+        err = aTerm->MatchRfc822String(recipients.get(), charset, charsetOverride, &result);
         if (boolKeepGoing == result)
         {
           msgToMatch->GetCcList(getter_Copies(ccList));
-          err = aTerm->MatchRfc822String (ccList.get(), charset, charsetOverride, &result);
+          err = aTerm->MatchRfc822String(ccList.get(), charset, charsetOverride, &result);
         }
         if (boolKeepGoing == result)
         {
           msgToMatch->GetAuthor(getter_Copies(matchString));
-          err = aTerm->MatchRfc822String (matchString.get(), charset, charsetOverride, &result);
+          err = aTerm->MatchRfc822String(matchString.get(), charset, charsetOverride, &result);
+        }
+        if (boolKeepGoing == result)
+        {
+          nsCString bccList;
+          msgToMatch->GetBccList(getter_Copies(bccList));
+          err = aTerm->MatchRfc822String(bccList.get(), charset, charsetOverride, &result);
         }
         break;
       }

mailnews/base/test/unit/test_searchAddressInAb.js

@@ -73,17 +73,18 @@ const Keywords = nsMsgSearchAttrib.Keywords; // control entry that is not enable
  * Test emails may also include the address "invalid@example.com"
  *
  *
- * Map of test email contents: (P is "Prim...", I is "inva.." address)
+ * Map of test email contents: (P is "Prim...", I is "inva.." address, N is none)
  *
- *  Email      From       To      CC
- *    1         P         I       I
- *    2         P         P       P
- *    3         I         P       I
- *    4         I         I       P
- *    5         P         I       P
- *    6         I         I,P     P,I
- *    7         I         I       I
- *    8         I         P       P
+ *
+ *  Email      From       To      CC    BCC
+ *    1         P         I       I     N
+ *    2         P         P       P     N
+ *    3         I         P       I     N
+ *    4         I         I       P     N
+ *    5         P         I       P     N
+ *    6         I         I,P     P,I   N
+ *    7         I         I       I     P
+ *    8         I         P       P     N
  *
  */
  
@@ -104,7 +105,7 @@ var Tests =
   { value: ABUri,
     attrib: AllAddresses,
     op: IsInAB,
-    count: 7 },
+    count: 8 },
   { value: ABUri,
     attrib: CCopy,
     op: IsInAB,

mailnews/test/data/bugmail7

@@ -30,6 +30,7 @@ Message-Id: <bugmail7.m47LtAEf007542@mrapp51.mozilla.org>
 From: invalid@example.com
 To: invalid@example.com
 Cc: invalid@example.com
+Bcc: PrimaryEmail1@test.invalid
 Subject: [Bug 397009] A filter will let me tag, but not untag
 X-Bugzilla-Reason: None
 X-Bugzilla-Type: newchanged

suite/locales/en-US/chrome/mailnews/search-attributes.properties

@@ -47,7 +47,7 @@
 40=reserved for AB
 41=reserved for AB
 42=reserved for AB
-43=From, To or CC
+43=From, To, CC or BCC
 44=Junk Score Origin
 45=Junk Percent
 46=Attachment Status