use selected special folders to trigger the request, and fix some UI discrepancies (saving and loading sources from local storage, etc)

Author: mercihabam

modules/advanced_search/js_modules/route_handlers.js

@@ -89,12 +89,27 @@ function applyAdvancedSearchPageHandlers() {
             </div>
             ${specialFolders.map(folder => `
             <div class="form-check form-switch">
-                <input class="form-check-input special_folder_checkbox" type="checkbox" id="${folder}" data-folder-id="${folder}">
+                <input class="form-check-input special_folder_checkbox" type="checkbox" data-folder-id="${folder}">
                 <label class="form-check-label" for="${folder}">${folder}</label>
             </div>
             `).join('')}
         </div>    
         `);
+
+        const account = $(this).closest('li').find('.adv_folder_link');
+        const accountLabel = account.text();
+        const accountId = account.data('target');
+
+        modal.addFooterBtn('Pick', 'btn-primary', function() {
+            const selectedFolders = [];
+            $('.special_folder_checkbox:checked').each(function() {
+                selectedFolders.push($(this).data('folder-id'));
+            });
+            selectedFolders.forEach(folder => {
+                add_source_to_list(accountId + folder, accountLabel +' &gt; '+folder, false);
+            });
+            modal.hide();
+        });
 
         modal.open();
 

modules/advanced_search/modules.php

@@ -91,12 +91,9 @@ public function process() {
         }
 
         $searchInAllFolders = $this->request->post['all_folders'] ?? false;
-        $searchInSpecialFolders = $this->request->post['all_special_folders'] ?? false;
         $includeSubfolders = $this->request->post['include_subfolders'] ?? false;
         if ($searchInAllFolders) {
             $msg_list = $this->all_folders_search($mailbox, $flags, $params, $limit);
-        } elseif ($searchInSpecialFolders) {
-            $msg_list = $this->special_folders_search($mailbox, $flags, $params, $limit);
         } else if ($includeSubfolders) {
             $msg_list = $this->all_folders_search($mailbox, $flags, $params, $limit, $this->folder);
         } else if (! $mailbox->select_folder($this->folder)) {
@@ -124,20 +121,6 @@ private function all_folders_search($mailbox, $flags, $params, $limit, $parent =
         return $msg_list;
     }
 
-    private function special_folders_search($mailbox, $flags, $params, $limit) {
-        $specials = $this->user_config->get('special_imap_folders', array());
-        $folders = $specials[$this->imap_id] ?? [];
-
-        $msg_list = array();
-        foreach ($folders as $folder) {
-            $this->folder = $folder;
-            $mailbox->select_folder($this->folder);
-            $msgs = $this->imap_search($flags, $mailbox, $params, $limit);
-            $msg_list = array_merge($msg_list, $msgs);
-        }
-        return $msg_list;
-    }
-
     private function imap_search($flags, $mailbox, $params, $limit) {
         $msg_list = array();
         $exclude_deleted = true;
@@ -176,7 +159,13 @@ private function validate_source($val) {
         }
         $source_parts = explode('_', $val);
         $this->imap_id = $source_parts[1];
-        $this->folder = hex2bin($source_parts[2]);
+
+        $folder = $source_parts[2];
+        if (ctype_xdigit($folder)) {
+            $this->folder = hex2bin($folder);
+        } else {
+            $this->folder = $folder;
+        }
         return true;
     }
 

modules/advanced_search/setup.php

@@ -43,7 +43,6 @@
         'adv_terms' => array('filter' => FILTER_UNSAFE_RAW, 'flags' => FILTER_REQUIRE_ARRAY),
         'adv_targets' => array('filter' => FILTER_UNSAFE_RAW, 'flags' => FILTER_REQUIRE_ARRAY),
         'all_folders' => FILTER_VALIDATE_BOOLEAN,
-        'all_special_folders' => FILTER_VALIDATE_BOOLEAN,
         'include_subfolders' => FILTER_VALIDATE_BOOLEAN,
     )
 );

modules/advanced_search/site.js

@@ -87,18 +87,13 @@ var expand_adv_folder = function(res) {
     }
 };
 
-$(document).on("change", "input[name='all_folders'],input[name='all_special_folders']", function() {
+$(document).on("change", "input[name='all_folders']", function() {
     const folderLi = $(this).closest('li');
-    const divergentCheckboxName = this.name === 'all_folders' ? 'all_special_folders' : 'all_folders';
-    const divergentCheckbox = $(this).closest('div').find(`input[name='${divergentCheckboxName}']`)
 
     if ($(this).is(':checked')) {
         folderLi.find('a').attr('disabled', 'disabled');
-        divergentCheckbox.prop('checked', false);
-        divergentCheckbox.attr('disabled', 'disabled');
     } else {
         folderLi.find('a').removeAttr('disabled');
-        divergentCheckbox.removeAttr('disabled');
     }
 });
 
@@ -247,13 +242,7 @@ var get_adv_sources = function() {
     const searchInAllFolders = $('.adv_folder_list li input[name="all_folders"]:checked');
     searchInAllFolders.each(function() {
         const li = $(this).closest('li');
-        sources.push({'source': li.attr('class'), 'label': li.find('a').text(), allFolders: true});
-    });
-
-    const searchInSpecialFolders = $('.adv_folder_list li input[name="all_special_folders"]:checked');
-    searchInSpecialFolders.each(function() {
-        const li = $(this).closest('li');
-        sources.push({'source': li.attr('class'), 'label': li.find('a').text(), specialFolders: true});
+        sources.push({'source': li.attr('class'), 'label': li.find('a').first().text(), allFolders: true});
     });
 
     const selected_sources = $('div', $('.adv_source_list'));
@@ -262,9 +251,8 @@ var get_adv_sources = function() {
     }
     selected_sources.each(function() {
         const source = this.className;
-        const mailboxSource = source.split('_').slice(0, 2).join('_');
-        if (!sources.find(s => s.source.indexOf(mailboxSource) > -1)) {
-            sources.push({'source': source, 'label': $('a', $(this)).text(), subFolders: $(this).data('subfolders')});
+        if (!sources.find(s => s.source === source)) {
+            sources.push({'source': source, 'label': $(this).text(), subFolders: $(this).data('subfolders')});
         }
     });
     return sources;
@@ -440,8 +428,6 @@ var send_requests = function(requests) {
 
         if (request['all_folders']) {
             params.push({name: 'all_folders', value: true});
-        } else if (request['all_special_folders']) {
-            params.push({name: 'all_special_folders', value: true});
         } else if (request['sub_folders']) {
             params.push({name: 'include_subfolders', value: true});
         }
@@ -504,10 +490,8 @@ var build_adv_search_requests = function(terms, sources, targets, times, other)
                     time = times[ti];
                     const config = {'source': source.source, 'time': time, 'other': other,
                         'targets': target_vals, 'terms': term_vals};
-                    if (source.allFolders) {
+                    if (source.allFolders || source.source.split('_').filter(part => part.trim() !== '').length === 2) {
                         config['all_folders'] = true;
-                    } else if (source.specialFolders) {
-                        config['all_special_folders'] = true;
                     } else if (source.subFolders) {
                         config['sub_folders'] = true;
                     }
@@ -564,7 +548,7 @@ var apply_saved_search = function() {
         }
     }
     for (var i=0, len=details['sources'].length; i < len; i++) {
-        add_source_to_list(details['sources'][i]['source'], details['sources'][i]['label']);
+        add_source_to_list(details['sources'][i]['source'], details['sources'][i]['label'], details['sources'][i]['subFolders'] || false);
     }
     for (var i=0, len=details['targets'].length; i < len; i++) {
         if (i == 0) {