Merge pull request #1623 from christer77/prevent-archiving-already-archived-messages

fix(frontend): prevent archiving already archived messages

Author: kroky

modules/core/hm-mailbox.php

@@ -631,6 +631,13 @@ public function select_folder($folder) {
         return true;
     }
 
+    public function is_archive_folder($id, $user_config, $current_folder) {
+        if ($this->is_imap()) {
+            return is_imap_archive_folder($id, $user_config, $current_folder);
+        }
+        return false;
+    }
+
     public function get_config() {
         return $this->config;
     }

modules/imap/functions.php

@@ -1651,3 +1651,17 @@ function save_sent_msg($handler, $imap_id, $mailbox, $imap_details, $msg, $msg_i
     }
     return [$uid, $sent_folder];
 }}
+
+if (!hm_exists('is_imap_archive_folder')) {
+function is_imap_archive_folder($server_id, $user_config, $current_folder) {
+    $special_folders = $user_config->get('special_imap_folders', array());
+    
+    if (isset($special_folders[$server_id]['archive'])) {
+        $archive_folder = $special_folders[$server_id]['archive'];
+        if (bin2hex($archive_folder) == $current_folder) {
+            return true;
+        }
+    }
+    
+    return false;
+}}

modules/imap/handler_modules.php

@@ -1925,6 +1925,8 @@ public function process() {
                     $save_reply_text = true;
                 }
                 $msg_headers = $mailbox->get_message_headers(hex2bin($form['folder']), $form['imap_msg_uid']);
+
+                $this->out('is_archive_folder', $mailbox->is_archive_folder($form['imap_server_id'], $this->user_config, $form['folder']));
                 $this->out('folder_status', array('imap_'.$form['imap_server_id'].'_'.$form['folder'] => $mailbox->get_folder_state()));
                 $this->out('msg_struct', $msg_struct);
                 $this->out('list_headers', get_list_headers($msg_headers));

modules/imap/hm-imap.php

@@ -2667,5 +2667,6 @@ public function server_support_children_capability() {
 
             return false;
         }
+
     }
 }

modules/imap/output_modules.php

@@ -385,7 +385,9 @@ protected function output() {
             $txt .= '<a class="delete_link hlink text-decoration-none btn btn-sm btn-outline-secondary" id="delete_message" href="#">'.$this->trans('Delete').'</a>';
             $txt .= '<div class="position-relative"><a class="hlink text-decoration-none btn btn-sm btn-outline-secondary dropdown-toggle" id="copy_message" href="#" data-bs-toggle="dropdown">'.$this->trans('Copy').'</a><div class="move_to_location dropdown-menu" data-bs-auto-close="outside"></div></div>';
             $txt .= '<div class="position-relative"><a class="hlink text-decoration-none btn btn-sm btn-outline-secondary dropdown-toggle" id="move_message" href="#" data-bs-toggle="dropdown">'.$this->trans('Move').'</a><div class="move_to_location dropdown-menu" data-bs-auto-close="outside"></div></div>';
-            $txt .= '<a class="archive_link hlink text-decoration-none btn btn-sm btn-outline-secondary" id="archive_message" href="#">'.$this->trans('Archive').'</a>';
+            if (!$this->get('is_archive_folder')) {
+                $txt .= '<a class="archive_link hlink text-decoration-none btn btn-sm btn-outline-secondary" id="archive_message" href="#">'.$this->trans('Archive').'</a>';
+            }
 
             if($this->get('tags')){
                 $txt .= tags_dropdown($this, $headers);