[Rt-commit] [svn] r1646 - in rt/branches/3.2-RELEASE: . lib/RT/Interface

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Sat Oct  9 11:49:02 2004
New Revision: 1646

Modified:
   rt/branches/3.2-RELEASE/   (props changed)
   rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
Log:
 r1986 at tinbook:  jesse | 2004-10-09T15:46:31.356812Z
 RT-Ticket: 6174
 RT-Status: resolved
 RT-Update: correspond
 
 * Additional bullet-proofing for a number of email-address handling regexps
 


Modified: rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.2-RELEASE/lib/RT/Interface/Email.pm	Sat Oct  9 11:49:02 2004
@@ -139,8 +139,8 @@
 
     my ($From, $junk) = ParseSenderAddressFromHead($head);
     
-    if (($From =~ /^mailer-daemon/i) or
-	($From =~ /^postmaster/i)){
+    if (($From =~ /^mailer-daemon\@/i) or
+	($From =~ /^postmaster\@/i)){
 	return (1);
 	
     }
@@ -296,9 +296,9 @@
     foreach my $AddrObj (@ToObjs, @CcObjs) {
 	my $Address = $AddrObj->address;
 	$Address = $args{'CurrentUser'}->UserObj->CanonicalizeEmailAddress($Address);
- 	next if ($args{'CurrentUser'}->EmailAddress =~ /^$Address$/i);
-	next if ($args{'QueueObj'}->CorrespondAddress =~ /^$Address$/i);
-	next if ($args{'QueueObj'}->CommentAddress =~ /^$Address$/i);
+ 	next if ($args{'CurrentUser'}->EmailAddress =~ /^\Q$Address\E$/i);
+	next if ($args{'QueueObj'}->CorrespondAddress =~ /^\Q$Address\E$/i);
+	next if ($args{'QueueObj'}->CommentAddress =~ /^\Q$Address\E$/i);
 	next if (RT::EmailParser::IsRTAddress(undef, $Address));
 	
 	push (@Addresses, $Address);