Fix the combined inbox not excluding content from folders removed by …

…the user
cypht-org · Nov 6, 2024 · 7033ab6 · 7033ab6
1 parent 9cdbb8e
commit 7033ab6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
@@ -456,12 +456,7 @@ public function process() {
                 $this->session->record_unsaved('Added folder to combined pages');
             }
             else {
-                if (is_array($sources) && array_key_exists($form['list_path'], $sources)) {
-                    unset($sources[$form['list_path']]);
-                }
-                else {
-                    $sources[$form['list_path']] = 'remove';
-                }
+                $sources[$form['list_path']] = 'remove';
                 Hm_Msgs::add('Folder removed from combined pages');
                 $this->session->record_unsaved('Removed folder from combined pages');
             }
@@ -1311,7 +1306,7 @@ public function process() {
             }
             $folders = array($folder);
         } else {
-            $data_sources = imap_data_sources('');
+            $data_sources = imap_data_sources('', $this->session->get('custom_imap_sources', user:true));
             $ids = array_map(function($ds) { return $ds['id']; }, $data_sources);
             $folders = array_map(function($ds) { return $ds['folder']; }, $data_sources);
         }

diff --git a/modules/imap/site.js b/modules/imap/site.js
@@ -453,6 +453,7 @@ var display_imap_mailbox = function(rows, links, path = getListPathParam()) {
         serverIds.push(detail.server_id);
     }
     if (rows) {
+        // TODO: Review the update() method, it seems not to be correctly removing the old data from the page
         Hm_Message_List.update(serverIds, rows, 'imap');
         Hm_Message_List.check_empty_list();
         $('.page_links').html(links);