Ticket #1018: trac.smtp.patch

wiki-default/TracIni

@@ -41 +41 @@
 == [notification] ==
 || smtp_enabled   || Enable SMTP (email) notification (true, false) ||
 || smtp_server    || SMTP server to use for email notifications ||
+|| smtp_port      || Port used to contact smtp server in notication emails ||
 || smtp_from      || Sender address to use in notification emails ||
 || smtp_replyto   || Reply-To address to use in notification emails ||
 || smtp_always_cc || Email address(es) to always send notifications to ||

wiki-default/TracNotification

@@ -18 +18 @@
 These are the available options for the ''[notification]'' section in trac.ini.
  * '''smtp_enabled''': Enable notification.
  * '''smtp_server''': SMTP server used for notification messages.
+ * '''smtp_port''': Port used to contact smtp server in notication emails.
  * '''smtp_from''': Email address to use for ''Sender''-headers in notification emails.
  * '''smtp_replyto''': Email address to use for ''Reply-To''-headers in notification emails.
  * '''smtp_always_cc''': List of email addresses to always send notifications to. ''Typically used to post ticket changes to a dedicated mailing list.''

trac/db_default.py

@@ -438 +438 @@
   ('mimeviewer', 'enscript_path', 'enscript'),
   ('notification', 'smtp_enabled', 'false'),
   ('notification', 'smtp_server', 'localhost'),
+  ('notification', 'smtp_port', '25'),
   ('notification', 'smtp_user', ''),
   ('notification', 'smtp_password', ''),
   ('notification', 'smtp_always_cc', ''),

trac/Notify.py

@@ -79 +79 @@
     """Baseclass for notification by email."""
 
     smtp_server = 'localhost'
+    smtp_port = 25
     from_email = 'trac+tickets@localhost'
     subject = ''
     server = None
@@ -92 +93 @@
         self.smtp_server = self.env.get_config('notification',
                                                'smtp_server',
                                                self.smtp_server)
+        self.smtp_port = self.env.get_config('notification',
+                                             'smtp_port',
+                                              self.smtp_port)
         self.from_email = self.env.get_config('notification',
                                               'smtp_from', '')
         self.replyto_email = self.env.get_config('notification',
@@ -117 +121 @@
         return filter(lambda x: x.find('@') > -1, emails)
 
     def begin_send(self):
-        self.server = smtplib.SMTP(self.smtp_server)
+        self.server = smtplib.SMTP(self.smtp_server,self.smtp_port)
         if self.user_name:
             self.server.login(self.user_name, self.password)