indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Use full domain

main2
Bob Mottram 2019-10-11 20:25:36 +01:00
parent 060b63b384
commit 8ea78dda93
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon.py
View File

@ -1058,7 +1058,7 @@ class PubServer(BaseHTTPRequestHandler):
# show the calendar screen # show the calendar screen
msg=htmlCalendar(self.server.translate, \ msg=htmlCalendar(self.server.translate, \
self.server.baseDir,self.path, \ self.server.baseDir,self.path, \
self.server.domain).encode() self.server.domainFull).encode()
self._set_headers('text/html',len(msg),cookie) self._set_headers('text/html',len(msg),cookie)
self.wfile.write(msg) self.wfile.write(msg)
self.server.GETbusy=False self.server.GETbusy=False

9
webinterface.py
View File

@ -2847,13 +2847,18 @@ def htmlCalendarDay(translate: {}, \
return calendarStr return calendarStr
def htmlCalendar(translate: {}, \ def htmlCalendar(translate: {}, \
baseDir: str,path: str,domain: str) -> str: baseDir: str,path: str, \
httpPrefix: str,domainFull: str) -> str:
"""Show the calendar for a person """Show the calendar for a person
""" """
domain=domainFull
if ':' in domainFull:
domain=domainFull.split(':')[0]
monthNumber=0 monthNumber=0
dayNumber=None dayNumber=None
year=1970 year=1970
actor=path.replace('/calendar','') actor=httpPrefix+'://'+domainFull+path.replace('/calendar','')
if '?' in actor: if '?' in actor:
first=True first=True
for p in actor.split('?'): for p in actor.split('?'):