mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass domain as argument

main
Bob Mottram 2020-06-10 13:53:16 +01:00
parent df73c4f04e
commit 691253d1c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -2141,7 +2141,8 @@ class PubServer(BaseHTTPRequestHandler):
self.path = self.path.split('?')[0] self.path = self.path.split('?')[0]
# show the search screen # show the search screen
msg = htmlSearch(self.server.translate, msg = htmlSearch(self.server.translate,
self.server.baseDir, self.path).encode() self.server.baseDir, self.path,
self.server.domain).encode()
self._set_headers('text/html', len(msg), cookie, callingDomain) self._set_headers('text/html', len(msg), cookie, callingDomain)
self._write(msg) self._write(msg)
self.server.GETbusy = False self.server.GETbusy = False

3
webinterface.py
View File

@ -5848,12 +5848,11 @@ def htmlHashTagSwarm(baseDir: str, actor: str) -> str:
def htmlSearch(translate: {}, def htmlSearch(translate: {},
baseDir: str, path: str) -> str: baseDir: str, path: str, domain: str) -> str:
"""Search called from the timeline icon """Search called from the timeline icon
""" """
actor = path.replace('/search', '') actor = path.replace('/search', '')
searchNickname = getNicknameFromActor(actor) searchNickname = getNicknameFromActor(actor)
domain, port = getDomainFromActor(actor)
if os.path.isfile(baseDir + '/img/search-background.png'): if os.path.isfile(baseDir + '/img/search-background.png'):
if not os.path.isfile(baseDir + '/accounts/search-background.png'): if not os.path.isfile(baseDir + '/accounts/search-background.png'):