opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-31 02:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pep8/spacing

Browse Source
This commit is contained in:
Dannon Baker
2014-05-22 19:31:34 -04:00
parent 035de6882f
commit 94ef41e180
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/security/validate_user_input.py
+5 -1
View File
@@ -6,6 +6,7 @@ VALID_PUBLICNAME_SUB = re.compile( "[^a-z0-9\-]" )
VALID_EMAIL_RE = re.compile( "[^@]+@[^@]+\.[^@]+" )
FILL_CHAR = '-'
def validate_email( trans, email, user=None, check_dup=True ):
"""
Validates the email format, also checks whether the domain is blacklisted in the disposable domains configuration.
@@ -25,6 +26,7 @@ def validate_email( trans, email, user=None, check_dup=True ):
message = "Please enter your permanent email address."
return message
def validate_publicname( trans, publicname, user=None ):
# User names must be at least four characters in length and contain only lower-case
# letters, numbers, and the '-' character.
@@ -44,10 +46,11 @@ def validate_publicname( trans, publicname, user=None ):
return "Public name is taken; please choose another"
return ''
def transform_publicname( trans, publicname, user=None ):
# User names must be at least four characters in length and contain only lower-case
# letters, numbers, and the '-' character.
#TODO: Enhance to allow generation of semi-random publicnnames e.g., when valid but taken
# TODO: Enhance to allow generation of semi-random publicnnames e.g., when valid but taken
if user and user.username == publicname:
return publicname
elif publicname not in [ 'None', None, '' ]:
@@ -58,6 +61,7 @@ def transform_publicname( trans, publicname, user=None ):
return publicname
return ''
def validate_password( trans, password, confirm ):
if len( password ) < 6:
return "Use a password of at least 6 characters"