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

Check for citations button press

merge-requests/30/head
Bob Mottram 2020-11-05 22:51:01 +00:00
parent 7fc626a2ee
commit 00ca8fa5dd
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
daemon.py
View File

@ -10871,13 +10871,22 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
print('WARN: no text fields could be extracted from POST') print('WARN: no text fields could be extracted from POST')
# was the citations button pressed on the newblog screen?
citationsButtonPress = False
if postType == 'newblog' and fields.get('submitCitations'):
if fields['submitCitations'] == \
self.server.translate['SubmitCitations']:
citationsButtonPress = True
# process the received text fields from the POST # process the received text fields from the POST
if not fields.get('message') and \ if not fields.get('message') and \
not fields.get('imageDescription'): not fields.get('imageDescription'):
return -1 if not citationsButtonPress:
return -1
if fields.get('submitPost'): if fields.get('submitPost'):
if fields['submitPost'] != self.server.translate['Submit']: if fields['submitPost'] != self.server.translate['Submit']:
return -1 if not citationsButtonPress:
return -1
else: else:
return 2 return 2
@ -10959,32 +10968,29 @@ class PubServer(BaseHTTPRequestHandler):
return -1 return -1
elif postType == 'newblog': elif postType == 'newblog':
# citations button on newblog screen # citations button on newblog screen
messageJson = None if citationsButtonPress:
if fields.get('submitCitations'): messageJson = \
if fields['submitCitations'] == \ htmlCitations(self.server.baseDir,
self.server.translate['Citations']: nickname,
messageJson = \ self.server.domain,
htmlCitations(self.server.baseDir, self.server.httpPrefix,
nickname, self.server.defaultTimeline,
self.server.domain, self.server.translate,
self.server.httpPrefix, self.server.newswire,
self.server.defaultTimeline, self.server.cssCache,
self.server.translate, fields['subject'],
self.server.newswire, fields['message'],
self.server.cssCache, filename, attachmentMediaType,
fields['subject'], fields['imageDescription'])
fields['message'], if messageJson:
filename, attachmentMediaType, messageJson = messageJson.encode('utf-8')
fields['imageDescription']) self._set_headers('text/html',
if messageJson: len(messageJson),
messageJson = messageJson.encode('utf-8') cookie, callingDomain)
self._set_headers('text/html', self._write(messageJson)
len(messageJson), return 1
cookie, callingDomain) else:
self._write(messageJson) return -1
return 1
else:
return -1
# submit button on newblog screen # submit button on newblog screen
messageJson = \ messageJson = \
createBlogPost(self.server.baseDir, nickname, createBlogPost(self.server.baseDir, nickname,