mirror of
https://github.com/evilhero/mylar
synced 2025-02-23 06:20:31 +00:00
FIX: one more attempt at forms login + from_page
This commit is contained in:
parent
74dca7d696
commit
edbed3b106
1 changed files with 3 additions and 0 deletions
|
@ -25,6 +25,7 @@ from cherrypy.lib.static import serve_file
|
||||||
from cgi import escape
|
from cgi import escape
|
||||||
#from datetime import datetime, timedelta
|
#from datetime import datetime, timedelta
|
||||||
import urllib
|
import urllib
|
||||||
|
import re
|
||||||
import mylar
|
import mylar
|
||||||
from mylar import logger
|
from mylar import logger
|
||||||
|
|
||||||
|
@ -138,6 +139,8 @@ class AuthController(object):
|
||||||
else:
|
else:
|
||||||
if from_page != "/":
|
if from_page != "/":
|
||||||
from_page = from_page
|
from_page = from_page
|
||||||
|
if mylar.CONFIG.HTTP_ROOT != "/":
|
||||||
|
from_page = re.sub(mylar.CONFIG.HTTP_ROOT, '', from_page,1).strip()
|
||||||
cherrypy.session.regenerate()
|
cherrypy.session.regenerate()
|
||||||
cherrypy.session[SESSION_KEY] = cherrypy.request.login = current_username
|
cherrypy.session[SESSION_KEY] = cherrypy.request.login = current_username
|
||||||
#expiry = datetime.now() + (timedelta(days=30) if remember_me == '1' else timedelta(minutes=60))
|
#expiry = datetime.now() + (timedelta(days=30) if remember_me == '1' else timedelta(minutes=60))
|
||||||
|
|
Loading…
Reference in a new issue