Merge pull request #799 from josaphatim/add-sieve-postale-io

Added sieve to postale.io in nux module
cypht-org · Oct 23, 2023 · 5ba93a5 · 5ba93a5
2 parents 3d45097 + bd75a21
commit 5ba93a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
@@ -177,7 +177,7 @@ public function process() {
                     'user' => $form['nux_email'],
                     'pass' => $form['nux_pass'],
                 );
-                if (in_array($form['nux_service'], ['gandi']) && $this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true)) {
+                if ($details['sieve'] && $this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true)) {
                     $imap_list['sieve_config_host'] = $details['sieve']['host'].':'.$details['sieve']['port'];
                 }
                 Hm_IMAP_List::add($imap_list);

diff --git a/modules/nux/services.php b/modules/nux/services.php
@@ -252,6 +252,10 @@
         'port' => 465,
         'tls' => true
     ),
+    'sieve' => array(
+        'port' => 4190,
+        'host' => 'tls://mail.postale.io'
+    )
 ));
 
 Nux_Quick_Services::add('mailbox', array(

diff --git a/modules/sievefilters/modules.php b/modules/sievefilters/modules.php
@@ -1538,7 +1538,7 @@ function get_mailbox_filters($mailbox, $site_config, $user_config, $html=false)
             }
         } catch (Exception $e) {
             Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
-            return $html ? []: '';
+            return !$html ? []: '';
         }
 
         if ($html == false) {