From 9b6d9151606d2c507db6ed2cf6e0a50ff76078b5 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 18 Dec 2019 06:48:46 +0100
Subject: [PATCH] [Web] Show hint when SOGo admin login is enabed, fix sieve
 preset in API

---
 data/web/json_api.php      | 6 +++---
 data/web/lang/lang.de.json | 1 +
 data/web/lang/lang.en.json | 1 +
 data/web/mailbox.php       | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/data/web/json_api.php b/data/web/json_api.php
index ba836ef4..a59d2f57 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -1097,16 +1097,16 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
             switch ($object) {
               default:
                 $data = dkim('details', $object);
-                  process_get_return($data);
-                  break;
+                process_get_return($data);
+                break;
             }
           break;
           case "presets":
             switch ($object) {
               case "rspamd":
                 process_get_return(presets('get', 'rspamd'));
-              case "sieve":
               break;
+              case "sieve":
                 process_get_return(presets('get', 'sieve'));
               break;
             }
diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index d5ea4e87..aa2081d8 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -556,6 +556,7 @@
     },
     "mailbox": {
         "tls_policy_maps": "TLS-Richtlinien",
+        "sogo_allow_admin_hint": "Administrative SOGo Logins sind nur für Mailboxen verfügbar, die bereits ein SOGo Profil besitzen. Ein Benutzer muss zumindest einmal in SOGo eingeloggt gewesen sein, um ein Profil zu besitzen.",
         "tls_policy_maps_long": "Ausgehende TLS-Richtlinien",
         "tls_policy_maps_info": "Nachstehende Richtlinien erzwingen TLS-Transportregeln unabhängig von TLS-Richtlinieneinstellungen eines Benutzers.<br>\r\n  Für weitere Informationen zur Syntax sollte <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">die \"smtp_tls_policy_maps\" Dokumentation</a> konsultiert werden.",
         "tls_enforce_in": "TLS eingehend erzwingen",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index a7073bde..23b18691 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -555,6 +555,7 @@
     },
     "mailbox": {
         "tls_policy_maps": "TLS policy maps",
+        "sogo_allow_admin_hint": "Administrative SOGo logins are only available for mailboxes with an existing SOGo profile. A user must have been logged in to SOGo at least once.",
         "tls_policy_maps_long": "Outgoing TLS policy map overrides",
         "tls_policy_maps_info": "This policy map overrides outgoing TLS transport rules independently of a users TLS policy settings.<br>\r\n  Please check <a href=\"http://www.postfix.org/postconf.5.html#smtp_tls_policy_maps\" target=\"_blank\">the \"smtp_tls_policy_maps\" docs</a> for further information.",
         "tls_enforce_in": "Enforce TLS incoming",
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 78d38c92..1311a230 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -67,6 +67,15 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
                 <button class="btn btn-xs btn-default refresh_table" data-draw="draw_mailbox_table" data-table="mailbox_table"><?=$lang['admin']['refresh'];?></button>
               </div>
             </div>
+            <?php
+            if (preg_match("/^([yY][eE][sS]|[yY])+$/", $_ENV["ALLOW_ADMIN_EMAIL_LOGIN"])):
+            ?>
+            <div class="panel-body help-block">
+            <?=$lang['mailbox']['sogo_allow_admin_hint'];?>
+            </div>
+            <?php
+            endif;
+            ?>
             <div class="table-responsive">
               <table id="mailbox_table" class="table table-striped"></table>
             </div>