Rev2067, Fix inner_path stripping

HelloZeroNet · May 11, 2017 · d467aab · d467aab
1 parent f4f4aa0
commit d467aab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/plugins/Mute/MutePlugin.py b/plugins/Mute/MutePlugin.py
@@ -146,7 +146,7 @@ def actionWrapper(self, path, extra_headers=None):
                 extra_headers = []
             self.sendHeader(extra_headers=extra_headers[:])
             return iter([super(UiRequestPlugin, self).renderWrapper(
-                site, path, site.address + "//uimedia/plugins/mute/blacklisted.html?address=" + address,
+                site, path, "uimedia/plugins/mute/blacklisted.html?address=" + address,
                 "Blacklisted site", extra_headers, show_loadingscreen=False
             )])
         else:

diff --git a/src/Config.py b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.5.4"
-        self.rev = 2066
+        self.rev = 2067
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"

diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py
@@ -248,10 +248,11 @@ def renderWrapper(self, site, path, inner_path, title, extra_headers, show_loadi
 
         address = re.sub("/.*", "", path.lstrip("/"))
         if self.isProxyRequest() and (not path or "/" in path[1:]):
-            file_url = re.sub("^.*?/", "", inner_path)
             if self.env["HTTP_HOST"] == "zero":
                 root_url = "/" + address + "/"
+                file_url = "/" + address + "/" + inner_path
             else:
+                file_url = "/" + inner_path
                 root_url = "/"
 
         else: