summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--default_settings.py3
-rw-r--r--utils.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/default_settings.py b/default_settings.py
index c3a7db8..45491fa 100644
--- a/default_settings.py
+++ b/default_settings.py
@@ -7,8 +7,7 @@ SECRET_KEY = 'remember to change this to something more random and secret'
# CHANGE THIS! (e.g. os.urandom(32) )
PASSWORD_ENCRYPTION_KEY = '.\x14\xa7\x1b\xa2:\x1b\xb7\xbck\x1bD w\xab\x87a\xb4\xb7\xca\xf1\x06\xb0\x9f?q\x13\x05\x8dY\xe5<'
-MAIL_DEFAULT_SENDER = 'noreply@spline.de'
-MAIL_CONFIRM_SENDER = 'spline accounts <noreply@accounts.spline.de>'
+MAIL_DEFAULT_SENDER = 'spline accounts <noreply@accounts.spline.de>'
MAIL_REGISTER_NOTIFY = None
SENDMAIL_COMMAND = '/usr/sbin/sendmail'
diff --git a/utils.py b/utils.py
index 8397344..ca0fb16 100644
--- a/utils.py
+++ b/utils.py
@@ -20,7 +20,7 @@ from wtforms.validators import Regexp
-_username_re = re.compile(r'^[a-zA-Z][a-zA-Z0-9-]{1,15}')
+_username_re = re.compile(r'^[a-zA-Z][a-zA-Z0-9-]{1,15}$')
_username_exclude_re = re.compile(r'^(admin|root)')
# using http://flask.pocoo.org/docs/patterns/viewdecorators/