diff --git a/daemon.py b/daemon.py index 5a5c9c32..769c554f 100644 --- a/daemon.py +++ b/daemon.py @@ -3115,10 +3115,11 @@ class PubServer(BaseHTTPRequestHandler): extractTextFieldsInPOST(postBytes, boundary, debug) print('citationstest: ' + str(fields)) citations = [] - for dateStr, item in newswire.items(): - if fields.get(dateStr): - if fields[dateStr] == 'on': - citations.append(dateStr) + for ctr in range(0, 128): + fieldName = 'newswire' + str(ctr) + if not fields.get(fieldName): + continue + citations.append(fields[fieldName]) if citations: citationsFilename = \ @@ -10884,8 +10885,7 @@ class PubServer(BaseHTTPRequestHandler): # was the citations button pressed on the newblog screen? citationsButtonPress = False if postType == 'newblog' and fields.get('submitCitations'): - if fields['submitCitations'] == \ - self.server.translate['Citations']: + if fields['submitCitations'] == 'Submit': citationsButtonPress = True if not citationsButtonPress: @@ -10894,7 +10894,7 @@ class PubServer(BaseHTTPRequestHandler): not fields.get('imageDescription'): return -1 if fields.get('submitPost'): - if fields['submitPost'] != self.server.translate['Submit']: + if fields['submitPost'] != 'Submit': return -1 else: return 2 diff --git a/webinterface.py b/webinterface.py index 1cd4b94c..09428c0c 100644 --- a/webinterface.py +++ b/webinterface.py @@ -3002,8 +3002,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, translate['Citations'] + '">\n' newPostForm += \ - ' \n' + ' \n' newPostForm += ' \n' @@ -5908,8 +5907,7 @@ def htmlCitations(baseDir: str, nickname: str, domain: str, ' \n' htmlStr += \ - ' \n' + ' \n' htmlStr += ' \n' # list of newswire items @@ -5924,7 +5922,7 @@ def htmlCitations(baseDir: str, nickname: str, domain: str, link = item[1] htmlStr += \ - '' + \ '' + title + ' ' htmlStr += '' + \