hardcode the auto-blocking for test

Author: Grandi0z

modules/imap/handler_modules.php

@@ -2411,13 +2411,16 @@ public function process() {
                         ));
 
                         if ($imap_account && isset($imap_account['sieve_config_host'])) {
-                            delayed_debug_log('Auto-block: Starting auto-block process');
+                            delayed_debug_log('Auto-block: Starting auto-block process', array(
+                                'junk_folder' => $junk_folder
+                            ));
                             $auto_block_result = auto_block_spam_sender(
                                 $this->user_config,
                                 $this->config,
                                 $form['imap_server_id'],
                                 $message_data,
-                                $spam_reason
+                                $spam_reason,
+                                $junk_folder
                             );
                             if (!$auto_block_result['success']) {
                                 $result['error'] .= 'Auto-block failed: ' . $auto_block_result['error'] . '; ';

modules/imap/spam_report_config.php

@@ -122,7 +122,11 @@ function is_spam_service_enabled($service_name) {
  * @return boolean True if auto-blocking is enabled
  */
 function is_auto_block_spam_enabled($user_config) {
-    return $user_config->get('auto_block_spam_sender', true);
+    // return $user_config->get('auto_block_spam_scope', 'sender');
+    //return $user_config->get('auto_block_spam_sender', true);
+    // HARDCODED FOR TESTING - TODO: Revert to user_config after testing
+    return true;
+    // Original: return $user_config->get('auto_block_spam_sender', true);
 }
 
 /**
@@ -131,7 +135,10 @@ function is_auto_block_spam_enabled($user_config) {
  * @return string Auto-block action
  */
 function get_auto_block_spam_action($user_config) {
-    return $user_config->get('auto_block_spam_action', 'move_to_junk');
+    //return $user_config->get('auto_block_spam_action', 'move_to_junk');
+    // HARDCODED FOR TESTING - TODO: Revert to user_config after testing
+    return 'move_to_junk';
+    // Original: return $user_config->get('auto_block_spam_action', 'move_to_junk');
 }
 
 /**
@@ -140,5 +147,7 @@ function get_auto_block_spam_action($user_config) {
  * @return string Auto-block scope
  */
 function get_auto_block_spam_scope($user_config) {
-    return $user_config->get('auto_block_spam_scope', 'sender');
+    // HARDCODED FOR TESTING - TODO: Revert to user_config after testing
+    return 'sender';
+    // Original: return $user_config->get('auto_block_spam_scope', 'sender');
 } 

modules/imap/spam_report_utils.php

@@ -17,9 +17,10 @@
  * @param string $imap_server_id IMAP server ID
  * @param array $message_data Message data containing sender information
  * @param string $spam_reason Reason for spam report
+ * @param string $junk_folder Junk folder name (dynamically detected)
  * @return array Result of auto-block operation
  */
-function auto_block_spam_sender($user_config, $site_config, $imap_server_id, $message_data, $spam_reason) {
+function auto_block_spam_sender($user_config, $site_config, $imap_server_id, $message_data, $spam_reason, $junk_folder = 'Junk') {
     try {
         // Check if auto-blocking is enabled
         if (!is_auto_block_spam_enabled($user_config)) {
@@ -139,6 +140,12 @@ function auto_block_spam_sender($user_config, $site_config, $imap_server_id, $me
         // Map action to Sieve action
         $sieve_action = map_auto_block_action_to_sieve($action, $user_config, $imap_server_id);
 
+        delayed_debug_log('Auto-block: Using junk folder', array(
+            'junk_folder' => $junk_folder,
+            'sieve_action' => $sieve_action,
+            'action' => $action
+        ));
+        
         if (!is_array($blocked_senders)) {
             $blocked_senders = array();
         }
@@ -151,7 +158,8 @@ function auto_block_spam_sender($user_config, $site_config, $imap_server_id, $me
                     $sieve_action,
                     $imap_server_id,
                     $blocked_sender,
-                    'Auto-blocked after spam report: ' . $spam_reason
+                    'Auto-blocked after spam report: ' . $spam_reason,
+                    $junk_folder
                 );
             } elseif (is_array($blocked_list_actions) && array_key_exists($blocked_sender, $blocked_list_actions)) {
                 $reject_message = '';
@@ -165,15 +173,18 @@ function auto_block_spam_sender($user_config, $site_config, $imap_server_id, $me
                     $action_type,
                     $imap_server_id,
                     $blocked_sender,
-                    $reject_message
+                    $reject_message,
+                    $junk_folder
                 );
             } else {
                 $actions = block_filter(
                     $filter,
                     $user_config,
                     'default',
                     $imap_server_id,
-                    $blocked_sender
+                    $blocked_sender,
+                    '',
+                    $junk_folder
                 );
             }
             if (is_array($blocked_list_actions)) {

modules/sievefilters/functions.php

@@ -348,7 +348,7 @@ function default_reject_message($user_config, $imap_server_id)
 }
 
 if (!hm_exists('block_filter')) {
-    function block_filter($filter, $user_config, $action, $imap_server_id, $sender, $custom_reject_message = '')
+    function block_filter($filter, $user_config, $action, $imap_server_id, $sender, $custom_reject_message = '', $junk_folder = 'Junk')
     {
         $ret = ['action' => $action];
 
@@ -400,8 +400,13 @@ function block_filter($filter, $user_config, $action, $imap_server_id, $sender,
         }
         elseif ($default_behaviour == 'Move') {
             $filter->addRequirement('fileinto');
+            delayed_debug_log('Sieve filter: Moving to folder', array(
+                'folder' => $junk_folder,
+                'sender' => $sender,
+                'action' => $action
+            ));
             $custom_condition->addAction(
-                new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['mailbox' => 'Blocked'])
+                new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['mailbox' => $junk_folder])
             );
         }