Ticket #219: email_default_domain.diff

email2trac.py.in

@@ -220 +220 @@
                         self.parameters.subject_field_separator = self.parameters.subject_field_separator.strip()
 
                 self.trac_smtp_from = self.get_config('notification', 'smtp_from')
+                
+                self.email_default_domain = self.parameters.email_default_domain
 
                 self.system = None
 
@@ -336 +338 @@
                 #   n : Name that the user has set in the settings tab
                 #   e : email address that the user has set in the settings tab 
                 #
+
+                domain=None
+
+                if self.email_default_domain and self.email_default_domain != '':
+                        domain = "@" + self.email_default_domain.lower()
+
                 users = [ (u,n,e) for (u, n, e) in self.env.get_known_users(self.db)
-                        if e and (e.lower() == self.email_addr.lower()) ]
+                          if ((e and (e.lower() == self.email_addr.lower())) or
+                           (domain and (u + domain == self.email_addr.lower()))) ]
 
                 if len(users) == 1:
                         self.email_from = users[0][0]