fix(backend): refactor clas usage teting with postale

Author: Shadow243

config/app.php

@@ -430,10 +430,11 @@
     | only one email source, this option is less likely to be a problem.
     |
     |
-    | 'allow_session_cache' => env('ALLOW_SESSION_CACHE', false),
-    | 'cache_class' => env('CACHE_CLASS')
     */
 
+    'allow_session_cache' => env('ALLOW_SESSION_CACHE', false),
+
+    'cache_class' => env('CACHE_CLASS'),
 
     /*
     | -------------

modules/sievefilters/functions.php

@@ -451,7 +451,6 @@ function block_filter_dropdown ($mod, $mailbox_id = null, $with_scope = true, $s
 if (!hm_exists('get_blocked_senders_array')) {
     function get_blocked_senders_array($current_script, $scripts)
     {
-        exit(var_dump($scripts, $current_script));
         try {
             if (!is_array($scripts) || array_search('blocked_senders', $scripts, true) === false) {
                 return [];
@@ -461,7 +460,6 @@ function get_blocked_senders_array($current_script, $scripts)
                 // $blocked_list = prepare_sieve_script ($current_script);
                 $base64_obj = str_replace("# ", "", preg_split('#\r?\n#', $current_script, 0)[1]);
                 $blocked_list = json_decode(base64_decode($base64_obj));
-                exit(var_dump($scripts, $current_script, $blocked_list));
                 if (!$blocked_list) {
                     return [];
                 }
@@ -590,7 +588,7 @@ function get_all_scripts($imapServer, $load_current = true, $return_only = null)
                 }
                 $current_script = '';
                 if($load_current) {
-                    $current_script = $client->getScript('blocked_senders');
+                    $current_script = SieveConnectionPool::getScript($imapServer, 'blocked_senders');
                 }
                 if ($return_only === 'scripts') return $scripts;
                 if ($return_only === 'current_script') return $current_script;

modules/sievefilters/hm-sieve-pool.php

@@ -87,7 +87,6 @@ public static function getScript($key, string $scriptName)
 
         // Try to fetch from persistent cache
         $cached = self::$cache->get($cacheKey, false, true);
-        // global $session;
 
         if ($cached && isset($cached['time']) && (time() - $cached['time']) < self::$scriptCacheTTL) {
             return $cached['data'];
@@ -103,9 +102,6 @@ public static function getScript($key, string $scriptName)
             'time' => time()
         ], self::$scriptCacheTTL, true);
 
-        // exit(var_dump("CACHE HIT", self::$cache->get($cacheKey, 'HEHEHEHE', true)));
-        // exit(var_dump("CACHE HIT", self::$cache->type));
-        // die();
         return $script;
     }
 
@@ -135,7 +131,7 @@ private static function isAlive($key)
      */
     private static function connectServer(array $serverConfig)
     {
-        $client = new ClientWithTimeout($serverConfig['host'], $serverConfig['port']);
+        $client = new Client($serverConfig['host'], $serverConfig['port']);
         $client->connect(
             $serverConfig['username'],
             $serverConfig['password'],
@@ -146,11 +142,3 @@ private static function connectServer(array $serverConfig)
         return $client;
     }
 }
-
-class ClientWithTimeout extends Client
-{
-    // public function getSocket()
-    // {
-    //     return $this->sock;
-    // }
-}

modules/sievefilters/modules.php

@@ -1236,14 +1236,10 @@ protected function output() {
         }
         $default_behaviour_html .= '<button class="submit_default_behavior btn btn-primary">' . $this->trans('Submit') . '</button></div></div>';
         $client  = SieveConnectionPool::get($mailbox['id']);
-        // $current_script = SieveConnectionPool::getScript($mailbox['id'], 'blocked_senders');
         $current_script = SieveConnectionPool::getScript($mailbox['id'], 'blocked_senders');
-        // $client->getScript('blocked_senders');
         $scripts = $client->listScripts();
-        exit(var_dump($scripts, $current_script));//SieveConnectionPool::get($imapServer);
         list($scripts, $current_script) = get_all_scripts($mailbox['id'], true);
         $blocked_senders = get_blocked_senders_array($current_script, $scripts);
-        exit(var_dump($blocked_senders));
         $num_blocked = $blocked_senders ? sizeof($blocked_senders) : 0;
         $res = '<div class="sievefilters_accounts_item">';
         $res .= '<div class="sievefilters_accounts_title settings_subtitle py-2 border-bottom cursor-pointer d-flex justify-content-between" data-num-blocked="' . $num_blocked . '">' . $mailbox['name'];
@@ -1466,7 +1462,7 @@ public function process() {
         }
 
         try {
-            $current_script = get_all_scripts($this->config, $this->user_config, $imap_account, true, 'current_script');
+            list($scripts, $current_script) = get_all_scripts($form['imap_server_id'], true);
 
             $blocked_senders = [];
             if ($current_script != '') {
@@ -1551,6 +1547,7 @@ public function process()
         }
         // set the sieve connection pool with the sieve accounts configs
         if (!empty($sieve_accounts_configs)) {
+            SieveConnectionPool::setCache($this->cache);
             SieveConnectionPool::setConfig($sieve_accounts_configs);
         }
         if (isset($accounts[$form['imap_server_id']])) {
@@ -1574,7 +1571,8 @@ public function process()
 
         $mailbox = Hm_IMAP_List::get_connected_mailbox($form['imap_server_id'], $this->cache);
         if ($mailbox && $mailbox->authed() && $mailbox->is_imap()) {
-            list($scripts, $current_script, $client) = get_all_scripts($this->config, $this->user_config, $mailbox, true);
+            // list($scripts, $current_script, $client) = get_all_scripts($this->config, $this->user_config, $mailbox, true);
+            list($scripts, $current_script) = get_all_scripts($form['imap_server_id'], true);
             $linked_mailboxes = get_sieve_linked_mailbox($scripts, $current_script);
             if ($linked_mailboxes && in_array($form['folder'], $linked_mailboxes)) {
                 try {
@@ -1623,7 +1621,9 @@ public function process()
         $mailbox = Hm_IMAP_List::get_connected_mailbox($form['imap_server_id'], $this->cache);
         if ($mailbox && $mailbox->authed() && $mailbox->is_imap()) {
             $del_folder = prep_folder_name($mailbox->get_connection(), $form['folder'], true);
-            list($scripts, $current_script, $client) = get_all_scripts($this->config, $this->user_config, $mailbox);
+            $client  = SieveConnectionPool::get($mailbox['id']);
+            // list($scripts, $current_script, $client) = get_all_scripts($this->config, $this->user_config, $mailbox);
+            list($scripts) = get_all_scripts($form['imap_server_id'], false);
             if (is_mailbox_linked_with_filters($del_folder, $form['imap_server_id'], $this, $scripts, $client)) {
                 $this->out('sieve_can_delete_folder', false);
                 Hm_Msgs::add('This folder can\'t be deleted because it is used in a Sieve filter.', 'warning');