Merge pull request #1494 from christer77/fix-delete-folder

fix(other): reviewing delete action on folders

Author: kroky

modules/imap/functions.php

@@ -135,7 +135,7 @@ function format_imap_folder_section($folders, $id, $output_mod, $with_input = fa
 
     foreach ($folders as $folder_name => $folder) {
         $folder_name = bin2hex($folder_name);
-        $results .= '<li class="imap_'.$id.'_'.$output_mod->html_safe($folder_name).'">';
+        $results .= '<li class="imap_'.$id.'_'.$output_mod->html_safe($folder_name).'" data-number-children="'.$output_mod->html_safe($folder['number_of_children']).'">';
         if ($folder['children']) {
             $results .= '<a href="#" class="imap_folder_link expand_link d-inline-flex" data-target="imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"><i class="bi bi-plus-circle-fill"></i></a>';
         }

modules/imap/hm-imap.php

@@ -182,6 +182,8 @@ class Hm_IMAP extends Hm_IMAP_Cache {
         public $folder_state = false;
         private $scramAuthenticator;
         private $namespace_count = 0;
+
+        protected $list_sub_folders = [];
         /**
          * constructor
          */
@@ -1753,16 +1755,31 @@ public function delete_mailbox($mailbox) {
                 $this->debug[] = 'Delete mailbox not permitted in read only mode';
                 return false;
             }
-            $command = 'DELETE "'.str_replace('"', '\"', $this->utf7_encode($mailbox))."\"\r\n";
-            $this->send_command($command);
-            $result = $this->get_response(false);
-            $status = $this->check_response($result, false);
-            if ($status) {
-                return true;
+            $this->list_sub_folders[] = $mailbox;
+            $this->get_recursive_subfolders($mailbox, true);
+            $this->list_sub_folders = array_reverse($this->list_sub_folders);
+            foreach ($this->list_sub_folders as $key => $del_folder) {
+                $command = 'DELETE "'.str_replace('"', '\"', $this->utf7_encode($del_folder))."\"\r\n";
+                $this->send_command($command);
+                $result = $this->get_response(false);
+                $status = $this->check_response($result, false);
+                if ($status) {
+                    unset($this->list_sub_folders[$key]);
+                } else {
+                    $this->debug[] = str_replace('A'.$this->command_count, '', $result[0]);
+                    return false;
+                }
             }
-            else {
-                $this->debug[] = str_replace('A'.$this->command_count, '', $result[0]);
-                return false;
+            return true;
+        }
+
+        public function get_recursive_subfolders($parentFolder, $is_delete_action) {
+            $infoFolder = $this->get_folder_list_by_level($parentFolder, false, false, $is_delete_action);
+            if ($infoFolder) {
+                foreach (array_keys($infoFolder) as $folder) {
+                    $this->list_sub_folders[] = $folder;
+                    $this->get_recursive_subfolders($folder, $is_delete_action);
+                }
             }
         }
 
@@ -2499,7 +2516,7 @@ public function get_mailbox_page($mailbox, $sort, $rev, $filter, $offset=0, $lim
          * @param string $level mailbox name or empty string for the top level
          * @return array list of matching folders
          */
-        public function get_folder_list_by_level($level='', $only_subscribed=false, $with_input = false) {
+        public function get_folder_list_by_level($level='', $only_subscribed=false, $with_input = false, $is_delete_action = false) {
             $result = array();
             $folders = array();
             if ($this->server_support_children_capability()) {
@@ -2522,6 +2539,9 @@ public function get_folder_list_by_level($level='', $only_subscribed=false, $wit
                 if ($with_input) {
                     $result[$name]['special'] = $folder['special'];
                 }
+                if ($folder['can_have_kids'] && !$is_delete_action) {
+                    $result[$name]['number_of_children'] = count($this->get_folder_list_by_level($folder['name'], false, false, $is_delete_action));
+                }
             }
             if ($only_subscribed || $with_input) {
                 $subscribed_folders = array_column($this->get_mailbox_list(true, children_capability:$this->server_support_children_capability()), 'name');

modules/imap_folders/modules.php

@@ -422,6 +422,7 @@ protected function output() {
                                 <a href="#" class="close">'.$this->trans('Cancel').'</a>
                             </li>
                         </ul>
+                        <input type="hidden" value="" id="children_number" />
                         <input type="hidden" value="" id="delete_source" />
                         <input type="button" id="delete_folder" class="btn btn-danger" value="'.$this->trans('Delete').'">
                      </div></div>';

modules/imap_folders/site.js

@@ -68,11 +68,22 @@ var set_folders_page_value = function(id, container, target, id_dest) {
     }
     $('.'+target).html(link);
     $('#'+id_dest).val(id);
+    if (id_dest === 'delete_source') {
+        const folder = document.querySelector(`.${id}`);
+        if (folder) {
+            const numberChildren = folder.getAttribute('data-number-children');
+            $('#children_number').val(numberChildren);
+        } else {
+            $('#children_number').val(0);
+        }
+        
+    }
     list.hide();
 
 };
 
 var folder_page_delete = function() {
+    var children_number = parseInt($('#children_number').val());
     var val = $('#delete_source').val();
     var id = $('#imap_server_folder').val();
     if (!id.length) {
@@ -83,21 +94,36 @@ var folder_page_delete = function() {
         Hm_Notices.show($('#delete_folder_error').val(), 'danger');
         return;
     }
-    if (!confirm($('#delete_folder_confirm').val())) {
-        return;
+
+    let message = "";
+    if (children_number) {
+        message = `<p>${hm_trans('This folder contains '+ children_number +' sub-folders.')}</p>`;
     }
-    Hm_Ajax.request(
-        [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folders_delete'},
-        {'name': 'imap_server_id', value: id},
-        {'name': 'folder', 'value': val}],
-        function(res) {
-            if (res.imap_folders_success) {
-                $('#delete_source').val('');
-                $('.selected_delete').html('');
-                Hm_Folders.reload_folders(true);
+
+    const modal = new Hm_Modal({
+        modalId: 'emptySubjectBodyModal',
+        title: hm_trans("Deletion confirmation"),
+        btnSize: 'sm'
+    });
+
+    modal.addFooterBtn(hm_trans('Delete anyway'), 'btn-warning', handleDeleteFolder);
+    modal.setContent(message + $('#delete_folder_confirm').val());
+    modal.open();
+    function handleDeleteFolder() {
+        Hm_Ajax.request(
+            [{'name': 'hm_ajax_hook', 'value': 'ajax_imap_folders_delete'},
+            {'name': 'imap_server_id', value: id},
+            {'name': 'folder', 'value': val}],
+            function(res) {
+                if (res.imap_folders_success) {
+                    $('#delete_source').val('');
+                    $('.selected_delete').html('');
+                    Hm_Folders.reload_folders(true);
+                }
             }
-        }
-    );
+        );
+        modal.hide();
+    };
 };
 
 var folder_page_rename = function() {