From 0a3188a5da8d1ffb69b9f12b6a010b348b2e109e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 27 May 2020 11:30:40 +0100
Subject: [PATCH] Handle none values from config

---
 daemon.py       |  9 ++++++---
 webinterface.py | 35 +++++++++++++++++++++++++----------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/daemon.py b/daemon.py
index dcfc22843..05d56c504 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2934,9 +2934,12 @@ class PubServer(BaseHTTPRequestHandler):
                                       self.path, self.server.domain,
                                       self.server.port,
                                       self.server.httpPrefix).encode()
-                self._set_headers('text/html', len(msg),
-                                  cookie, callingDomain)
-                self._write(msg)
+                if msg:
+                    self._set_headers('text/html', len(msg),
+                                      cookie, callingDomain)
+                    self._write(msg)
+                else:
+                    self._404()
                 self.server.GETbusy = False
                 return
 
diff --git a/webinterface.py b/webinterface.py
index 88873b080..768a6ca06 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1098,22 +1098,37 @@ def htmlEditProfile(translate: {}, baseDir: str, path: str,
         instanceStr += \
             '  <label class="labels">' + \
             translate['Instance Title'] + '</label>'
-        instanceStr += \
-            '  <input type="text" name="instanceTitle" value="' + \
-            instanceTitle + '"><br>'
+        if instanceTitle:
+            instanceStr += \
+                '  <input type="text" name="instanceTitle" value="' + \
+                instanceTitle + '"><br>'
+        else:
+            instanceStr += \
+                '  <input type="text" name="instanceTitle" value=""><br>'
         instanceStr += \
             '  <label class="labels">' + \
             translate['Instance Short Description'] + '</label>'
-        instanceStr += \
-            '  <input type="text" name="instanceDescriptionShort" value="' + \
-            instanceDescriptionShort + '"><br>'
+        if instanceDescriptionShort:
+            instanceStr += \
+                '  <input type="text" ' + \
+                'name="instanceDescriptionShort" value="' + \
+                instanceDescriptionShort + '"><br>'
+        else:
+            instanceStr += \
+                '  <input type="text" ' + \
+                'name="instanceDescriptionShort" value=""><br>'
         instanceStr += \
             '  <label class="labels">' + \
             translate['Instance Description'] + '</label>'
-        instanceStr += \
-            '  <textarea id="message" name="instanceDescription" ' + \
-            'style="height:200px">' + \
-            instanceDescription + '</textarea>'
+        if instanceDescription:
+            instanceStr += \
+                '  <textarea id="message" name="instanceDescription" ' + \
+                'style="height:200px">' + \
+                instanceDescription + '</textarea>'
+        else:
+            instanceStr += \
+                '  <textarea id="message" name="instanceDescription" ' + \
+                'style="height:200px"></textarea>'
         instanceStr += \
             '  <label class="labels">' + \
             translate['Instance Logo'] + '</label>'