oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Js based redirecting template formatting

Browse source
This commit is contained in:
Tamas Kocsis 2020-09-08 19:32:10 +02:00
parent 94765af0f3
commit 8dc5aee8aa
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Ui/UiRequest.py
View file

@ -350,12 +350,25 @@ class UiRequest(object):
return is_html_file return is_html_file
@helper.encodeResponse
def formatRedirect(self, url):
return """
<html>
<body>
Redirecting to <a href="{0}" target="_top">{0}</a>
<script>
window.top.location = "{0}"
</script>
</body>
</html>
""".format(html.escape(url))
# - Actions - # - Actions -
# Redirect to an url # Redirect to an url
def actionRedirect(self, url): def actionRedirect(self, url):
self.start_response('301 Redirect', [('Location', str(url))]) self.start_response('301 Redirect', [('Location', str(url))])
yield b"Location changed: " + url.encode("utf8") yield self.formatRedirect(url)
def actionIndex(self): def actionIndex(self):
return self.actionRedirect("/" + config.homepage) return self.actionRedirect("/" + config.homepage)

2
src/util/helper.py
View file

@ -338,7 +338,7 @@ def cmp(a, b):
return (a > b) - (a < b) return (a > b) - (a < b)
def encodeResponse(func): def encodeResponse(func): # Encode returned data from utf8 to bytes
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
back = func(*args, **kwargs) back = func(*args, **kwargs)
if "__next__" in dir(back): if "__next__" in dir(back):