haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00
Code Issues Releases Wiki Activity

Fix activate request email not sent bug on registration, and apply to shibboleth login

Browse Source
This commit is contained in:
zhengxie
2016-03-24 15:07:19 +08:00
parent 7e1fad59aa
commit 42c90bda2e
5 changed files with 154 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
thirdpart/registration/models.py
View File

@@ -302,6 +302,29 @@ from constance import config
# Get an instance of a logger
logger = logging.getLogger(__name__)
def notify_admins_on_activate_request(reg_email):
ctx_dict = {
"site_name": settings.SITE_NAME,
"user_search_link": "%s%s?email=%s" % (
get_site_scheme_and_netloc(), reverse("user_search"),
urlquote(reg_email)),
}
subject = render_to_string('registration/activate_request_email_subject.txt',
ctx_dict)
# Email subject *must not* contain newlines
subject = ''.join(subject.splitlines())
message = render_to_string('registration/activate_request_email.txt',
ctx_dict)
admins = User.objects.get_superusers()
for admin in admins:
try:
admin.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
except Exception as e:
logger.error(e)
@receiver(user_registered)
def email_admin_on_registration(sender, **kwargs):
"""Send an email notification to admin when a newly registered user need
@@ -310,28 +333,7 @@ def email_admin_on_registration(sender, **kwargs):
This email will be sent when both ``ACTIVATE_AFTER_REGISTRATION`` and
``REGISTRATION_SEND_MAIL`` are set to False.
"""
if config.ACTIVATE_AFTER_REGISTRATION is False and \
config.REGISTRATION_SEND_MAIL is False:
if bool(config.ACTIVATE_AFTER_REGISTRATION) is False and \
bool(config.REGISTRATION_SEND_MAIL) is False:
reg_email = kwargs['user'].email
ctx_dict = {
"site_name": settings.SITE_NAME,
"user_search_link": "%s%s?email=%s" % (
get_site_scheme_and_netloc(), reverse("user_search"),
urlquote(reg_email)),
}
subject = render_to_string('registration/activate_request_email_subject.txt',
ctx_dict)
# Email subject *must not* contain newlines
subject = ''.join(subject.splitlines())
message = render_to_string('registration/activate_request_email.txt',
ctx_dict)
admins = User.objects.get_superusers()
for admin in admins:
try:
admin.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
except Exception as e:
logger.error(e)
notify_admins_on_activate_request(reg_email)