Module: check_mk
Branch: master
Commit: f95cc99396aa103f0a6746c3f417034b9d69bfdf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f95cc99396aa10…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sun Mar 25 15:33:53 2018 +0200
Cleaned up duplicated code (Moved request_uri() to requested_url())
Change-Id: Ic7d1041ce6d00126fb12fca142c10eedd0d24f5d
---
web/htdocs/htmllib.py | 18 +++++++++++-------
web/htdocs/sidebar.py | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index f6d7430..f211f6f 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -917,6 +917,7 @@ class RequestHandler(object):
self.uploads = {}
self.var_stash = []
self.cookies = {}
+ self._requested_url = None
# Transaction IDs
self.new_transids = []
@@ -938,6 +939,10 @@ class RequestHandler(object):
raise NotImplementedError()
+ def remote_ip(self):
+ raise NotImplementedError()
+
+
def is_ssl_request(self):
raise NotImplementedError()
@@ -958,6 +963,12 @@ class RequestHandler(object):
raise MKGeneralException("http_redirect not implemented")
+ def requested_url(self):
+ """Returns the URL requested by the user.
+ This is not the bare original URL used by the user. Some HTTP variables may
+ have been filtered by Check_MK while parsing the incoming
request."""
+ return self._requested_url
+
#
# Request Processing
#
@@ -1422,7 +1433,6 @@ class html(HTMLGenerator, RequestHandler):
self.browser_redirect = ''
self.link_target = None
self.keybindings_enabled = True
- self._requested_url = None
self.myfile = None
# Browser options
@@ -1766,12 +1776,6 @@ class html(HTMLGenerator, RequestHandler):
# URL building
#
- def requested_url(self):
- """Returns the URL requested by the user.
- This is not the bare original URL used by the user. Some HTTP variables may
- have been filtered by Check_MK while parsing the incoming
request."""
- return self._requested_url
-
# [('varname1', value1), ('varname2', value2) ]
def makeuri(self, addvars, remove_prefix=None, filename=None, delvars=None):
new_vars = [ nv[0] for nv in addvars ]
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index c72306e..b35807e 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -494,7 +494,7 @@ def ajax_snapin():
except Exception, e:
write_snapin_exception(e)
e_message = _("Exception during snapin refresh (snapin
\'%s\')") % snapname
- logger.error("%s %s: %s" % (html.request_uri(), e_message,
traceback.format_exc()))
+ logger.error("%s %s: %s" % (html.requested_url(), e_message,
traceback.format_exc()))
finally:
snapin_code.append(html.drain())