From 6a45836ed54934e418a3457d26c37e8c71dbdb1b Mon Sep 17 00:00:00 2001 From: evilhero Date: Wed, 21 Feb 2018 14:54:29 -0500 Subject: [PATCH] FIX: just trying to clean up the login stuff...again --- data/interfaces/default/login.html | 2 +- mylar/auth.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/interfaces/default/login.html b/data/interfaces/default/login.html index 1d365c70..3b9adbef 100755 --- a/data/interfaces/default/login.html +++ b/data/interfaces/default/login.html @@ -15,7 +15,7 @@
- +
diff --git a/mylar/auth.py b/mylar/auth.py index 5013fc1f..8742a378 100755 --- a/mylar/auth.py +++ b/mylar/auth.py @@ -137,14 +137,14 @@ class AuthController(object): if error_msg: return self.get_loginform(current_username, error_msg, from_page) else: - if all([from_page != "/", from_page != "//"]): - from_page = from_page - if mylar.OS_DETECT == 'Windows': - if mylar.CONFIG.HTTP_ROOT != "//": - from_page = re.sub(mylar.CONFIG.HTTP_ROOT, '', from_page,1).strip() - else: - if mylar.CONFIG.HTTP_ROOT != "/": - from_page = re.sub(mylar.CONFIG.HTTP_ROOT, '', from_page,1).strip() + #if all([from_page != "/", from_page != "//"]): + # from_page = from_page + #if mylar.OS_DETECT == 'Windows': + # if mylar.CONFIG.HTTP_ROOT != "//": + # from_page = re.sub(mylar.CONFIG.HTTP_ROOT, '', from_page,1).strip() + #else: + # #if mylar.CONFIG.HTTP_ROOT != "/": + # from_page = re.sub(mylar.CONFIG.HTTP_ROOT, '', from_page,1).strip() cherrypy.session.regenerate() cherrypy.session[SESSION_KEY] = cherrypy.request.login = current_username #expiry = datetime.now() + (timedelta(days=30) if remember_me == '1' else timedelta(minutes=60))