Merge remote-tracking branch 'origin/master' into feature/emoji-reactions

Author: Revisto

composer.json

@@ -48,7 +48,7 @@
         "ezyang/htmlpurifier": "^4.17",
         "garethp/php-ews": "dev-master",
         "henrique-borba/php-sieve-manager": "^1.0",
-        "league/commonmark": "^2.4",
+        "league/commonmark": "^2.7",
         "paragonie/random_compat": "^2.0.18",
         "php": ">=8.1",
         "react/async": "^4.3.0",

composer.lock

@@ -1163,7 +1163,7 @@ public function process() {
                     $this->out('imap_service_name', $provider);
                 }
                 $this->out('just_saved_credentials', true);
-                Hm_Msgs::add("Server saved");
+                Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
             }
 
             if ($createProfile && $this->smtp_server_id && ($this->imap_server_id || $this->jmap_server_id)) {

modules/core/handler_modules.php

@@ -18,7 +18,7 @@ protected function output() {
         $res = '<li class="menu_search mb-2"><form method="get">';
         $res .= '<div class="input-group">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<a href="?page=search" class="input-group-text" id="basic-addon1">' . 
+            $res .= '<a href="?page=search" class="input-group-text" id="basic-addon1">' .
             '<i class="bi bi-search"></i>' .
             '</a>';
         }
@@ -635,7 +635,7 @@ protected function output() {
             format_data_sources($this->get('data_sources', array()), $this);
 
         if (!$this->get('disable_delete_prompt', DEFAULT_DISABLE_DELETE_PROMPT)) {
-            $res .= 'var hm_delete_prompt = function() { return confirm("'.$this->trans('Are you sure?').'"); };';
+            $res .= 'var hm_delete_prompt = function() { return confirm("'.$this->trans('Are you sure you wanto to delete this server?').'"); };';
         }
         else {
             $res .= 'var hm_delete_prompt = function() { return true; };';
@@ -1686,9 +1686,9 @@ protected function output() {
         $share_folder_modal .= '</thead>';
         $share_folder_modal .= '<tbody></tbody>';
         $share_folder_modal .= '</table>';
-        
+
         $share_folder_modal .= '</div>';
-        
+
         $share_folder_modal .= '<div class="col-lg-4 col-md-12">';
         $share_folder_modal .= '<form id="shareForm" action="" method="POST">';
         $share_folder_modal .= '<input type="hidden" name="server_id" id="server_id" value="">';

modules/core/output_modules.php

@@ -427,7 +427,7 @@ class Hm_Alert {
 
         const messageElement = document.createElement('div');
         messageElement.className = 'flex-grow-1 pe-4';
-        messageElement.textContent = message;
+        messageElement.innerHTML = message;
 
         alert.appendChild(iconContainer);
         alert.appendChild(messageElement);

modules/core/site.js

@@ -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/functions.php

@@ -734,7 +734,7 @@ public function process() {
 
                     if ($ceo_use_detect_ceo_fraud && hex2bin($form['folder']) == 'INBOX') {
                         if ($this->isCeoFraud($msg['to'], $msg['subject'], $msg['preview_msg'])) {
-                            
+
                             $folder = "Suspicious emails";
                             if (!count($mailbox->get_mailbox_status($folder))) {
                                 $mailbox->create_folder($folder);
@@ -750,7 +750,7 @@ public function process() {
                             $total--;
                         }
                     }
-                    
+
                     if ($msg) {
                         if (! $include_preview && isset($msg['preview_msg'])) {
                             $msg['preview_msg'] = "";
@@ -770,18 +770,18 @@ public function process() {
             $this->out('do_not_flag_as_read_on_open', $this->user_config->get('unread_on_open_setting', false));
         }
     }
-    public function isCeoFraud($email, $subject, $msg) {          
+    public function isCeoFraud($email, $subject, $msg) {
         // 1. Check Suspicious Terms or Requests
         $suspiciousTerms = explode(",", $this->user_config->get("ceo_suspicious_terms_setting"));
         if ($this->detectSuspiciousTerms($msg, $suspiciousTerms) || $this->detectSuspiciousTerms($subject, $suspiciousTerms)) {
-           
+
             // 2. check ceo_rate_limit
             $amounts = $this->extractAmountFromEmail($msg);
             $amountLimit = $this->user_config->get("ceo_amount_limit_setting");
             $isUpperAmount = array_reduce($amounts, function ($carry, $value) use ($amountLimit) {
                 return $carry || $value > $amountLimit;
             }, false);
-            
+
             if ($isUpperAmount) {
                 if ($this->user_config->get("ceo_use_trusted_contact_setting")) {
                     $contacts = $this->get('contact_store');
@@ -815,16 +815,16 @@ private function isEmailInTrustedDomainList($trustedDomain, $email) {
     }
     private function extractAmountFromEmail($emailBody) {
         $pattern = '/\b\d+(?:,\d+)?\.?\d*\s*(?:USD|dollars?|US\$?|EUR|euros?|€|JPY|yen|¥|GBP|pounds?|£|CAD|CAD\$|AUD|AUD\$)/i';
-    
+
         preg_match_all($pattern, $emailBody, $matches);
-    
+
         if ($matches) {
-            return array_map(function($value) { 
-                return floatval(preg_replace('/[^0-9]/', '', $value)); 
+            return array_map(function($value) {
+                return floatval(preg_replace('/[^0-9]/', '', $value));
             }, $matches[0]);
         }
     }
-    
+
 }
 
 /**
@@ -1135,7 +1135,7 @@ public function process() {
      * @param string $folder The folder where the messages currently reside.
      * @param array $specials Special folder information for handling specific actions.
      * @param array $server_details Details of the server, including its unique ID and settings.
-     * 
+     *
      * @return array Returns an associative array with:
      *   - 'error' => bool Indicates if an error occurred during the operation.
      *   - 'moved' => array List of moved message identifiers in a specific format.
@@ -1182,7 +1182,7 @@ private function perform_action($mailbox, $action_type, $uids, $folder, $special
      * @param string $action_type The action type that determines which special folder to retrieve (e.g., 'delete', 'archive').
      * @param array $specials An associative array of special folder names, like 'trash', 'archive', and 'junk'.
      * @param array $server_details Details of the server, including its name.
-     * 
+     *
      * @return string|false Returns the special folder name if found, or false if no corresponding folder is configured.
      */
     private function get_special_folder($action_type, $specials, $server_details) {
@@ -1273,7 +1273,7 @@ public function process() {
         $offset = 0;
         $list_page = 1;
         $maxPerSource = round($limit / count($data_sources));
-        
+
         if (isset($this->request->get['list_page'])) {
             $list_page = (int) $this->request->get['list_page'];
             if ($list_page && $list_page > 1) {
@@ -1373,7 +1373,7 @@ public function process() {
             $offsets = explode(',', $offsets);
         }
         $searchTerms[] = [search_since_based_on_setting($this->user_config), $date];
-        
+
         $result = getCombinedMessagesLists($data_sources, [
             'cache' => $this->cache,
             'session' => $this->session,
@@ -1463,7 +1463,7 @@ public function process() {
                     'type' => 'jmap',
                     'port' => false,
                     'tls' => false));
-                Hm_Msgs::add('Added server!');
+                Hm_Msgs::add("Added server!. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
                 $this->session->record_unsaved('JMAP server added');
             }
             else {
@@ -1693,12 +1693,12 @@ class Hm_Handler_load_imap_folders_permissions extends Hm_Handler_Module {
      */
     public function process() {
         list($success, $form) = $this->process_form(array('imap_server_id','imap_folder_uid','imap_folder'));
-        
+
         if ($success && !empty($form['imap_server_id']) && !empty($form['imap_folder'])  && !empty($form['imap_folder_uid'])) {
             Hm_IMAP_List::init($this->user_config, $this->session);
             $server = Hm_IMAP_List::dump($form['imap_server_id'], true);
             $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
-            
+
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $server['user'], $server['pass']);
             $permissions = $imap->get_acl($form['imap_folder']);
             $this->out('imap_folders_permissions', $permissions);
@@ -1716,13 +1716,13 @@ class Hm_Handler_set_acl_to_imap_folders extends Hm_Handler_Module {
      */
     public function process() {
         list($success, $form) = $this->process_form(array('imap_server_id','imap_folder','identifier','permissions','action'));
-        
+
         if ($success && !empty($form['imap_server_id']) && !empty($form['identifier'])  && !empty($form['permissions']) && !empty($form['action'])) {
 
             Hm_IMAP_List::init($this->user_config, $this->session);
             $server = Hm_IMAP_List::dump($form['imap_server_id'], true);
             $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
-            
+
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $server['user'], $server['pass']);
             if($form['action'] === 'add') {
                 $response = $imap->set_acl($form['imap_folder'], $form['identifier'], $form['permissions']);
@@ -1903,7 +1903,7 @@ public function process() {
         if (isset($this->request->post['imap_connect'])) {
             list($success, $form) = $this->process_form(array('imap_server_id'));
             $imap_details = Hm_IMAP_List::dump($form['imap_server_id'], true);
-            if ($success && $imap_details) {         
+            if ($success && $imap_details) {
                 if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', DEFAULT_ENABLE_SIEVE_FILTER)) {
                     try {
                         list($sieve_host, $sieve_port) = parse_sieve_config_host($imap_details['sieve_config_host']);
@@ -2325,9 +2325,15 @@ public function process() {
         if (isset($this->request->post['hide_imap_server'])) {
             list($success, $form) = $this->process_form(array('imap_server_id'));
             if ($success) {
-                Hm_IMAP_List::toggle_hidden($form['imap_server_id'], (bool) $this->request->post['hide_imap_server']);
-                Hm_Msgs::add('Hidden status updated');
-                $this->session->record_unsaved(sprintf('%s server hidden status updated', imap_server_type($form['imap_server_id'])));
+                $action = (bool) $this->request->post['hide_imap_server'];
+                $server_type = imap_server_type($form['imap_server_id']);
+                Hm_IMAP_List::toggle_hidden($form['imap_server_id'], $action);
+                if ($action) {
+                    Hm_Msgs::add(sprintf('%s server has been hidden', $server_type));
+                } else {
+                    Hm_Msgs::add(sprintf('%s server is now visible', $server_type));
+                }
+                $this->session->record_unsaved(sprintf('%s server visibility updated', $server_type));
             }
         }
     }
@@ -2495,7 +2501,7 @@ function process_ceo_use_detect_ceo_fraud_callback($val) { return $val; }
         function process_ceo_use_trusted_contact_callback($val) { return $val; }
         function process_ceo_suspicious_terms_callback($val) { return $val; }
         function process_ceo_amount_limit_callback($val) { return $val; }
-        
+
         process_site_setting('ceo_use_detect_ceo_fraud', $this, 'process_ceo_use_detect_ceo_fraud_callback');
         process_site_setting('ceo_use_trusted_contact', $this, 'process_ceo_use_trusted_contact_callback');
         process_site_setting('ceo_suspicious_terms', $this, 'process_ceo_suspicious_terms_callback');

modules/imap/handler_modules.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
          */
@@ -1923,16 +1925,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);
+                }
             }
         }
 
@@ -2669,7 +2686,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()) {
@@ -2692,6 +2709,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/hm-imap.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>';