fix(Tinebase/EmailUser): fix manages() for SIEVE

tine-groupware · Feb 19, 2024 · eeb6fd3 · eeb6fd3
1 parent 7c44ca9
commit eeb6fd3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tine20/Tinebase/EmailUser.php b/tine20/Tinebase/EmailUser.php
@@ -309,7 +309,11 @@ public static function merge($_emailUserImap, $_emailUserSmtp)
     public static function manages($_configType)
     {
         $config = self::getConfig($_configType);
-        return (!empty($config['backend']) && isset($config['active']) && $config['active'] == true);
+        return (
+            ($_configType === Tinebase_Config::SIEVE || !empty($config['backend']))
+            && isset($config['active'])
+            && $config['active'] == true
+        );
     }
 
     /**
@@ -433,7 +437,9 @@ public static function getAllowedDomains($config = null, $_includeAdditional = f
                 if (preg_match("~^ldaps?://~i", $config['secondarydomains'])) {
                     // If LDAP-Url is given (instead of comma separated domains) add secondary domains from LDAP
                     $config['secondarydomains'] = self::_getSecondaryDomainsFromLdapUrl($config['secondarydomains']);
-                    if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ .' Secondarydomains from ldap (allowed domains): ' . print_r($config['secondarydomains'], true));
+                    if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(
+                        __METHOD__ . '::' . __LINE__ . ' Secondarydomains from ldap (allowed domains): '
+                        . print_r($config['secondarydomains'], true));
                 }
                 $allowedDomains = array_merge($allowedDomains, preg_split('/\s*,\s*/', $config['secondarydomains']));
             }
@@ -624,7 +630,7 @@ public static function backendSupportsMasterPassword(Felamimail_Model_Account $a
             return false;
         }
 
-        $imapEmailBackend = Tinebase_EmailUser::getInstance(Tinebase_Config::IMAP);
+        $imapEmailBackend = Tinebase_EmailUser::getInstance();
         if (method_exists($imapEmailBackend, 'checkMasterUserTable')) {
             try {
                 $imapEmailBackend->checkMasterUserTable();