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

moved email_debug_message to gmg/tools/mail

Browse Source
This commit is contained in:
Rodney Ewing 2013-05-24 12:48:29 -07:00 committed by Elrond
parent 97aebda7de
commit 02b6892c29
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/auth/views.py
View File

@ -21,24 +21,13 @@ from mediagoblin import messages, mg_globals
from mediagoblin.db.models import User from mediagoblin.db.models import User
from mediagoblin.tools.response import render_to_response, redirect, render_404 from mediagoblin.tools.response import render_to_response, redirect, render_404
from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.mail import email_debug_message
from mediagoblin.auth import lib as auth_lib from mediagoblin.auth import lib as auth_lib
from mediagoblin.auth import forms as auth_forms from mediagoblin.auth import forms as auth_forms
from mediagoblin.auth.lib import send_fp_verification_email from mediagoblin.auth.lib import send_fp_verification_email
from mediagoblin.auth.tools import send_verification_email from mediagoblin.auth.tools import send_verification_email
from sqlalchemy import or_ from sqlalchemy import or_
def email_debug_message(request):
"""
If the server is running in email debug mode (which is
the current default), give a debug message to the user
so that they have an idea where to find their email.
"""
if mg_globals.app_config['email_debug_mode']:
# DEBUG message, no need to translate
messages.add_message(request, messages.DEBUG,
u"This instance is running in email debug mode. "
u"The email will be on the console of the server process.")
def register(request): def register(request):
"""The registration view. """The registration view.

15
mediagoblin/tools/mail.py
View File

@ -16,7 +16,7 @@
import smtplib import smtplib
from email.MIMEText import MIMEText from email.MIMEText import MIMEText
from mediagoblin import mg_globals from mediagoblin import mg_globals, messages
from mediagoblin.tools import common from mediagoblin.tools import common
### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -135,3 +135,16 @@ def normalize_email(email):
return None return None
email = "@".join((em_user, em_dom.lower())) email = "@".join((em_user, em_dom.lower()))
return email return email
def email_debug_message(request):
"""
If the server is running in email debug mode (which is
the current default), give a debug message to the user
so that they have an idea where to find their email.
"""
if mg_globals.app_config['email_debug_mode']:
# DEBUG message, no need to translate
messages.add_message(request, messages.DEBUG,
u"This instance is running in email debug mode. "
u"The email will be on the console of the server process.")