diff --git a/app.py b/app.py index 97e852f..5e020f3 100644 --- a/app.py +++ b/app.py @@ -113,9 +113,9 @@ def post_user(): return index_tpl(alerts=[('error', msg, 'fadeOut')], str=i18n.str) if len(form('username')) < 3: - return error(i18n.msg[1]) + return error(i18n.msg[2]) elif not tools.input_validation(form('username')): - return error(i18n.msg[6]) + return error(i18n.msg[3]) if not tools.pwd_validation(form('password')): return error(i18n.msg[21]) @@ -126,7 +126,7 @@ def post_user(): LOG.warning("Unsuccessful attempt to login %s: %s" % (form('username'), e)) return error(str(e)) - return user_tpl(alerts=[('success', '%s %s' % (i18n.msg[3], form('username').capitalize()), 'fadeOut' )], data=newSession().get(), str=i18n.str) + return user_tpl(alerts=[('success', '%s %s' % (i18n.msg[1], form('username').capitalize()), 'fadeOut' )], data=newSession().get(), str=i18n.str) @post('/signup') def post_signup(): @@ -152,14 +152,14 @@ def post_signup(): return signup_tpl(alerts=[('error', msg, 'fadeOut')], str=i18n.str) if not tools.code_is_valid(form('invite_code'), db): - return(error(i18n.msg[4])) + return(error(i18n.msg[6])) if len(form('username')) < 3: - return error(i18n.msg[5]) + return error(i18n.msg[2]) username = form('username').lower() if not tools.input_validation(username): - return error(i18n.msg[6]) + return error(i18n.msg[3]) if len(form('firstname')) == 0: firstname = auto_complete('firstname') @@ -175,7 +175,7 @@ def post_signup(): email = form('email').lower() if not tools.email_validation(email): - return error(i18n.msg[14]) + return error(i18n.msg[15]) if not tools.pwd_validation(form('password')): return error(i18n.msg[8]) #mezua ALDATU egin behar da @@ -216,12 +216,12 @@ def post_edit_fullname(): if len(form('firstname')) < 3: return error(i18n.msg[11]) elif not tools.input_validation(form('firstname')): - return error(i18n.msg[6]) #Not allowed characters for the firstname field. ALDATU + return error(i18n.msg[4]) if len(form('surname')) < 3: return error(i18n.msg[12]) elif not tools.input_validation(form('surname')): - return error(i18n.msg[6]) #Not allowed characters for the surname field. ALDATU + return error(i18n.msg[5]) try: edit_fullname(username, old_firstname, old_surname, form('firstname').lower(), form('surname').lower()) @@ -269,7 +269,9 @@ def post_change_pwd(): def error(msg): return change_pwd_tpl(username=username, alerts=[('error', msg, 'fadeOut')], str=i18n.str) - if (not tools.pwd_validation(form('new-password')) or not tools.pwd_validation(form('confirm-password'))): + if not tools.pwd_validation(form('old-password')): + return error(i18n.msg[26]) + elif (not tools.pwd_validation(form('new-password')) or not tools.pwd_validation(form('confirm-password'))): return error(i18n.msg[8]) #mezua aldatu egin behar da elif form('new-password') != form('confirm-password'): return error(i18n.msg[7]) @@ -369,7 +371,7 @@ def login_user(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) @@ -417,7 +419,7 @@ def logout_user(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) @@ -543,7 +545,7 @@ def new_fullname(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) @@ -606,7 +608,7 @@ def new_email_address(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) @@ -664,7 +666,7 @@ def change_password(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) @@ -714,7 +716,7 @@ def del_account(conf, *args): except LDAPSocketOpenError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) - raise Error(i18n.msg[22]) + raise Error(i18n.msg[23]) except LDAPExceptionError as e: LOG.error('{}: {!s}'.format(e.__class__.__name__, e)) diff --git a/data/invite-codes.db b/data/invite-codes.db index b718294..a3c0af1 100644 Binary files a/data/invite-codes.db and b/data/invite-codes.db differ diff --git a/edit_email.tpl b/edit_email.tpl index 458a604..84ec1f6 100644 --- a/edit_email.tpl +++ b/edit_email.tpl @@ -18,7 +18,7 @@