nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set default paths in auth_page module to begin with server_dir.

Browse Source
This commit is contained in:
James Valleroy 2013-11-16 13:21:27 -05:00
parent 42ab442930
commit 880e9bd76a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/installed/lib/auth_page.py
View File

@ -16,7 +16,7 @@ class AuthController(PagePlugin):
def on_logout(self, username): def on_logout(self, username):
"""Called on logout""" """Called on logout"""
def get_loginform(self, username, msg='', from_page="/"): def get_loginform(self, username, msg='', from_page=cfg.server_dir+"/"):
form = Form(title="Login", action=cfg.server_dir + "/auth/login", message=msg) form = Form(title="Login", action=cfg.server_dir + "/auth/login", message=msg)
form.text_input(name="from_page", value=from_page, type="hidden") form.text_input(name="from_page", value=from_page, type="hidden")
form.text_input("Username", name="username", value=username) form.text_input("Username", name="username", value=username)
@ -26,7 +26,7 @@ class AuthController(PagePlugin):
return self.fill_template(main=form.render(), sidebar_right=" ") return self.fill_template(main=form.render(), sidebar_right=" ")
@cherrypy.expose @cherrypy.expose
def login(self, username=None, passphrase=None, from_page="/", **kwargs): def login(self, username=None, passphrase=None, from_page=cfg.server_dir+"/", **kwargs):
if username is None or passphrase is None: if username is None or passphrase is None:
return self.get_loginform("", from_page=from_page) return self.get_loginform("", from_page=from_page)
@ -39,7 +39,7 @@ class AuthController(PagePlugin):
raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/")) raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/"))
@cherrypy.expose @cherrypy.expose
def logout(self, from_page="/"): def logout(self, from_page=cfg.server_dir+"/"):
sess = cherrypy.session sess = cherrypy.session
username = sess.get(cfg.session_key, None) username = sess.get(cfg.session_key, None)
sess[cfg.session_key] = None sess[cfg.session_key] = None