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

Rev1703, Allow custom favicon

Browse source
This commit is contained in:
shortcutme 2016-11-10 23:14:30 +01:00
parent 70e78056e9
commit c076f605aa
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.5.0" self.version = "0.5.0"
self.rev = 1702 self.rev = 1703
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

10
src/Ui/UiRequest.py
View file

@ -55,7 +55,7 @@ class UiRequest(object):
if path == "/": if path == "/":
return self.actionIndex() return self.actionIndex()
elif path.endswith("favicon.ico"): elif path == "/favicon.ico":
return self.actionFile("src/Ui/media/img/favicon.ico") return self.actionFile("src/Ui/media/img/favicon.ico")
# Media # Media
elif path.startswith("/uimedia/"): elif path.startswith("/uimedia/"):
@ -223,8 +223,10 @@ 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)
root_url = "/"
else: else:
file_url = "/" + address + "/" + inner_path file_url = "/" + address + "/" + inner_path
root_url = "/" + address + "/"
# Wrapper variable inits # Wrapper variable inits
query_string = "" query_string = ""
@ -256,6 +258,8 @@ class UiRequest(object):
cgi.escape(site.content_manager.contents["content.json"]["background-color"], True) cgi.escape(site.content_manager.contents["content.json"]["background-color"], True)
if content.get("viewport"): if content.get("viewport"):
meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True) meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True)
if content.get("favicon"):
meta_tags += '<link rel="icon" href="%s%s">' % (root_url, cgi.escape(content["favicon"], True))
if content.get("postmessage_nonce_security"): if content.get("postmessage_nonce_security"):
postmessage_nonce_security = "true" postmessage_nonce_security = "true"
@ -355,6 +359,10 @@ class UiRequest(object):
return self.actionRedirect("./{0}/".format(path_parts["inner_path"].split("/")[-1])) return self.actionRedirect("./{0}/".format(path_parts["inner_path"].split("/")[-1]))
else: # File not exists, try to download else: # File not exists, try to download
site = SiteManager.site_manager.need(address, all_file=False) site = SiteManager.site_manager.need(address, all_file=False)
if path_parts["inner_path"].endswith("favicon.ico"): # Default favicon for all sites
return self.actionFile("src/Ui/media/img/favicon.ico")
result = site.needFile(path_parts["inner_path"], priority=5) # Wait until file downloads result = site.needFile(path_parts["inner_path"], priority=5) # Wait until file downloads
if result: if result:
return self.actionFile(file_path) return self.actionFile(file_path)