fix(frontend): prevent archiving already archived messages

Author: christer77

modules/core/hm-mailbox.php

@@ -633,7 +633,7 @@ public function select_folder($folder) {
 
     public function is_archive_folder($id, $user_config, $current_folder) {
         if ($this->is_imap()) {
-            return $this->connection->is_archive_folder($id, $user_config, $current_folder);
+            return is_imap_archive_folder($id, $user_config, $current_folder);
         }
         return false;
     }

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/hm-imap.php

@@ -2668,15 +2668,5 @@ public function server_support_children_capability() {
             return false;
         }
 
-        public function is_archive_folder($id, $user_config, $current_folder) {
-            
-            if (isset($user_config->get('special_imap_folders', array())[$id]['archive'])) {
-                $archive_folder = $user_config->get('special_imap_folders', array())[$id]['archive'];
-                if (bin2hex($archive_folder) == $current_folder) {
-                    return true;
-                }                
-            }
-            return  false;
-        }
     }
 }

modules/imap/output_modules.php

@@ -385,14 +385,8 @@ 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>';
-            $txt .= '<a class="hlink text-decoration-none" id="unread_message" href="#">'.$this->trans('Unread').'</a>';
-            $txt .= '<a class="delete_link hlink text-decoration-none" id="delete_message" href="#">'.$this->trans('Delete').'</a>';
-            $txt .= '<div class="position-relative"><a class="hlink" id="copy_message" href="#">'.$this->trans('Copy').'</a><div class="move_to_location"></div></div>';
-            $txt .= '<div class="position-relative"><a class="hlink" id="move_message" href="#">'.$this->trans('Move').'</a><div class="move_to_location"></div></div>';
-                        
             if (!$this->get('is_archive_folder')) {
-                $txt .= '<a class="archive_link hlink text-decoration-none" id="archive_message" href="#">'.$this->trans('Archive').'</a>';
+                $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')){