refactor(sieve_filters): Update sieve filters helpers

camilevahviraki · camilevahviraki · commit b6c50e7c8026 · 2025-10-27T22:31:55.000+02:00
diff --git a/modules/core/navigation/routes.js b/modules/core/navigation/routes.js
@@ -2,91 +2,87 @@
 NOTE: Handlers are registered as strings instead of functions because some modules might not be enabled, making their pages' handler functions unaccessible.
 */
 const modulesRoutes = [
-  {
-    page: "hello_world",
-    handler: "applyHelloWorldPageHandlers",
-  },
-  {
-    page: "message_list",
-    handler: "applyMessageListPageHandlers",
-  },
-  {
-    page: "message",
-    handler: "applyMessagePageHandlers",
-  },
-  {
-    page: "compose",
-    handler: "applyComposePageHandlers",
-  },
-  {
-    page: "servers",
-    handler: "applyServersPageHandlers",
-  },
-  {
-    page: "settings",
-    handler: "applySettingsPageHandlers",
-  },
-  {
-    page: "search",
-    handler: "applySearchPageHandlers",
-  },
-  {
-    page: "home",
-    handler: "applyHomePageHandlers",
-  },
-  {
-    page: "info",
-    handler: "applyInfoPageHandlers",
-  },
-  {
-    page: "calendar",
-    handler: "applyCalendarPageHandlers",
-  },
-  {
-    page: "advanced_search",
-    handler: "applyAdvancedSearchPageHandlers",
-  },
-  {
-    page: "contacts",
-    handler: "applyContactsPageHandlers",
-  },
-  {
-    page: "history",
-    handler: "applyHistoryPageHandlers",
-  },
-  {
-    page: "folders",
-    handler: "applyFoldersPageHandlers",
-  },
-  {
-    page: "folders_subscription",
-    handler: "applyFoldersSubscriptionPageHandlers",
-  },
-  {
-    page: "pgp",
-    handler: "applyPgpPageHandlers",
-  },
-  {
-    page: "profiles",
-    handler: "applyProfilesPageHandler",
-  },
-  {
-    page: "block_list",
-    handler: "applyBlockListPageHandlers",
-  },
-  {
-    page: "sieve_filters",
-    handler: "applySieveFiltersPageHandler",
-  },
-  {
-    page: "message",
-    handler: "applySieveFiltersPageHandler",
-  },
-  {
-    page: "shortcuts",
-    handler: "applyShortcutsPageHandlers",
-  },
-];
+    {
+        page: 'hello_world',
+        handler: 'applyHelloWorldPageHandlers'
+    },
+    {
+        page: 'message_list',
+        handler: 'applyMessageListPageHandlers'
+    },
+    {
+        page: 'message',
+        handler: 'applyMessagePageHandlers'
+    },
+    {
+        page: 'compose',
+        handler: 'applyComposePageHandlers'
+    },
+    {
+        page: 'servers',
+        handler: 'applyServersPageHandlers'
+    },
+    {
+        page: 'settings',
+        handler: 'applySettingsPageHandlers'
+    },
+    {
+        page: 'search',
+        handler: 'applySearchPageHandlers'
+    },
+    {
+        page: 'home',
+        handler: 'applyHomePageHandlers'
+    },
+    {
+        page: 'info',
+        handler: 'applyInfoPageHandlers'
+    },
+    {
+        page: 'calendar',
+        handler: 'applyCalendarPageHandlers'
+    },
+    {
+        page: 'advanced_search',
+        handler: 'applyAdvancedSearchPageHandlers'
+    },
+    {
+        page: 'contacts',
+        handler: 'applyContactsPageHandlers'
+    },
+    {
+        page: 'history',
+        handler: 'applyHistoryPageHandlers'
+    },
+    {
+        page: 'folders',
+        handler: 'applyFoldersPageHandlers'
+    },
+    {
+        page: 'folders_subscription',
+        handler: 'applyFoldersSubscriptionPageHandlers'
+    },
+    {
+        page: 'pgp',
+        handler: 'applyPgpPageHandlers'
+    },
+    {
+        page: 'profiles',
+        handler: 'applyProfilesPageHandler'
+    },
+    {
+        page: 'block_list',
+        handler: 'applyBlockListPageHandlers'
+    },
+    {
+        page: 'sieve_filters',
+        handler: 'applySieveFiltersPageHandler'
+    },
+    {
+        page: 'shortcuts',
+        handler: 'applyShortcutsPageHandlers'
+    }
+]
 
 /* 
 Now let's validate and use handlers that are given.
diff --git a/modules/core/site.js b/modules/core/site.js
@@ -2752,7 +2752,8 @@ const Hm_Filters = (function (my) {
       ],
       function (res) {
         if (Object.keys(res.script_details).length === 0) {
-          window.location = window.location;
+           window.location.href = "?page=sieve_filters";
+          
         } else {
           edit_script_modal.open();
           $(".modal_sieve_script_textarea").val(res.script_details.gen_script);
@@ -2941,13 +2942,15 @@ class Hm_Filter_Modal extends Hm_Modal {
     this.addFooterBtn("Save", "btn-primary ms-auto", async () => {
       let result = save_filter(current_account);
       if (result) {
+        Hm_Notices.show("Filter saved", "success");
         this.hide();
       }
     });
 
     this.addFooterBtn("Convert to code", "btn-warning", async () => {
       let result = save_filter(current_account, true);
       if (result) {
+        Hm_Notices.show("Filter saved", "success");
         this.hide();
       }
     });
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
@@ -155,7 +155,7 @@
 add_handler('ajax_imap_message_content', 'save_imap_cache',  true);
 add_handler('ajax_imap_message_content', 'save_imap_servers',  true);
 add_handler('ajax_imap_message_content', 'close_session_early',  true, 'core');
-// add_output('ajax_imap_message_content', 'filter_message_headers', true);
+add_output('ajax_imap_message_content', 'filter_message_headers', true);
 add_output('ajax_imap_message_content', 'filter_message_body', true);
 add_output('ajax_imap_message_content', 'filter_message_struct', true);
 
@@ -337,6 +337,7 @@
         'do_not_flag_as_read_on_open' => array(FILTER_VALIDATE_BOOLEAN, false),
         'ajax_imap_folders_permissions' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY),
         'move_responses' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY),
+        'mailbox_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     ),
 
     'allowed_get' => array(
diff --git a/modules/imap/site.js b/modules/imap/site.js
@@ -970,23 +970,21 @@ var imap_move_copy = function(e, action, context) {
     return false;
 };
 
-
 $(function () {
     $(document).on("submit", "#create-filter-form", function (e) {
         e.preventDefault();
         const current_account = $(this).attr("account");
-        console.log("Current account mailbox:", current_account);
-        
-        
-        const edit_filter_modal = new Hm_Filter_Modal();
+
+        const edit_filter_modal = new Hm_Filter_Modal(current_account);
         hm_sieve_button_events(edit_filter_modal);
         edit_filter_modal.setTitle("Add Filter for message like this");
+        const add_filter_condition = Hm_Filters.add_filter_condition;
+        const add_filter_action = Hm_Filters.add_filter_action;
 
         const $form = $(this);
         const $btn = $form.find("#create_filter").prop("disabled", true);
         const data = {};
 
-        // collect checked conditions
         if ($form.find("#use_from").is(":checked"))
             data["from"] = $form.find('input[name="from"]').val();
         if ($form.find("#use_to").is(":checked"))
@@ -997,21 +995,58 @@ $(function () {
             data["reply-to"] = $form.find('input[name="reply-to"]').val();
 
         if ($.isEmptyObject(data)) {
-            Hm_Notices.show("Please check at least one condition to create a filter.", "danger");
-            $btn.prop("disabled", false);
-            return;
-        }
+            Hm_Notices.show(
+            "Please check at least one condition to create a filter.",
+            "danger"
+        );
+        $btn.prop("disabled", false);
+        return;
+    }
 
-        function encodeParams(obj) {
-            return Object.entries(obj)
-            .map(([k, v]) => encodeURIComponent(k) + "=" + encodeURIComponent(v))
-            .join("&");
-        }
+    edit_filter_modal.open();
+
+    // After modal content is ready, auto-fill conditions
+    setTimeout(() => {
+        const allFields = hm_sieve_condition_fields();
+        const availableFields = [
+          ...allFields.Message.map((f) => f.name),
+          ...allFields.Header.map((f) => f.name),
+        ];
 
-        const params = encodeParams(data);
-        edit_filter_modal.open();
-        
+        for (const [key, value] of Object.entries(data)) {
+          // If key is not in available fields, skip it
+          if (!availableFields.includes(key)) {
+            console.warn("Skipping unrecognized field:", key);
+            continue;
+          }
 
+          add_filter_condition();
+
+          const $lastRow = $(".sieve_list_conditions_modal tr").last();
+          const $selectField = $lastRow.find(".add_condition_sieve_filters");
+          const $selectOp = $lastRow.find(".condition_options");
+          const $inputVal = $lastRow.find('input[name="sieve_selected_option_value[]"]');
+          $selectField.val(key);
+          $selectOp.val("Contains");
+          $inputVal.val(value);
+
+            }
+
+            if (data["reply-to"]) {
+
+                add_filter_action("autoreply");
+
+                const $lastRow = $(".filter_actions_modal_table tr").last();
+                const $select = $lastRow.find(".sieve_actions_select");
+                $select.val("autoreply").trigger("change");
+
+                // Focus the input field for the message
+                const $input = $lastRow.find('input[name="sieve_selected_action_value[]"]');
+                if ($input.length) {
+                    $input.focus();
+                }
+            }
+        }, 250);
     });
 });
 
diff --git a/modules/sievefilters/site.js b/modules/sievefilters/site.js
