Ticket #7203: Trac-0.11b2-strip-domain.patch

trac/notification.py

@@ -272 +272 @@
                 return False
             return True
 
+        def strip_domain(address):
+            pos = address.find('@')
+            if pos == -1:
+                return address
+            return address[:pos]
+
         if not is_email(address):
             if address == 'anonymous':
                 return None
@@ -282 +288 @@
                     return address
                 domain = self.config.get('notification', 'smtp_default_domain')
                 if domain:
-                    address = "%s@%s" % (address, domain)
+                    address = "%s@%s" % (strip_domain(address), domain)
                 else:
                     self.env.log.info("Email address w/o domain: %s" % address)
                     return None