From 80f4692813afee279910904a7af5b96a1b9cdf8d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 5 Nov 2020 23:18:48 +0000
Subject: [PATCH] Clearer logic

---
 daemon.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/daemon.py b/daemon.py
index 1b826705..fc935772 100644
--- a/daemon.py
+++ b/daemon.py
@@ -10880,17 +10880,16 @@ class PubServer(BaseHTTPRequestHandler):
                     citationsButtonPress = True
             print('citationstest: 0b ' + str(citationsButtonPress))
 
-            # process the received text fields from the POST
-            if not fields.get('message') and \
-               not fields.get('imageDescription'):
-                if not citationsButtonPress:
+            if not citationsButtonPress:
+                # process the received text fields from the POST
+                if not fields.get('message') and \
+                   not fields.get('imageDescription'):
                     return -1
-            if fields.get('submitPost'):
-                if fields['submitPost'] != self.server.translate['Submit']:
-                    if not citationsButtonPress:
+                if fields.get('submitPost'):
+                    if fields['submitPost'] != self.server.translate['Submit']:
                         return -1
-            else:
-                return 2
+                else:
+                    return 2
 
             if not fields.get('imageDescription'):
                 fields['imageDescription'] = None