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

Added simple email format checking

Browse Source
This commit is contained in:
zhengxie
2013-08-02 10:34:04 +08:00
parent d085919541
commit 6865f81b9f
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
seahub/group/views.py
View File

@@ -50,7 +50,7 @@ from seahub.settings import SITE_ROOT, SITE_NAME, MEDIA_URL
from seahub.shortcuts import get_first_object_or_none from seahub.shortcuts import get_first_object_or_none
from seahub.utils import render_error, render_permission_error, string2list, \ from seahub.utils import render_error, render_permission_error, string2list, \
check_and_get_org_by_group, gen_file_get_url, get_file_type_and_ext, \ check_and_get_org_by_group, gen_file_get_url, get_file_type_and_ext, \
get_file_contributors get_file_contributors, is_valid_email
from seahub.utils.file_types import IMAGE from seahub.utils.file_types import IMAGE
from seahub.utils import calc_file_path_hash from seahub.utils import calc_file_path_hash
from seahub.utils.paginator import Paginator from seahub.utils.paginator import Paginator
@@ -526,6 +526,8 @@ def group_manage(request, group_id):
# Add users to contacts. # Add users to contacts.
for email in member_list: for email in member_list:
if not is_valid_email(email):
continue
mail_sended.send(sender=None, user=username, email=email) mail_sended.send(sender=None, user=username, email=email)
mail_sended_list = [] mail_sended_list = []
@@ -541,6 +543,9 @@ def group_manage(request, group_id):
# Can invite unregistered user to group. # Can invite unregistered user to group.
for email in member_list: for email in member_list:
if not is_valid_email(email):
continue
if not is_registered_user(email): if not is_registered_user(email):
use_https = request.is_secure() use_https = request.is_secure()
domain = RequestSite(request).domain domain = RequestSite(request).domain
@@ -573,6 +578,9 @@ def group_manage(request, group_id):
else: else:
# Can only invite registered user to group if not in cloud mode. # Can only invite registered user to group if not in cloud mode.
for email in member_list: for email in member_list:
if not is_valid_email(email):
continue
if not is_registered_user(email): if not is_registered_user(email):
err_msg = _(u'Failed to add, %s is not registerd.') err_msg = _(u'Failed to add, %s is not registerd.')
result['error'] = err_msg % email result['error'] = err_msg % email

6
seahub/utils/__init__.py
View File

@@ -193,6 +193,12 @@ def normalize_file_path(path):
"""Remove '/' at the end of file path if necessary. """Remove '/' at the end of file path if necessary.
""" """
return path.rstrip('/') return path.rstrip('/')
SIMPLE_EMAIL_RE = re.compile(r'^\S+@\S+\.\S+$')
def is_valid_email(email):
"""A simple e-mail format validation.
"""
return True if SIMPLE_EMAIL_RE.match(email) is not None else False
def check_filename_with_rename(repo_id, parent_dir, filename): def check_filename_with_rename(repo_id, parent_dir, filename):
cmmts = get_commits(repo_id, 0, 1) cmmts = get_commits(repo_id, 0, 1)