diff --git a/daemon.py b/daemon.py index 1f8115e31..15e8c5e09 100644 --- a/daemon.py +++ b/daemon.py @@ -1344,11 +1344,13 @@ class PubServer(BaseHTTPRequestHandler): msg = \ htmlAbout(self.server.baseDir, self.server.httpPrefix, - self.server.domainFull).encode() + self.server.domainFull, + self.server.onionDomain).encode() else: msg = \ htmlAbout(self.server.baseDir, 'http', - self.server.onionDomain).encode() + self.server.onionDomain, + None).encode() self._login_headers('text/html', len(msg), callingDomain) self._write(msg) return diff --git a/webinterface.py b/webinterface.py index 48b36ce69..1ebc948a7 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1437,7 +1437,8 @@ def htmlTermsOfService(baseDir: str, httpPrefix: str, domainFull: str) -> str: return TOSForm -def htmlAbout(baseDir: str, httpPrefix: str, domainFull: str) -> str: +def htmlAbout(baseDir: str, httpPrefix: str, + domainFull: str, onionDomain: str) -> str: """Show the about screen """ adminNickname = getConfigParam(baseDir, 'admin') @@ -1466,6 +1467,9 @@ def htmlAbout(baseDir: str, httpPrefix: str, domainFull: str) -> str: aboutForm = htmlHeader(cssFilename, termsCSS) aboutForm += '
' + aboutText + '
' + if onionDomain: + aboutForm += \ + '
http://' + onionDomain + '
' if adminNickname: adminActor = \ httpPrefix + '://' + domainFull + '/users/' + adminNickname