haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

[html email] added html email for grp_add_member, notice, activate; improved subjects & content of all emails; use service_url

Browse Source
This commit is contained in:
llj
2014-02-18 20:16:39 +08:00
parent 9f67f09ee5
commit 69da4a3d51
17 changed files with 143 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
seahub/views/sysadmin.py
View File

@@ -33,7 +33,7 @@ from seahub.share.models import FileShare
import seahub.settings as settings
from seahub.settings import INIT_PASSWD, \
SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER, SEND_EMAIL_ON_RESETTING_USER_PASSWD
from seahub.utils import get_site_scheme_and_netloc
from seahub.utils import get_site_scheme_and_netloc, get_service_url
logger = logging.getLogger(__name__)
@@ -407,20 +407,21 @@ def user_deactivate(request, user_id):
def email_user_on_activation(user):
"""Send an email to user when admin activate his/her account.
"""
ctx_dict = {
"site_name": settings.SITE_NAME,
"login_url": "%s%s" % (get_site_scheme_and_netloc(),
reverse('auth_login')),
"username": user.email,
service_url = get_service_url()
site_name = settings.SITE_NAME
t = loader.get_template('sysadmin/user_activation_email.html')
c = {
'site_name': site_name,
'media_url': settings.MEDIA_URL,
'logo_path': settings.LOGO_PATH,
'service_url': service_url,
'username': user.email,
}
subject = render_to_string('sysadmin/user_activation_email_subject.txt',
ctx_dict)
# Email subject *must not* contain newlines
subject = ''.join(subject.splitlines())
message = render_to_string('sysadmin/user_activation_email.txt', ctx_dict)
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
msg = EmailMessage(_(u'Your account on s% is activated') % site_name, t.render(Context(c)),
None, [user.email])
msg.content_subtype = "html"
msg.send()
@login_required
@sys_staff_required
@@ -459,22 +460,19 @@ def send_user_reset_email(request, email, password):
Send email when reset user password.
"""
use_https = request.is_secure()
domain = RequestSite(request).domain
service_url = get_service_url()
site_name = settings.SITE_NAME
t = loader.get_template('sysadmin/user_reset_email.html')
c = {
'email': email,
'password': password,
'site_name': settings.SITE_NAME,
'media_url': settings.MEDIA_URL,
'logo_path': settings.LOGO_PATH,
'domain': domain,
'protocol': use_https and 'https' or 'http',
'site_name': site_name,
'media_url': settings.MEDIA_URL,
'logo_path': settings.LOGO_PATH,
'service_url': service_url,
}
msg = EmailMessage(_(u'Password Reset'), t.render(Context(c)),
msg = EmailMessage(_(u'Password has been reset on %s') % site_name, t.render(Context(c)),
None, [email])
msg.content_subtype = "html"
msg.send()
@@ -519,22 +517,21 @@ def user_reset(request, user_id):
def send_user_add_mail(request, email, password):
"""Send email when add new user."""
use_https = request.is_secure()
domain = RequestSite(request).domain
service_url = get_service_url()
site_name = settings.SITE_NAME
t = loader.get_template('sysadmin/user_add_email.html')
c = {
'user': request.user.username,
'org': request.user.org,
'email': email,
'password': password,
'domain': domain,
'protocol': use_https and 'https' or 'http',
'site_name': settings.SITE_NAME,
'service_url': service_url,
'site_name': site_name,
'media_url': settings.MEDIA_URL,
'logo_path': settings.LOGO_PATH,
}
msg = EmailMessage(_(u'Seafile Registration Information'), t.render(Context(c)),
msg = EmailMessage(_(u'You are invited to join %s') % site_name, t.render(Context(c)),
None, [email])
msg.content_subtype = "html"
msg.send()