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

More verbose

merge-requests/8/head
Bob Mottram 2020-12-09 23:44:41 +00:00
parent 0c536454ca
commit e5c13c4966
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -8132,8 +8132,9 @@ class PubServer(BaseHTTPRequestHandler):
fullWidthTimelineButtonHeader = \ fullWidthTimelineButtonHeader = \
self.server.fullWidthTimelineButtonHeader self.server.fullWidthTimelineButtonHeader
moderationActionStr = '' moderationActionStr = ''
if '?' in nickname: if '?modaction=' in nickname:
moderationActionStr = nickname.split('?')[1] moderationActionStr = \
nickname.split('?modaction=')[1]
nickname = nickname.split('?')[0] nickname = nickname.split('?')[0]
msg = \ msg = \
htmlModeration(self.server.cssCache, htmlModeration(self.server.cssCache,
@ -8185,8 +8186,8 @@ class PubServer(BaseHTTPRequestHandler):
if debug: if debug:
nickname = path.replace('/users/', '') nickname = path.replace('/users/', '')
nickname = nickname.replace('/moderation', '') nickname = nickname.replace('/moderation', '')
if '?' in nickname: if '?modaction=' in nickname:
nickname = nickname.split('?')[0] nickname = nickname.split('?modaction=')[0]
print('DEBUG: ' + nickname + print('DEBUG: ' + nickname +
' was not authorized to access ' + path) ' was not authorized to access ' + path)
if debug: if debug:
@ -11014,7 +11015,7 @@ class PubServer(BaseHTTPRequestHandler):
blockDomain = urllib.parse.unquote_plus(blockDomain.strip()) blockDomain = urllib.parse.unquote_plus(blockDomain.strip())
searchHandle = '' searchHandle = ''
if '?' in blockDomain: if '?' in blockDomain:
searchHandle = '?' + blockDomain.split('?')[1] searchHandle = '?modaction=' + blockDomain.split('?')[1]
blockDomain = blockDomain.split('?')[0] blockDomain = blockDomain.split('?')[0]
addGlobalBlock(self.server.baseDir, nickname, blockDomain) addGlobalBlock(self.server.baseDir, nickname, blockDomain)
self.server.GETbusy = False self.server.GETbusy = False
@ -11035,7 +11036,7 @@ class PubServer(BaseHTTPRequestHandler):
blockDomain = urllib.parse.unquote_plus(blockDomain.strip()) blockDomain = urllib.parse.unquote_plus(blockDomain.strip())
searchHandle = '' searchHandle = ''
if '?' in blockDomain: if '?' in blockDomain:
searchHandle = '?' + blockDomain.split('?')[1] searchHandle = '?modaction=' + blockDomain.split('?')[1]
blockDomain = blockDomain.split('?')[0] blockDomain = blockDomain.split('?')[0]
removeGlobalBlock(self.server.baseDir, nickname, blockDomain) removeGlobalBlock(self.server.baseDir, nickname, blockDomain)
self.server.GETbusy = False self.server.GETbusy = False

4
webapp_moderation.py
View File

@ -69,8 +69,8 @@ def htmlAccountInfo(cssCache: {}, translate: {},
searchDomain, searchPort = getDomainFromActor(searchHandle) searchDomain, searchPort = getDomainFromActor(searchHandle)
infoForm += \ infoForm += \
'<center><h1><a href="/users/' + nickname + '/moderation?' + \ '<center><h1><a href="/users/' + nickname + '/moderation' + \
searchHandle + '">' + \ '?modaction=' + searchHandle + '">' + \
translate['Account Information'] + \ translate['Account Information'] + \
': ' + searchNickname + '@' + searchDomain + \ ': ' + searchNickname + '@' + searchDomain + \
'</a></h1><br><br>' '</a></h1><br><br>'