Module: check_mk
Branch: master
Commit: fc305c595a42eac549494e39413770631278c974
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc305c595a42ea…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 16 10:56:13 2012 +0100
FIX: Fixed wrong redirection after login in some cases
---
ChangeLog | 1 +
web/htdocs/login.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a88883a..9377a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
commands are possible
* The login mask honors the default_language definition now
* check_bi_local.py: works now with cookie based authentication
+ * FIX: Fixed wrong redirection after login in some cases
1.1.13i3:
Core, Setup, etc.:
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index f3176e7..f36aa5c 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -173,7 +173,7 @@ def do_login():
# Use redirects for URLs or simply execute other handlers for
# mulitsite modules
- if '/' in origtarget:
+ if '/' in origtarget or '?' in origtarget:
html.set_http_header('Location', origtarget)
raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY
else:
@@ -221,7 +221,7 @@ def normal_login_page():
origtarget = html.var('_origtarget', '')
if not origtarget and not html.req.myfile == 'login':
- origtarget = html.req.uri
+ origtarget = html.makeuri([])
html.write("<div id=login>")
html.write("<div id=logo></div>")