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

Tidying

main
Bob Mottram 2020-08-30 15:44:50 +01:00
parent 3bcb634863
commit 149acb0c4d
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
daemon.py
View File

@ -1222,33 +1222,25 @@ class PubServer(BaseHTTPRequestHandler):
if loginNickname:
self.server.lastLoginTime = int(time.time())
if register:
if not registerAccount(baseDir,
httpPrefix,
domain,
port,
loginNickname,
loginPassword,
if not registerAccount(baseDir, httpPrefix, domain, port,
loginNickname, loginPassword,
self.server.manualFollowerApproval):
self.server.POSTbusy = False
if callingDomain.endswith('.onion') and onionDomain:
self._redirect_headers('http://' +
onionDomain +
'/login',
cookie, callingDomain)
self._redirect_headers('http://' + onionDomain +
'/login', cookie,
callingDomain)
elif (callingDomain.endswith('.i2p') and i2pDomain):
self._redirect_headers('http://' +
i2pDomain +
'/login',
cookie, callingDomain)
self._redirect_headers('http://' + i2pDomain +
'/login', cookie,
callingDomain)
else:
self._redirect_headers(httpPrefix +
'://' +
domainFull +
'/login',
self._redirect_headers(httpPrefix + '://' +
domainFull + '/login',
cookie, callingDomain)
return
authHeader = createBasicAuthHeader(loginNickname,
loginPassword)
authHeader = \
createBasicAuthHeader(loginNickname, loginPassword)
if not authorizeBasic(baseDir, '/users/' +
loginNickname + '/outbox',
authHeader, False):
@ -1328,8 +1320,7 @@ class PubServer(BaseHTTPRequestHandler):
cookieStr, callingDomain)
else:
self._redirect_headers(httpPrefix + '://' +
domainFull +
'/users/' +
domainFull + '/users/' +
loginNickname + '/' +
self.server.defaultTimeline,
cookieStr, callingDomain)