Ensure moderator status on the backend

main
Bob Mottram 2020-10-14 10:43:32 +01:00
parent 48aff7b61e
commit a6506c6c96
1 changed files with 20 additions and 19 deletions

View File

@ -1645,7 +1645,7 @@ class PubServer(BaseHTTPRequestHandler):
if debug: if debug:
print('You cannot perform an option action on yourself') print('You cannot perform an option action on yourself')
# view button on person option screen # person options screen, view button
if '&submitView=' in optionsConfirmParams: if '&submitView=' in optionsConfirmParams:
if debug: if debug:
print('Viewing ' + optionsActor) print('Viewing ' + optionsActor)
@ -1654,7 +1654,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
# petname submit button on person option screen # person options screen, petname submit button
if '&submitPetname=' in optionsConfirmParams and petname: if '&submitPetname=' in optionsConfirmParams and petname:
if debug: if debug:
print('Change petname to ' + petname) print('Change petname to ' + petname)
@ -1670,7 +1670,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.POSTbusy = False self.server.POSTbusy = False
return return
# person notes submit button on person option screen # person options screen, person notes submit button
if '&submitPersonNotes=' in optionsConfirmParams: if '&submitPersonNotes=' in optionsConfirmParams:
if debug: if debug:
print('Change person notes') print('Change person notes')
@ -1718,22 +1718,23 @@ class PubServer(BaseHTTPRequestHandler):
# person options screen, permission to post to newswire # person options screen, permission to post to newswire
# See htmlPersonOptions # See htmlPersonOptions
if '&submitPostToNews=' in optionsConfirmParams: if '&submitPostToNews=' in optionsConfirmParams:
postsToNews = None if isModerator(self.server.baseDir, chooserNickname):
if 'postsToNews=' in optionsConfirmParams: postsToNews = None
postsToNews = optionsConfirmParams.split('postsToNews=')[1] if 'postsToNews=' in optionsConfirmParams:
if '&' in postsToNews: postsToNews = optionsConfirmParams.split('postsToNews=')[1]
postsToNews = postsToNews.split('&')[0] if '&' in postsToNews:
newswireBlockedFilename = \ postsToNews = postsToNews.split('&')[0]
self.server.baseDir + '/accounts/' + \ newswireBlockedFilename = \
optionsNickname + '@' + optionsDomain + '/.nonewswire' self.server.baseDir + '/accounts/' + \
if postsToNews == 'on': optionsNickname + '@' + optionsDomain + '/.nonewswire'
if os.path.isfile(newswireBlockedFilename): if postsToNews == 'on':
os.remove(newswireBlockedFilename) if os.path.isfile(newswireBlockedFilename):
else: os.remove(newswireBlockedFilename)
noNewswireFile = open(newswireBlockedFilename, "w+") else:
if noNewswireFile: noNewswireFile = open(newswireBlockedFilename, "w+")
noNewswireFile.write('\n') if noNewswireFile:
noNewswireFile.close() noNewswireFile.write('\n')
noNewswireFile.close()
self._redirect_headers(usersPath + '/' + self._redirect_headers(usersPath + '/' +
self.server.defaultTimeline + self.server.defaultTimeline +
'?page='+str(pageNumber), cookie, '?page='+str(pageNumber), cookie,