Merge pull request #939 from Shadow243/jmap-corrections

[FIX] JMAP Server: menu link not clickable
cypht-org · Apr 10, 2024 · c401139 · c401139
2 parents d7e7a3e + faadce7
commit c401139
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 22 deletions.
diff --git a/modules/imap/hm-jmap.php b/modules/imap/hm-jmap.php
@@ -856,22 +856,33 @@ private function normalize_headers($msg) {
     private function init_session($data, $url) {
         $this->state = 'authenticated';
         $this->session = $data;
-        $this->api_url = sprintf(
-            '%s%s',
-            preg_replace("/\/$/", '', $url),
-            $data['apiUrl']
-        );
-	$this->api_url = $data['apiUrl'];
-        $this->download_url = sprintf(
-            '%s%s',
-            preg_replace("/\/$/", '', $url),
-            $data['downloadUrl']
-        );
-        $this->upload_url = sprintf(
-            '%s%s',
-            preg_replace("/\/$/", '', $url),
-            $data['uploadUrl']
-        );
+        if (!str_contains($data['apiUrl'], $url)){
+            $this->api_url = sprintf(
+                '%s%s',
+                preg_replace("/\/$/", '', $url),
+                $data['apiUrl']
+            );
+        }else{
+            $this->api_url = $data['apiUrl'];
+        }
+        if (!str_contains($data['downloadUrl'], $url)){
+            $this->download_url = sprintf(
+                '%s%s',
+                preg_replace("/\/$/", '', $url),
+                $data['downloadUrl']
+            );
+        }else{
+            $this->download_url = $data['downloadUrl'];
+        }
+        if (!str_contains($data['uploadUrl'], $url)){
+            $this->upload_url = sprintf(
+                '%s%s',
+                preg_replace("/\/$/", '', $url),
+                $data['uploadUrl']
+            );
+        }else{
+            $this->upload_url = $data['uploadUrl'];
+        }
         foreach ($data['accounts'] as $account) {
             $this->account_id = array_keys($data['accounts'])[0];
         }
@@ -1101,6 +1112,7 @@ private function build_imap_folders($data) {
                     'name' => $vals['name'],
                     'type' => 'jmap',
                     'noselect' => false,
+                    'clickable' => true,
                     'id' => $vals['id'],
                     'role' => $vals['role'],
                     'name_parts' => $vals['name_parts'],

diff --git a/modules/profiles/modules.php b/modules/profiles/modules.php
@@ -220,7 +220,7 @@ protected function output() {
                         continue;
                     }
                     if (strlen(trim($smtp_vals['sig']))) {
-                        $sigs[] = sprintf("%s: \"\\n%s\\n\"", $smtp_vals['smtp_id'].'.'.($index+1), $this->html_safe(str_replace("\r\n", "\\n", $smtp_vals['sig'])));
+                        $sigs[] = sprintf("\"%s\": \"\\n%s\\n\"", $smtp_vals['smtp_id'].'.'.($index+1), $this->html_safe(str_replace("\r\n", "\\n", $smtp_vals['sig'])));
                         $used[] = $smtp_vals['id'];
                     }
                 }
@@ -230,7 +230,7 @@ protected function output() {
                     continue;
                 }
                 if (strlen(trim($vals['sig']))) {
-                    $sigs[] = sprintf("%s: \"\\n%s\\n\"", $vals['smtp_id'], $this->html_safe(str_replace("\r\n", "\\n", $vals['sig'])));
+                    $sigs[] = sprintf("\"%s\": \"\\n%s\\n\"", $vals['smtp_id'], $this->html_safe(str_replace("\r\n", "\\n", $vals['sig'])));
                     $used[] = $vals['id'];
                 }
             }

diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
@@ -1832,7 +1832,7 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
         $imap_profile = Hm_IMAP_List::fetch($profile['user'], $profile['server']);
     }
 
-    if (!$imap_profile) {
+    if (!$imap_profile || empty($imap_profile)) {
         $imap_profile = find_imap_by_smtp(
             $mod->user_config->get('imap_servers'),
             $mod->user_config->get('smtp_servers')[$atts['draft_smtp']]
@@ -1841,7 +1841,7 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
             $from = $mod->user_config->get('smtp_servers')[$atts['draft_smtp']]['user'];
         }
     }
-    if (!$imap_profile) {
+    if (!$imap_profile || empty($imap_profile)) {
         return -1;
     }
 
@@ -1893,8 +1893,13 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
 
     foreach ($mailbox_page[1] as $mail) {
         $msg_header = $imap->get_message_headers($mail['uid']);
-        if ($msg_header['Message-Id'] === $mime->get_headers()['Message-Id']) {
-            return $mail['uid'];
+        // Convert all header keys to lowercase
+        $msg_header_lower = array_change_key_case($msg_header, CASE_LOWER);
+        $mime_headers_lower = array_change_key_case($mime->get_headers(), CASE_LOWER);
+        if (isset($msg_header_lower['message-id'], $mime_headers_lower['message-id'])) {
+            if ($msg_header_lower['message-id'] === $mime_headers_lower['message-id']) {
+                return $mail['uid'];
+            }
         }
     }
     return -1;