[SOGo] Use indigo theme, copy logo and theme.js to image

data/Dockerfiles/sogo/Dockerfile

@@ -42,6 +42,8 @@ RUN mkdir /usr/share/doc/sogo \
 COPY ./bootstrap-sogo.sh /
 COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
 COPY supervisord.conf /etc/supervisor/supervisord.conf
+COPY theme.js /usr/lib/GNUstep/SOGo/WebServerResources/js/theme.js
+COPY sogo-full.svg /usr/lib/GNUstep/SOGo/WebServerResources/img/sogo-full.svg
 
 CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
 

data/Dockerfiles/sogo/bootstrap-sogo.sh

@@ -19,7 +19,7 @@ mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "DROP VIEW IF EXISTS so
 
 mysql --host mysql -u ${DBUSER} -p${DBPASS} ${DBNAME} << EOF
 CREATE VIEW sogo_view (c_uid, domain, c_name, c_password, c_cn, mail, aliases, ad_aliases, home, kind, multiple_bookings) AS
-SELECT mailbox.username, mailbox.domain, mailbox.username, if(json_extract(attributes, '$.force_pw_update') = '0', password, 'invalid'), mailbox.name, mailbox.username, IFNULL(GROUP_CONCAT(ga.aliases SEPARATOR ' '), ''), IFNULL(gda.ad_alias, ''), CONCAT('/var/vmail/', maildir), mailbox.kind, mailbox.multiple_bookings FROM mailbox
+SELECT mailbox.username, mailbox.domain, mailbox.username, if(json_extract(attributes, '$.force_pw_update') LIKE '%0%', password, 'invalid'), mailbox.name, mailbox.username, IFNULL(GROUP_CONCAT(ga.aliases SEPARATOR ' '), ''), IFNULL(gda.ad_alias, ''), CONCAT('/var/vmail/', maildir), mailbox.kind, mailbox.multiple_bookings FROM mailbox
 LEFT OUTER JOIN grouped_mail_aliases ga ON ga.username REGEXP CONCAT('(^|,)', mailbox.username, '($|,)')
 LEFT OUTER JOIN grouped_domain_alias_address gda ON gda.username = mailbox.username
 WHERE mailbox.active = '1'

data/Dockerfiles/sogo/theme.js

@@ -0,0 +1,60 @@
+/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+(function() {
+  'use strict';
+
+  angular.module('SOGo.Common')
+    .config(configure)
+
+  /**
+   * @ngInject
+   */
+  configure.$inject = ['$mdThemingProvider'];
+  function configure($mdThemingProvider) {
+
+    /**
+     * Define the Alternative theme
+     */
+    $mdThemingProvider.theme('mailcow')
+      .primaryPalette('indigo', {
+        'default': '700',  // top toolbar
+        'hue-1': '400',
+        'hue-2': '600',    // sidebar toolbar
+        'hue-3': 'A700'
+      })
+      .accentPalette('indigo', {
+        'default': '500',  // fab buttons
+        'hue-1': '50',     // center list toolbar
+        'hue-2': '400',
+        'hue-3': 'A700'
+      })
+      .backgroundPalette('grey', {
+        'default': '50',   // center list background
+        'hue-1': '100',
+        'hue-2': '200',
+        'hue-3': '300'
+      });
+    $mdThemingProvider.theme('default')
+      .primaryPalette('indigo', {
+        'default': '700',  // top toolbar
+        'hue-1': '400',
+        'hue-2': '600',    // sidebar toolbar
+        'hue-3': 'A700'
+      })
+      .accentPalette('indigo', {
+        'default': '500',  // fab buttons
+        'hue-1': '50',     // center list toolbar
+        'hue-2': '400',
+        'hue-3': 'A700'
+      })
+      .backgroundPalette('grey', {
+        'default': '50',   // center list background
+        'hue-1': '100',
+        'hue-2': '200',
+        'hue-3': '300'
+      });
+
+    $mdThemingProvider.setDefaultTheme('mailcow');
+    $mdThemingProvider.generateThemesOnDemand(false);
+  }
+})();

data/conf/sogo/sogo.conf

@@ -14,6 +14,7 @@
     SOGoEnableEMailAlarms = NO;
     SOGoFoldersSendEMailNotifications = YES;
     SOGoForwardEnabled = YES;
+    SOGoUIAdditionalJSFiles = (js/theme.js);
 
     // Multi-domain setup
     // Domains are isolated, you can define visibility options here.

docker-compose.yml

@@ -142,7 +142,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.17
+      image: mailcow/sogo:1.18
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}