Change theme directory structure

daemon.py

@@ -4387,7 +4387,7 @@ class PubServer(BaseHTTPRequestHandler):
         if not os.path.isfile(faviconFilename):
             # default favicon
             faviconFilename = \
-                baseDir + '/img/icons/' + favFilename
+                baseDir + '/theme/default/icons/' + favFilename
         if self._etag_exists(faviconFilename):
             # The file has not changed
             if debug:
@@ -4834,7 +4834,13 @@ class PubServer(BaseHTTPRequestHandler):
         """
         if path.endswith('.png'):
             mediaStr = path.split('/icons/')[1]
-            mediaFilename = baseDir + '/img/icons/' + mediaStr
+            if '/' not in mediaStr:
+                self._404()
+                return
+            theme = mediaStr.split('/')[0]
+            iconFilename = mediaStr.split('/')[1]
+            mediaFilename = \
+                baseDir + '/theme/' + theme + '/icons/' + iconFilename
             if self._etag_exists(mediaFilename):
                 # The file has not changed
                 self._304()

theme.py

@@ -1364,9 +1364,9 @@ def setNewsAvatar(baseDir: str, name: str,
     """Sets the avatar for the news account
     """
     nickname = 'news'
-    newFilename = baseDir + '/img/icons/' + name + '/avatar_news.png'
+    newFilename = baseDir + '/theme/' + name + '/icons/avatar_news.png'
     if not os.path.isfile(newFilename):
-        newFilename = baseDir + '/img/icons/avatar_news.png'
+        newFilename = baseDir + '/theme/default/icons/avatar_news.png'
     if not os.path.isfile(newFilename):
         return
     avatarFilename = \
@@ -1409,7 +1409,7 @@ def setTheme(baseDir: str, name: str, domain: str) -> bool:
 
     # set the news avatar
     newsAvatarThemeFilename = \
-        baseDir + '/img/icons/' + name + '/avatar_news.png'
+        baseDir + '/theme/' + name + '/icons/avatar_news.png'
     if os.path.isfile(newsAvatarThemeFilename):
         newsAvatarFilename = \
             baseDir + '/accounts/news@' + domain + '/avatar.png'