From 880e9bd76a393c496b7d6b36348ebdfcc4f35555 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 16 Nov 2013 13:21:27 -0500 Subject: [PATCH] Set default paths in auth_page module to begin with server_dir. --- modules/installed/lib/auth_page.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/installed/lib/auth_page.py b/modules/installed/lib/auth_page.py index 3f3574c6a..49d7a8de4 100644 --- a/modules/installed/lib/auth_page.py +++ b/modules/installed/lib/auth_page.py @@ -16,7 +16,7 @@ class AuthController(PagePlugin): def on_logout(self, username): """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.text_input(name="from_page", value=from_page, type="hidden") form.text_input("Username", name="username", value=username) @@ -26,7 +26,7 @@ class AuthController(PagePlugin): return self.fill_template(main=form.render(), sidebar_right=" ") @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: return self.get_loginform("", from_page=from_page) @@ -39,7 +39,7 @@ class AuthController(PagePlugin): raise cherrypy.HTTPRedirect(from_page or (cfg.server_dir + "/")) @cherrypy.expose - def logout(self, from_page="/"): + def logout(self, from_page=cfg.server_dir+"/"): sess = cherrypy.session username = sess.get(cfg.session_key, None) sess[cfg.session_key] = None