heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added SMTP configuration options

Browse Source
This commit is contained in:
Joar Wandborg 2011-08-07 01:22:31 +02:00
parent f40d79714a
commit 47364ead6b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/config_spec.ini
View File

@ -20,6 +20,10 @@ direct_remote_path = string(default="/mgoblin_static/")
# set to false to enable sending notices # set to false to enable sending notices
email_debug_mode = boolean(default=True) email_debug_mode = boolean(default=True)
email_sender_address = string(default="notice@mediagoblin.example.org") email_sender_address = string(default="notice@mediagoblin.example.org")
email_smtp_host = string(default=None)
email_smtp_port = integer(default=25)
email_smtp_user = string(default=None)
email_smtp_pass = string(default=None)
# Set to false to disable registrations # Set to false to disable registrations
allow_registration = boolean(default=True) allow_registration = boolean(default=True)

14
mediagoblin/util.py
View File

@ -240,6 +240,9 @@ class FakeMhost(object):
def connect(self): def connect(self):
pass pass
def login(self):
pass
def sendmail(self, from_addr, to_addrs, message): def sendmail(self, from_addr, to_addrs, message):
EMAIL_TEST_MBOX_INBOX.append( EMAIL_TEST_MBOX_INBOX.append(
{'from': from_addr, {'from': from_addr,
@ -267,13 +270,20 @@ def send_email(from_addr, to_addrs, subject, message_body):
- subject: subject of the email - subject: subject of the email
- message_body: email body text - message_body: email body text
""" """
# TODO: make a mock mhost if testing is enabled
if TESTS_ENABLED or mg_globals.app_config['email_debug_mode']: if TESTS_ENABLED or mg_globals.app_config['email_debug_mode']:
mhost = FakeMhost() mhost = FakeMhost()
elif not mg_globals.app_config['email_debug_mode']: elif not mg_globals.app_config['email_debug_mode']:
if not mg_globals.app_config['email_smtp_host']:
mhost = smtplib.SMTP() mhost = smtplib.SMTP()
else:
mhost = smtplib.SMTP(
mg_globals.app_config['email_smtp_host'],
mg_globals.app_config['email_smtp_port'])
mhost.connect() if mg_globals.app_config['email_smtp_user']:
mhost.login(
mg_globals.app_config['email_smtp_user'],
mg_globals.app_config['email_smtp_pass'])
message = MIMEText(message_body.encode('utf-8'), 'plain', 'utf-8') message = MIMEText(message_body.encode('utf-8'), 'plain', 'utf-8')
message['Subject'] = subject message['Subject'] = subject