RenderWrapper with parameters

This commit is contained in:
shortcutme 2017-05-11 17:59:12 +02:00
parent b5d3995874
commit 545459be88
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -248,7 +248,7 @@ class UiRequest(object):
address = re.sub("/.*", "", path.lstrip("/")) address = re.sub("/.*", "", path.lstrip("/"))
if self.isProxyRequest() and (not path or "/" in path[1:]): if self.isProxyRequest() and (not path or "/" in path[1:]):
file_url = re.sub(".*/", "", inner_path) file_url = re.sub("^.*?/", "", inner_path)
if self.env["HTTP_HOST"] == "zero": if self.env["HTTP_HOST"] == "zero":
root_url = "/" + address + "/" root_url = "/" + address + "/"
else: else:
@ -268,6 +268,8 @@ class UiRequest(object):
if self.env.get("QUERY_STRING"): if self.env.get("QUERY_STRING"):
query_string = "?%s&wrapper_nonce=%s" % (self.env["QUERY_STRING"], wrapper_nonce) query_string = "?%s&wrapper_nonce=%s" % (self.env["QUERY_STRING"], wrapper_nonce)
elif "?" in inner_path:
query_string = "&wrapper_nonce=%s" % wrapper_nonce
else: else:
query_string = "?wrapper_nonce=%s" % wrapper_nonce query_string = "?wrapper_nonce=%s" % wrapper_nonce