Correct sieve connection when using scheme

cypht-org · Aug 27, 2024 · af3bc1e · af3bc1e
1 parent 25707d6
commit af3bc1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
@@ -1497,9 +1497,11 @@ function parse_sieve_config_host($host) {
     $url = parse_url($host);
     $host = $url['host'] ?? $url['path'];
     $port = $url['port'] ?? '4190';
-    $scheme = $url['scheme'] ?? 'tcp://';
+    $scheme = $url['scheme'] ?? '';
     $tls = $scheme === 'tls';
-    // $host = '$scheme://'.$host;
+    if (!empty($scheme)) {
+        $host = $scheme . '://' . $host;
+    }
     return [$host, $port, $tls];
 }}
 

diff --git a/modules/smtp/hm-smtp.php b/modules/smtp/hm-smtp.php
@@ -60,6 +60,9 @@ class Hm_SMTP {
     private $config;
     private $server;
     private $starttls;
+    private $supports_tls;
+    private $supports_auth;
+    private $max_message_size;
     private $port;
     private $tls;
     private $auth;
@@ -409,7 +412,7 @@ function authenticate($username, $password, $mech) {
             }
         }
 
-        if (!$result) {
+        if (!isset($result)) {
             $result = 'An error occurred authenticating to the SMTP server';
             $res = $this->get_response();
             if ($this->compare_response($res, '235') == 0) {