From 66317578dcb37ab512c77c8e53ecb1796a26dce2 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 10:30:46 +0100
Subject: [PATCH 01/55] [Ref]: Add stepper

---
 modules/nux/modules.php | 119 +++++++++++++++++++++++++++++++++++++++-
 modules/nux/setup.php   |   3 +-
 modules/nux/site.css    |  24 ++++++++
 modules/nux/site.js     |  16 +++++-
 modules/smtp/setup.php  |   2 +-
 5 files changed, 160 insertions(+), 4 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index b0425e7f52..5882235117 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -341,7 +341,7 @@ protected function output() {
         $res .= '<div class="nux_qa">'.$this->trans('Add a popular E-mail source quickly and easily');
         $res .= ' <a class="nux_try_out" href="?page=servers#quick_add_section">'.$this->trans('Add an E-mail Account').'</a>';
         $res .= '</div><ul>';
-        
+
         foreach ($protos as $proto) {
             $proto_dsp = $proto;
             if ($proto == 'feeds') {
@@ -421,6 +421,123 @@ protected function output() {
     }
 }
 
+
+
+class Hm_Output_server_config_stepper extends Hm_Output_Module {
+    protected function output() {
+        return '
+        <div class="stepper">
+                <div class="step-container">
+                    <div id="step_config_1" class="step step_config">
+                        <div class="step_config-title">
+                            <h2>Step 1</h2>
+                            <span>(Authentication)</span>
+                        </div>
+                        <div>
+                            <form>
+                               <div class="step_config-form_item">
+                                    <label for="nux_profileName">Profile Name</label>
+                                    <br />
+                                    <input type="text" class="stepper_input" id="nux_profileName" placeholder="Profile name" />
+                               </div>
+                               <div class="step_config-form_item">
+                                    <label for="nux_email">Email</label>
+                                    <br />
+                                    <input type="email"  class="stepper_input" id="nux_email" placeholder="email" />
+                               </div>
+                               <div class="step_config-form_item">
+                                    <label for="nux_password">Password</label>
+                                    <br />
+                                    <input type="password"  class="stepper_input" id="nux_password" placeholder="password" />
+                               </div>
+                            </form>
+                        </div>
+                        <div class="step_config-actions">
+                            <button class="nux_stepper_btn" onclick="display_config_step(2)">Cancel</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(2)">Next</button>
+                        </div>
+                    </div>
+                    <div id="step_config_2" class="step step_config">
+                        <div class="step_config-title">
+                            <h2>Step 2</h2>
+                            <span>(Mail server configuration)</span>
+                        </div>
+                        <div>
+                            <form>
+                               <div class="step_config-form_item">
+                                    <label for="nux_service_name">Provider</label>
+                                    <br />
+                                    <input type="text" class="stepper_input" id="nux_service_name" placeholder="Provider" />
+                               </div>
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_sender" checked />
+                                    <label for="nux_is_sender">Sender account</label>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_receiver" checked />
+                                    <label for="nux_is_receiver">Receiver account</label>
+                               </div>
+
+                               <div class="step_config-smtp_imap_bloc">
+                                    <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+                                       <label>SMTP</label>
+                                       <div class="step_config-form_item">
+                                           <label for="nux_smtp_address">Address</label>
+                                           <br />
+                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_password" placeholder="Address" />
+                                       </div>
+                                       <div class="step_config-smtp_imap_port_bloc">
+                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_password"/>
+                                           <div>
+                                               <input type="radio" id="smtp_tsl" name="smtp_con_type" value="TLS">
+                                               <label for="java">Use TLS</label><br>
+                                               <input type="radio" id="start_tls" name="smtp_con_type" value="STARTTLS or unencrypted">
+                                               <label for="start_tls">STARTTLS or unencrypted</label><br>
+                                           </div>
+                                       </div>
+                                   </div>
+                                   <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+                                      <label>IMAP</label>
+                                      <div class="step_config-form_item">
+                                          <label for="nux_smtp_address">Address</label>
+                                          <br />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_password" placeholder="Address" />
+                                      </div>
+                                      <div class="step_config-smtp_imap_port_bloc">
+                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_password"/>
+                                          <div>
+                                              <input type="radio" id="smtp_tsl" name="smtp_con_type" value="TLS">
+                                              <label for="java">Use TLS</label><br>
+                                              <input type="radio" id="start_tls" name="smtp_con_type" value="STARTTLS or unencrypted">
+                                              <label for="start_tls">STARTTLS or unencrypted</label><br>
+                                          </div>
+                                      </div>
+                                  </div>
+                               </div>
+
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_sender" checked />
+                                    <label for="nux_is_sender">Sender account</label>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_receiver" checked />
+                                    <label for="nux_is_receiver">Receiver account</label>
+                               </div>
+                            </form>
+                        </div>
+                        <div class="step_config-actions">
+                            <button class="nux_stepper_btn" onclick="display_config_step(1)">Previous</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(0)">Cancel</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(3)">Finish</button>
+                        </div>
+                    </div>
+                    <button id="step_config_0" class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">Add a server</button>
+                </div>
+            </div>
+';
+    }
+}
+
 /**
  * @subpackage nux/functions
  */
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index c50d98f9a7..271711c686 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -6,7 +6,8 @@
 output_source('nux');
 
 /* servers page */
-add_output('servers', 'quick_add_section', true, 'nux', 'server_content_start', 'after');
+add_output('servers', 'server_config_stepper', true, 'smtp', 'server_content_start', 'after');
+add_output('servers', 'quick_add_section', true, 'nux', 'server_config_stepper', 'after');
 add_output('servers', 'quick_add_dialog', true, 'nux', 'quick_add_section', 'after');
 
 add_handler('ajax_nux_service_select', 'login', false, 'core');
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 728ee9fde6..3b2e069b6a 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -25,3 +25,27 @@
 .mobile .nux_dev_news, .mobile .nux_help, .mobile .nux_welcome { max-width: 90%; width: 90%; margin: 10px  auto; padding-left: 10px; padding-right: 5px; float: none; min-height: 200px; }
 .mobile .nux_dev_news { width: 90%; overflow: hidden; }
 .mobile .nux_welcome ul { padding-left: 10px; }
+
+.nux_stepper_btn {width: 120px;height: 32px;padding: 0px 10px 0px 10px;background: #EBEBEB;color: #232323;border-color: #232323; border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: center;}
+.step_config-title {display: flex;align-items: center;gap: 10px;}
+.step_config-title > span {font-size: small;}
+.step_config-title > h2 {color: #777}
+.stepper_input {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF;color: #C0C0C0;border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+
+.step_config-form_item {margin: 10px 0px;}
+.step_config-form_item-checkbox {}
+.step_config-form_item > label {color: #232323;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
+.nux_stepper_btn:hover {cursor: pointer;}
+.stepper {display: flex;overflow: hidden;padding: 10px 30px 15px 30px;}
+.step_config {width: 100%;transition: transform 0.5s;display: none;}
+.current_config_step {display: block;}
+.step-container {display: flex;width: 400px;}
+
+.step_config-smtp_imap_bloc { padding: 15px; background: #EBEBEB; }
+
+.step_config-smtp_imap_port_bloc {display: flex; font-size: 10px;}
+
+.step_config-smtp_imap_port_bloc > input { width: 100px;}
+.step_config-smtp_bloc {margin-bottom: 10px;}
+.step_config-imap_bloc {margin-bottom: 10px;}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index fbe06799e1..c82743f66c 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -1,5 +1,19 @@
 'use strict';
 
+function display_config_step(stepNumber) {
+    // Hide all step elements
+    var steps = document.querySelectorAll('.step_config');
+    for (var i = 0; i < steps.length; i++) {
+        steps[i].style.display = 'none';
+    }
+
+    // Show the selected step
+    var selectedStep = document.getElementById('step_config_' + stepNumber);
+    if (selectedStep) {
+        selectedStep.style.display = 'block';
+    }
+}
+
 var display_next_nux_step = function(res) {
     $('.nux_step_two').html(res.nux_service_step_two);
     $('.nux_step_one').hide();
@@ -57,7 +71,7 @@ var display_final_nux_step = function(res) {
                 }
             );
         }
-            
+
         window.location.href = "?page=servers";
     }
 };
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index 302736112a..8f0364a60d 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -29,7 +29,7 @@
 add_handler('servers', 'process_add_smtp_server', true, 'smtp', 'load_smtp_servers_from_config', 'after');
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
-add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'server_content_start', 'after');
+add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_section', 'after');
 add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'add_smtp_server_dialog', 'after');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');

From 1a5b863ba97717a4ab5e7fa72b02dc3817ae0b1d Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 12:56:40 +0100
Subject: [PATCH 02/55] [Ref]: Rename

---
 modules/nux/modules.php | 76 +++++++++++++++++++++++------------------
 modules/nux/site.css    |  3 +-
 modules/smtp/setup.php  |  2 +-
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 4874ead285..1a39d54e38 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -437,8 +437,14 @@ protected function output() {
 
 class Hm_Output_server_config_stepper extends Hm_Output_Module {
     protected function output() {
-        return '
-        <div class="stepper">
+
+    return '<div class="smtp_imap_server_setup">
+         <div data-target=".server_config_section" class="server_section">'.
+                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP & SMTP Servers').'
+                 <div class="server_count">10</div>
+         </div>
+         <div class="server_config_section">
+            <div class="stepper">
                 <div class="step-container">
                     <div id="step_config_1" class="step step_config">
                         <div class="step_config-title">
@@ -448,19 +454,19 @@ protected function output() {
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_profileName">Profile Name</label>
+                                    <label for="nux_config_profile_name">Profile Name</label>
                                     <br />
-                                    <input type="text" class="stepper_input" id="nux_profileName" placeholder="Profile name" />
+                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="Profile name" />
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_email">Email</label>
+                                    <label for="nux_config_email">Email</label>
                                     <br />
-                                    <input type="email"  class="stepper_input" id="nux_email" placeholder="email" />
+                                    <input type="email"  class="stepper_input" id="nux_config_email" placeholder="email" />
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_password">Password</label>
+                                    <label for="nux_config_password">Password</label>
                                     <br />
-                                    <input type="password"  class="stepper_input" id="nux_password" placeholder="password" />
+                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="password" />
                                </div>
                             </form>
                         </div>
@@ -477,63 +483,63 @@ protected function output() {
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_service_name">Provider</label>
+                                    <label for="nux_config_provider">Provider</label>
                                     <br />
-                                    <input type="text" class="stepper_input" id="nux_service_name" placeholder="Provider" />
+                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider"><option value="">'.$this->trans('Select an E-mail provider').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_sender" checked />
-                                    <label for="nux_is_sender">Sender account</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_config_is_sender" checked />
+                                    <label for="nux_config_is_sender">Sender account</label>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_receiver" checked />
-                                    <label for="nux_is_receiver">Receiver account</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_config_is_receiver" checked />
+                                    <label for="nux_config_is_receiver">Receiver account</label>
                                </div>
 
                                <div class="step_config-smtp_imap_bloc">
                                     <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
                                        <label>SMTP</label>
                                        <div class="step_config-form_item">
-                                           <label for="nux_smtp_address">Address</label>
+                                           <label for="nux_config_smtp_address">Address</label>
                                            <br />
-                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_password" placeholder="Address" />
+                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="Address" />
                                        </div>
                                        <div class="step_config-smtp_imap_port_bloc">
-                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_password"/>
+                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
                                            <div>
-                                               <input type="radio" id="smtp_tsl" name="smtp_con_type" value="TLS">
-                                               <label for="java">Use TLS</label><br>
-                                               <input type="radio" id="start_tls" name="smtp_con_type" value="STARTTLS or unencrypted">
-                                               <label for="start_tls">STARTTLS or unencrypted</label><br>
+                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_con_type" value="TLS">
+                                               <label for="smtp_tls">Use TLS</label><br>
+                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_con_type" value="STARTTLS or unencrypted">
+                                               <label for="smtp_start_tls">STARTTLS or unencrypted</label><br>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
                                       <label>IMAP</label>
                                       <div class="step_config-form_item">
-                                          <label for="nux_smtp_address">Address</label>
+                                          <label for="nux_config_imap_address">Address</label>
                                           <br />
                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_password" placeholder="Address" />
                                       </div>
                                       <div class="step_config-smtp_imap_port_bloc">
-                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_password"/>
-                                          <div>
-                                              <input type="radio" id="smtp_tsl" name="smtp_con_type" value="TLS">
-                                              <label for="java">Use TLS</label><br>
-                                              <input type="radio" id="start_tls" name="smtp_con_type" value="STARTTLS or unencrypted">
-                                              <label for="start_tls">STARTTLS or unencrypted</label><br>
-                                          </div>
+                                         <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
+                                         <div>
+                                             <input type="radio" id="imap_tls" name="nux_config_imap_con_type" value="TLS">
+                                             <label for="imap_tls">Use TLS</label><br>
+                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_con_type" value="STARTTLS or unencrypted">
+                                             <label for="imap_start_tls">STARTTLS or unencrypted</label><br>
+                                         </div>
                                       </div>
                                   </div>
                                </div>
 
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_sender" checked />
-                                    <label for="nux_is_sender">Sender account</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" />
+                                    <label for="nux_enable_sieve">Enable Sieve</label>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_is_receiver" checked />
-                                    <label for="nux_is_receiver">Receiver account</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_create_profile" checked />
+                                    <label for="nux_create_profile">Create Profile</label>
                                </div>
                             </form>
                         </div>
@@ -543,9 +549,11 @@ protected function output() {
                             <button class="nux_stepper_btn" onclick="display_config_step(3)">Finish</button>
                         </div>
                     </div>
-                    <button id="step_config_0" class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">Add a server</button>
+                    <button id="step_config_0" class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">Add a new server</button>
                 </div>
             </div>
+         </div>
+    </div>
 ';
     }
 }
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 3b2e069b6a..605859a47f 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -30,7 +30,7 @@
 .step_config-title {display: flex;align-items: center;gap: 10px;}
 .step_config-title > span {font-size: small;}
 .step_config-title > h2 {color: #777}
-.stepper_input {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF;color: #C0C0C0;border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.stepper_input {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 
 .step_config-form_item {margin: 10px 0px;}
 .step_config-form_item-checkbox {}
@@ -49,3 +49,4 @@
 .step_config-smtp_imap_port_bloc > input { width: 100px;}
 .step_config-smtp_bloc {margin-bottom: 10px;}
 .step_config-imap_bloc {margin-bottom: 10px;}
+.server_config_section { display: none; }
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index 8f0364a60d..bb81ae3e32 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -29,7 +29,7 @@
 add_handler('servers', 'process_add_smtp_server', true, 'smtp', 'load_smtp_servers_from_config', 'after');
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
-add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_section', 'after');
+add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
 add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'add_smtp_server_dialog', 'after');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');

From 2cfcd265acae4e9f73d434ffe4ac8d113931abd7 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 14:18:48 +0100
Subject: [PATCH 03/55] [feat] add validation on first step

---
 modules/nux/modules.php |  3 +++
 modules/nux/site.css    |  1 +
 modules/nux/site.js     | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 1a39d54e38..820e9bd411 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -457,16 +457,19 @@ protected function output() {
                                     <label for="nux_config_profile_name">Profile Name</label>
                                     <br />
                                     <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="Profile name" />
+                                    <span id="nux_config_profile_name-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
                                     <label for="nux_config_email">Email</label>
                                     <br />
                                     <input type="email"  class="stepper_input" id="nux_config_email" placeholder="email" />
+                                    <span id="nux_config_email-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
                                     <label for="nux_config_password">Password</label>
                                     <br />
                                     <input type="password"  class="stepper_input" id="nux_config_password" placeholder="password" />
+                                    <span id="nux_config_password-error" class="error-message"></span>
                                </div>
                             </form>
                         </div>
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 605859a47f..9f38ece3b1 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -50,3 +50,4 @@
 .step_config-smtp_bloc {margin-bottom: 10px;}
 .step_config-imap_bloc {margin-bottom: 10px;}
 .server_config_section { display: none; }
+.error-message {color: red; font-size: small;}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index c82743f66c..4d55661277 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -1,6 +1,24 @@
 'use strict';
 
 function display_config_step(stepNumber) {
+    if(stepNumber == 2) {
+
+        var isValid = true;
+
+        [{key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
+            {key: 'nux_config_email', value: $('#nux_config_email').val()},
+            {key: 'nux_config_password', value: $('#nux_config_password').val()}].forEach((item) => {
+                if(!item.value) {
+                    $(`#${item.key}-error`).text('Required');
+                    isValid = false;
+                }
+                else $(`#${item.key}-error`).text('');
+        })
+
+        if (!isValid) {
+            return
+        }
+    }
     // Hide all step elements
     var steps = document.querySelectorAll('.step_config');
     for (var i = 0; i < steps.length; i++) {

From f5c24fc8c9fa06d3516515e6c7c4412769e4314d Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 16:05:58 +0100
Subject: [PATCH 04/55] [feat]: implement auto detect provider from email then
 load provider config details

---
 modules/nux/modules.php  | 27 ++++++++++++++++++++
 modules/nux/services.php |  4 +--
 modules/nux/setup.php    | 10 ++++++++
 modules/nux/site.js      | 53 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 820e9bd411..0c41fba22b 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -266,6 +266,23 @@ public function process() {
     }
 }
 
+/**
+ * @subpackage nux/handler
+ */
+class Hm_Handler_get_nux_service_details extends Hm_Handler_Module {
+    public function process() {
+        list($success, $form) = $this->process_form(array('nux_service'));
+        if ($success) {
+            if (Nux_Quick_Services::exists($form['nux_service'])) {
+                $details = Nux_Quick_Services::details($form['nux_service']);
+
+                $this->out('nux_add_service_details', $details);
+                $this->session->set('nux_add_service_details', $details);
+            }
+        }
+    }
+}
+
 /**
  * @subpackage nux/output
  */
@@ -305,6 +322,16 @@ protected function output() {
     }
 }
 
+/**
+ * @subpackage nux/output
+ */
+class Hm_Output_service_details extends Hm_Output_Module {
+    protected function output() {
+        $details = $this->get('nux_add_service_details', array());
+        $this->out('service_details',  json_encode($details));
+    }
+}
+
 /**
  * @subpackage nux/output
  */
diff --git a/modules/nux/services.php b/modules/nux/services.php
index 2ba0401f02..e43f7f23aa 100644
--- a/modules/nux/services.php
+++ b/modules/nux/services.php
@@ -47,11 +47,11 @@
     'port' => 993,
     'name' => 'Outlook.com',
     'scope' => 'wl.imap',
-    /*'smtp' => array(
+    'smtp' => array(
         'server' => 'smtp.live.com',
         'port' => 587,
         'tls'=> 'yes'
-    )*/
+    )
 ));
 
 Nux_Quick_Services::add('office365', array(
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 271711c686..7e6457ab30 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -19,6 +19,15 @@
 add_handler('ajax_nux_service_select', 'http_headers', true, 'core');
 add_output('ajax_nux_service_select', 'filter_service_select', true);
 
+add_handler('ajax_get_nux_service_details', 'login', false, 'core');
+add_handler('ajax_get_nux_service_details', 'load_user_data', true, 'core');
+add_handler('ajax_get_nux_service_details', 'setup_nux', true);
+add_handler('ajax_get_nux_service_details', 'get_nux_service_details', true);
+add_handler('ajax_get_nux_service_details', 'language',  true, 'core');
+add_handler('ajax_get_nux_service_details', 'date', true, 'core');
+add_handler('ajax_get_nux_service_details', 'http_headers', true, 'core');
+add_output('ajax_get_nux_service_details', 'service_details', true);
+
 add_handler('ajax_nux_add_service', 'login', false, 'core');
 add_handler('ajax_nux_add_service', 'load_user_data', true, 'core');
 add_handler('ajax_nux_add_service', 'setup_nux', true);
@@ -46,6 +55,7 @@
 return array(
     'allowed_pages' => array(
         'ajax_nux_service_select',
+        'ajax_get_nux_service_details',
         'ajax_nux_add_service',
     ),
     'allowed_get' => array(
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 4d55661277..0feb9dba12 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -18,6 +18,24 @@ function display_config_step(stepNumber) {
         if (!isValid) {
             return
         }
+
+        let providerKey = getEmailProviderKey($('#nux_config_email').val());
+        $("#nux_config_provider").val(providerKey);
+
+        Hm_Ajax.request(
+            [{'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
+                {'name': 'nux_service', 'value': providerKey},
+                {'name': 'nux_account_name', 'value': $('#nux_config_profile_name').val()},
+                {'name': 'nux_email', 'value': $('#nux_config_email').val()}],
+            function(res) {
+                if(res.nux_service_step_two){
+                    let serverConfig = JSON.parse(res.nux_service_step_two)
+                    console.log("ajax_nux_service_select", serverConfig)
+                }
+            },
+            [],
+            false
+        );
     }
     // Hide all step elements
     var steps = document.querySelectorAll('.step_config');
@@ -32,6 +50,41 @@ function display_config_step(stepNumber) {
     }
 }
 
+function getEmailProviderKey(email) {
+    const emailProviderMap = {
+        "all-inkl": ["all-inkl.de", "all-inkl.com"],
+        "aol": ["aol.com"],
+        "fastmail": ["fastmail.com"],
+        "gandi": ["gandi.net"],
+        "gmail": ["gmail.com"],
+        "gmx": ["gmx.com", "gmx.de"],
+        "icloud": ["icloud.com"],
+        "inbox": ["inbox.com"],
+        "kolabnow": ["kolabnow.com"],
+        "mailcom": ["mail.com"],
+        "mailbox": ["mailbox.org"],
+        "migadu": ["migadu.com"],
+        "office365": ["office365.com"],
+        "outlook": ["outlook.com", "outlook.fr"],
+        "postale": ["postale.io"],
+        "yahoo": ["yahoo.com"],
+        "yandex": ["yandex.com", "yandex.ru"],
+        "zoho": ["zoho.com"]
+    };
+
+    const emailParts = email.split("@");
+    const provider = emailParts[1].toLowerCase();
+
+    for (const providerKey in emailProviderMap) {
+        if (emailProviderMap[providerKey].some(p => p.includes(provider))) {
+            return providerKey;
+        }
+    }
+
+    return "";
+}
+
+
 var display_next_nux_step = function(res) {
     $('.nux_step_two').html(res.nux_service_step_two);
     $('.nux_step_one').hide();

From 5bef982daa16bc3a38de5dee8b936b7dc554ea02 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 16:25:28 +0100
Subject: [PATCH 05/55] [feat]: set preconfigured value

---
 modules/nux/modules.php | 10 +++++-----
 modules/nux/setup.php   |  1 +
 modules/nux/site.js     | 17 ++++++++++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 0c41fba22b..41f1a92ec3 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -537,9 +537,9 @@ protected function output() {
                                        <div class="step_config-smtp_imap_port_bloc">
                                            <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
                                            <div>
-                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_con_type" value="TLS">
+                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_con_type" value="tls">
                                                <label for="smtp_tls">Use TLS</label><br>
-                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_con_type" value="STARTTLS or unencrypted">
+                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_con_type" value="start_tls_or_unencrypted">
                                                <label for="smtp_start_tls">STARTTLS or unencrypted</label><br>
                                            </div>
                                        </div>
@@ -549,14 +549,14 @@ protected function output() {
                                       <div class="step_config-form_item">
                                           <label for="nux_config_imap_address">Address</label>
                                           <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_password" placeholder="Address" />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="Address" />
                                       </div>
                                       <div class="step_config-smtp_imap_port_bloc">
                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
                                          <div>
-                                             <input type="radio" id="imap_tls" name="nux_config_imap_con_type" value="TLS">
+                                             <input type="radio" id="imap_tls" name="nux_config_imap_con_type" value="tls">
                                              <label for="imap_tls">Use TLS</label><br>
-                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_con_type" value="STARTTLS or unencrypted">
+                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_con_type" value="start_tls_or_unencrypted">
                                              <label for="imap_start_tls">STARTTLS or unencrypted</label><br>
                                          </div>
                                       </div>
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 7e6457ab30..1566bf264c 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -66,6 +66,7 @@
     ),
     'allowed_output' => array(
         'nux_service_step_two' => array(FILTER_UNSAFE_RAW, false),
+        'service_details' => array(FILTER_UNSAFE_RAW, false),
         'nux_account_added' => array(FILTER_VALIDATE_BOOLEAN, false),
         'nux_server_id' => array(FILTER_VALIDATE_INT, false),
         'nux_service_name' => array(FILTER_SANITIZE_FULL_SPECIAL_CHARS, false)
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 0feb9dba12..1662202c4b 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -28,9 +28,20 @@ function display_config_step(stepNumber) {
                 {'name': 'nux_account_name', 'value': $('#nux_config_profile_name').val()},
                 {'name': 'nux_email', 'value': $('#nux_config_email').val()}],
             function(res) {
-                if(res.nux_service_step_two){
-                    let serverConfig = JSON.parse(res.nux_service_step_two)
-                    console.log("ajax_nux_service_select", serverConfig)
+                if(res.service_details){
+                    let serverConfig = JSON.parse(res.service_details)
+
+                    $("#nux_config_smtp_address").val(serverConfig.smtp.server);
+                    $("#nux_config_smtp_port").val(serverConfig.smtp.port);
+
+                    if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_con_type'][value='tls']").prop("checked", true);
+                    else $("input[name='nux_config_smtp_con_type'][value='start_tls_or_unencrypted']").prop("checked", true);
+
+                    $("#nux_config_imap_address").val(serverConfig.server);
+                    $("#nux_config_imap_port").val(serverConfig.port);
+
+                    if(serverConfig.tls)$("input[name='nux_config_imap_con_type'][value='tls']").prop("checked", true);
+                    else $("input[name='nux_config_imap_con_type'][value='start_tls_or_unencrypted']").prop("checked", true);
                 }
             },
             [],

From 4b25b6d4047ca1a0ed49d384d319d3f1efc2ac21 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 24 Oct 2023 22:37:40 +0100
Subject: [PATCH 06/55] [Feat]: add conditional stmp and imap display

---
 modules/nux/modules.php |  6 +++---
 modules/nux/site.css    |  1 +
 modules/nux/site.js     | 11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 41f1a92ec3..bd42f8f8e9 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -518,11 +518,11 @@ protected function output() {
                                     <select id="nux_config_provider" class="stepper_input" name="nux_config_provider"><option value="">'.$this->trans('Select an E-mail provider').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_config_is_sender" checked />
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
                                     <label for="nux_config_is_sender">Sender account</label>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_config_is_receiver" checked />
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
                                     <label for="nux_config_is_receiver">Receiver account</label>
                                </div>
 
@@ -544,7 +544,7 @@ protected function output() {
                                            </div>
                                        </div>
                                    </div>
-                                   <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+                                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
                                       <label>IMAP</label>
                                       <div class="step_config-form_item">
                                           <label for="nux_config_imap_address">Address</label>
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 9f38ece3b1..032d1476f7 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -51,3 +51,4 @@
 .step_config-imap_bloc {margin-bottom: 10px;}
 .server_config_section { display: none; }
 .error-message {color: red; font-size: small;}
+.hide {display: none;}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 1662202c4b..5d1379ff96 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -1,5 +1,16 @@
 'use strict';
 
+function handleSmtpImapCheckboxChange(checkbox) {
+    if (checkbox.id === 'nux_config_is_receiver') {
+        if(checkbox.checked) $('#step_config-smtp_bloc').show();
+        else $('#step_config-smtp_bloc').hide();
+    }
+
+    if (checkbox.id === 'nux_config_is_sender') {
+        if(checkbox.checked) $('#step_config-imap_bloc').show();
+        else $('#step_config-imap_bloc').hide();
+    }
+}
 function display_config_step(stepNumber) {
     if(stepNumber == 2) {
 

From ff65f40b44ee9a35e5d210906d57d2f58a66a97e Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 31 Oct 2023 15:46:49 +0100
Subject: [PATCH 07/55] [Feat]: Implement imap & smtp con.

---
 modules/nux/modules.php  | 147 +++++++++++++++++++++++++++++++++++----
 modules/nux/services.php |   6 +-
 modules/nux/setup.php    |  31 ++++++++-
 modules/nux/site.css     |   2 +
 modules/nux/site.js      |  88 +++++++++++++++++++++--
 modules/smtp/modules.php |  72 +++++++++++--------
 6 files changed, 291 insertions(+), 55 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index bd42f8f8e9..05cc700f42 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -245,6 +245,120 @@ public function process() {
     }
 }
 
+/**
+ * @subpackage nux/handler
+ */
+class Hm_Handler_quick_server_setup_nux extends Hm_Handler_Module {
+    public function process() {
+        list($success, $form) = $this->process_form(array(
+           'nux_config_profile_name',
+           'nux_config_email',
+           'nux_config_password',
+           'nux_config_provider',
+           'nux_config_is_sender',
+           'nux_config_is_receiver',
+           'nux_config_smtp_address',
+           'nux_config_smtp_port',
+           'nux_config_smtp_tls',
+           'nux_config_imap_address',
+           'nux_config_imap_port',
+           'nux_config_imap_tls',
+           'nux_enable_sieve',
+           'nux_create_profile',
+           'nux_profile_is_default',
+           'nux_profile_signature'
+           ));
+
+        if ($success) {
+             /*
+             *  Connect to SMTP server if user wants to send emails
+             */
+             if($form['nux_config_is_sender']){
+                 if ($con = @fsockopen($form['nux_config_smtp_address'], $form['nux_config_smtp_port'], $errno, $errstr, 2)) {
+
+                     Hm_SMTP_List::add( array(
+                         'name' => $form['nux_config_profile_name'],
+                         'server' => $form['nux_config_smtp_address'],
+                         'port' => $form['nux_config_smtp_port'],
+                         'user' => $form['nux_config_email'],
+                         'pass' => $form['nux_config_password'],
+                         'tls' => $form['nux_config_smtp_tls']));
+
+                     $smtp_servers = Hm_SMTP_List::dump(false, true);
+                     $ids = array_keys($smtp_servers);
+                     $smtp_server_id = array_pop($ids);
+
+
+                      $smtp = Hm_SMTP_List::connect($smtp_server_id, false, $form['nux_config_email'], $form['nux_config_password'], true);
+                      if (is_object($smtp) && $smtp->state == 'authed') {
+                          $this->user_config->set('smtp_servers', $smtp_servers);
+                          $just_saved_credentials = true;
+                          $this->session->record_unsaved('SMTP server saved');
+                      }
+                      else {
+                          Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
+                          Hm_SMTP_List::forget_credentials($smtp_server_id);
+                          return;
+                      }
+                 } else {
+                     Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
+                     return;
+                 }
+             }
+
+             /*
+              *  Connect to IMAP server if user wants to receive emails
+              */
+             if($form['nux_config_is_receiver']){
+                 if ($con = fsockopen($form['nux_config_imap_address'], $form['nux_config_imap_port'], $errno, $errstr, 5)) {
+                      $imap_list = array(
+                          'name' => $form['nux_config_profile_name'],
+                          'server' => $form['nux_config_imap_address'],
+                          'hide' => false,
+                          'port' => $form['nux_config_imap_port'],
+                          'user' => $form['nux_config_email'],
+                          'pass' => $form['nux_config_password'],
+                          'tls' => $form['nux_config_imap_tls']);
+
+
+                      Hm_IMAP_List::add($imap_list);
+                      $servers = Hm_IMAP_List::dump(false, true);
+                      $ids = array_keys($servers);
+                      $imap_server_id = array_pop($ids);
+                      Hm_IMAP_List::clean_up();
+
+
+                      $cache = Hm_IMAP_List::get_cache($this->cache, $imap_server_id);
+                      $imap = Hm_IMAP_List::connect($imap_server_id, $cache, $form['nux_config_email'], $form['nux_config_password'], true);
+                      if (imap_authed($imap)) {
+                          $this->user_config->set('imap_servers', $servers);
+                          $just_saved_credentials = true;
+                          $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+                      }
+                      else {
+                          Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                          Hm_IMAP_List::forget_credentials($imap_server_id);
+                          return;
+                      }
+                  }else {
+                      Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
+                      return;
+                 }
+
+                 Hm_Msgs::add("Server saved");
+             }
+
+             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile']) {
+                 error_log($form['nux_create_profile']);
+                 error_log($form['nux_profile_signature']);
+                 error_log($form['nux_profile_is_default']);
+
+                 Hm_Msgs::add("SAVE PROFILE");
+             }
+        }
+    }
+}
+
 /**
  * @subpackage nux/handler
  */
@@ -481,7 +595,7 @@ protected function output() {
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_profile_name">Profile Name</label>
+                                    <label for="nux_config_profile_name">Name</label>
                                     <br />
                                     <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="Profile name" />
                                     <span id="nux_config_profile_name-error" class="error-message"></span>
@@ -537,9 +651,9 @@ protected function output() {
                                        <div class="step_config-smtp_imap_port_bloc">
                                            <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
                                            <div>
-                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_con_type" value="tls">
+                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_tls" value="true">
                                                <label for="smtp_tls">Use TLS</label><br>
-                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_con_type" value="start_tls_or_unencrypted">
+                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
                                                <label for="smtp_start_tls">STARTTLS or unencrypted</label><br>
                                            </div>
                                        </div>
@@ -554,23 +668,30 @@ protected function output() {
                                       <div class="step_config-smtp_imap_port_bloc">
                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
                                          <div>
-                                             <input type="radio" id="imap_tls" name="nux_config_imap_con_type" value="tls">
+                                             <input type="radio" id="imap_tls" name="nux_config_imap_tls" value="true">
                                              <label for="imap_tls">Use TLS</label><br>
-                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_con_type" value="start_tls_or_unencrypted">
+                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
                                              <label for="imap_start_tls">STARTTLS or unencrypted</label><br>
                                          </div>
                                       </div>
-                                  </div>
-                               </div>
-
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" />
-                                    <label for="nux_enable_sieve">Enable Sieve</label>
+                                   </div>
+                                   <div class="step_config-form_item">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" />
+                                        <label for="nux_enable_sieve">Enable Sieve</label>
+                                   </div>
                                </div>
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_create_profile" checked />
+                               <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
                                     <label for="nux_create_profile">Create Profile</label>
                                </div>
+                               <div class="step_config-form_item nested" id="nux_profile_signature_bloc">
+                                   <label for="nux_profile_signature">Signature</label>
+                                   <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
+                               </div>
+                               <div class="step_config-form_item nested" id="nux_profile_default_bloc">
+                                   <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
+                                   <label for="nux_profile_is_default">Set this profile default</label>
+                               </div>
                             </form>
                         </div>
                         <div class="step_config-actions">
diff --git a/modules/nux/services.php b/modules/nux/services.php
index e43f7f23aa..31e7d5b2e9 100644
--- a/modules/nux/services.php
+++ b/modules/nux/services.php
@@ -41,16 +41,16 @@
 ));
 
 Nux_Quick_Services::add('outlook', array(
-    'server' => 'imap.live.com',
+    'server' => 'outlook.office365.com',
     'type' => 'imap',
     'tls' => true,
     'port' => 993,
     'name' => 'Outlook.com',
     'scope' => 'wl.imap',
     'smtp' => array(
-        'server' => 'smtp.live.com',
+        'server' => 'smtp.office365.com',
         'port' => 587,
-        'tls'=> 'yes'
+        'tls'=> false
     )
 ));
 
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 1566bf264c..49c376ca7b 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -21,13 +21,23 @@
 
 add_handler('ajax_get_nux_service_details', 'login', false, 'core');
 add_handler('ajax_get_nux_service_details', 'load_user_data', true, 'core');
-add_handler('ajax_get_nux_service_details', 'setup_nux', true);
 add_handler('ajax_get_nux_service_details', 'get_nux_service_details', true);
 add_handler('ajax_get_nux_service_details', 'language',  true, 'core');
 add_handler('ajax_get_nux_service_details', 'date', true, 'core');
 add_handler('ajax_get_nux_service_details', 'http_headers', true, 'core');
 add_output('ajax_get_nux_service_details', 'service_details', true);
 
+add_handler('ajax_quick_server_setup_nux', 'login', false, 'core');
+add_handler('ajax_quick_server_setup_nux', 'load_user_data', true, 'core');
+add_handler('ajax_quick_server_setup_nux', 'setup_nux', true);
+add_handler('ajax_quick_server_setup_nux', 'load_smtp_servers_from_config',  true, 'smtp');
+add_handler('ajax_quick_server_setup_nux', 'load_imap_servers_from_config',  true, 'imap');
+add_handler('ajax_quick_server_setup_nux', 'quick_server_setup_nux', true);
+add_handler('ajax_quick_server_setup_nux', 'save_user_data',  true, 'core');
+add_handler('ajax_quick_server_setup_nux', 'language',  true, 'core');
+add_handler('ajax_quick_server_setup_nux', 'date', true, 'core');
+add_handler('ajax_quick_server_setup_nux', 'http_headers', true, 'core');
+
 add_handler('ajax_nux_add_service', 'login', false, 'core');
 add_handler('ajax_nux_add_service', 'load_user_data', true, 'core');
 add_handler('ajax_nux_add_service', 'setup_nux', true);
@@ -57,6 +67,7 @@
         'ajax_nux_service_select',
         'ajax_get_nux_service_details',
         'ajax_nux_add_service',
+        'ajax_quick_server_setup_nux',
     ),
     'allowed_get' => array(
         'code' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
@@ -77,7 +88,23 @@
         'nux_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_pass' => FILTER_UNSAFE_RAW,
         'nux_account_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_all_inkl_login' => FILTER_SANITIZE_FULL_SPECIAL_CHARS
+        'nux_all_inkl_login' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_profile_name'  => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_email' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_password' => FILTER_UNSAFE_RAW,
+        'nux_config_provider' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_is_sender' => FILTER_VALIDATE_BOOLEAN,
+        'nux_config_is_receiver' => FILTER_VALIDATE_BOOLEAN,
+        'nux_config_smtp_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_smtp_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_smtp_tls' => FILTER_VALIDATE_BOOLEAN,
+        'nux_config_imap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_imap_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_imap_tls' => FILTER_VALIDATE_BOOLEAN,
+        'nux_enable_sieve' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_create_profile' => FILTER_VALIDATE_BOOLEAN,
+        'nux_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
+        'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     )
 );
 
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 032d1476f7..32346bddba 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -33,8 +33,10 @@
 .stepper_input {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 
 .step_config-form_item {margin: 10px 0px;}
+.step_config-form_item.nested {margin-left: 20px !important;}
 .step_config-form_item-checkbox {}
 .step_config-form_item > label {color: #232323;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.step_config-form_item > textarea {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 .step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
 .nux_stepper_btn:hover {cursor: pointer;}
 .stepper {display: flex;overflow: hidden;padding: 10px 30px 15px 30px;}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 5d1379ff96..e70a48dc5a 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -1,5 +1,65 @@
 'use strict';
 
+
+function submitSmtpImapServer() {
+
+    var formData = {};
+
+    // Retrieve and assign the input values directly to the formData object
+    formData.profileName = document.getElementById('nux_config_profile_name').value;
+    formData.email = document.getElementById('nux_config_email').value;
+    formData.password = document.getElementById('nux_config_password').value;
+    formData.provider = document.getElementById('nux_config_provider').value;
+    formData.isSender = document.getElementById('nux_config_is_sender').checked;
+    formData.isReceiver = document.getElementById('nux_config_is_receiver').checked;
+    formData.smtpAddress = document.getElementById('nux_config_smtp_address').value;
+    formData.smtpPort = document.getElementById('nux_config_smtp_port').value;
+    formData.smtpConType = document.querySelector('input[name="nux_config_smtp_tls"]:checked').value;
+    formData.imapAddress = document.getElementById('nux_config_imap_address').value;
+    formData.imapPort = document.getElementById('nux_config_imap_port').value;
+    formData.imapConType = document.querySelector('input[name="nux_config_imap_tls"]:checked').value;
+    formData.enableSieve = document.getElementById('nux_enable_sieve').checked;
+    formData.createProfile = document.getElementById('nux_create_profile').checked;
+    formData.isProfilDefault = document.getElementById('nux_profile_is_default').checked;
+    formData.profileSignatue = document.getElementById('nux_profile_signature').value;
+
+    // Submit the form data via AJAX
+    Hm_Ajax.request(
+        [
+            {'name': 'hm_ajax_hook', 'value': 'ajax_quick_server_setup_nux'},
+            {'name': 'nux_config_profile_name', 'value': formData.profileName},
+            {'name': 'nux_config_email', 'value': formData.email},
+            {'name': 'nux_config_password', 'value': formData.password},
+            {'name': 'nux_config_provider', 'value': formData.provider},
+            {'name': 'nux_config_is_sender', 'value': formData.isSender},
+            {'name': 'nux_config_is_receiver', 'value': formData.isReceiver},
+            {'name': 'nux_config_smtp_address', 'value': formData.smtpAddress},
+            {'name': 'nux_config_smtp_port', 'value': formData.smtpPort},
+            {'name': 'nux_config_smtp_tls', 'value': formData.smtpConType},
+            {'name': 'nux_config_imap_address', 'value': formData.imapAddress},
+            {'name': 'nux_config_imap_port', 'value': formData.imapPort},
+            {'name': 'nux_config_imap_tls', 'value': formData.imapConType},
+            {'name': 'nux_enable_sieve', 'value': formData.enableSieve},
+            {'name': 'nux_create_profile', 'value': formData.createProfile},
+            {'name': 'nux_profile_is_default', 'value': formData.isProfilDefault},
+            {'name': 'nux_profile_signature', 'value': formData.profileSignatue},
+        ],
+        function (res) {
+            console.log("res", res);
+            // Handle the AJAX response here
+        }
+    );
+}
+
+function handleCreateProfileCheckboxChange(checkbox) {
+    if(checkbox.checked) {
+        $('#nux_profile_signature_bloc').show();
+        $('#nux_profile_default_bloc').show();
+    }else{
+        $('#nux_profile_signature_bloc').hide();
+        $('#nux_profile_default_bloc').hide();
+    }
+}
 function handleSmtpImapCheckboxChange(checkbox) {
     if (checkbox.id === 'nux_config_is_receiver') {
         if(checkbox.checked) $('#step_config-smtp_bloc').show();
@@ -10,6 +70,17 @@ function handleSmtpImapCheckboxChange(checkbox) {
         if(checkbox.checked) $('#step_config-imap_bloc').show();
         else $('#step_config-imap_bloc').hide();
     }
+
+    if($('#nux_config_is_sender').checked &&
+        $('#nux_config_is_receiver').checked){
+        $('#nux_profile_signature_bloc').show();
+        $('#nux_profile_default_bloc').show();
+        $('#nux_profile_checkbox_bloc').show();
+    }else{
+        $('#nux_profile_signature_bloc').hide();
+        $('#nux_profile_default_bloc').hide();
+        $('#nux_profile_checkbox_bloc').hide();
+    }
 }
 function display_config_step(stepNumber) {
     if(stepNumber == 2) {
@@ -35,9 +106,7 @@ function display_config_step(stepNumber) {
 
         Hm_Ajax.request(
             [{'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
-                {'name': 'nux_service', 'value': providerKey},
-                {'name': 'nux_account_name', 'value': $('#nux_config_profile_name').val()},
-                {'name': 'nux_email', 'value': $('#nux_config_email').val()}],
+                {'name': 'nux_service', 'value': providerKey},],
             function(res) {
                 if(res.service_details){
                     let serverConfig = JSON.parse(res.service_details)
@@ -45,20 +114,25 @@ function display_config_step(stepNumber) {
                     $("#nux_config_smtp_address").val(serverConfig.smtp.server);
                     $("#nux_config_smtp_port").val(serverConfig.smtp.port);
 
-                    if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_con_type'][value='tls']").prop("checked", true);
-                    else $("input[name='nux_config_smtp_con_type'][value='start_tls_or_unencrypted']").prop("checked", true);
+                    if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_tls'][value='true']").prop("checked", true);
+                    else $("input[name='nux_config_smtp_tls'][value='false']").prop("checked", true);
 
                     $("#nux_config_imap_address").val(serverConfig.server);
                     $("#nux_config_imap_port").val(serverConfig.port);
 
-                    if(serverConfig.tls)$("input[name='nux_config_imap_con_type'][value='tls']").prop("checked", true);
-                    else $("input[name='nux_config_imap_con_type'][value='start_tls_or_unencrypted']").prop("checked", true);
+                    if(serverConfig.tls)$("input[name='nux_config_imap_tls'][value='true']").prop("checked", true);
+                    else $("input[name='nux_config_imap_tls'][value='false']").prop("checked", true);
                 }
             },
             [],
             false
         );
     }
+
+    if(stepNumber == 3) {
+        submitSmtpImapServer();
+        return
+    }
     // Hide all step elements
     var steps = document.querySelectorAll('.step_config');
     for (var i = 0; i < steps.length; i++) {
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index a48bf844ed..4f0d963d53 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -57,9 +57,9 @@ public function process() {
                 if (!array_key_exists('From', $msg_header) || count($msg_header) == 0) {
                     return;
                 }
-                
+
                 # Attachment Download
-                # Draft attachments must be redownloaded and added to the file cache to prevent 
+                # Draft attachments must be redownloaded and added to the file cache to prevent
                 # attachments from being deleted when editing a previously saved draft.
                 $attached_files = [];
                 $this->session->set('uploaded_files', array());
@@ -116,7 +116,7 @@ public function process() {
         if (!$this->module_is_supported('imap')) {
             return;
         }
-        
+
         if (array_key_exists('forward', $this->request->get)) {
             $path = explode('_', $this->request->get['list_path']);
             $imap = Hm_IMAP_List::connect($path[1]);
@@ -222,26 +222,26 @@ public function process() {
                 Hm_Msgs::add('ERRerror '.$file['error'].' in file '.$this->request->get['resumableFilename']);
                 continue;
             }
-    
+
             if(isset($this->request->get['resumableIdentifier']) && trim($this->request->get['resumableIdentifier'])!=''){
                 $temp_dir = $filepath.'/'.$userpath.'/chunks-'.$this->request->get['resumableIdentifier'];
             }
             $dest_file = $temp_dir.'/'.$this->request->get['resumableFilename'].'.part'.$this->request->get['resumableChunkNumber'];
-        
+
             // create the temporary directory
             if (!is_dir($temp_dir)) {
                 mkdir($temp_dir, 0777, true);
             }
-        
+
             // move the temporary file
             if (!move_uploaded_file($file['tmp_name'], $dest_file)) {
                 Hm_Msgs::add('ERRError saving (move_uploaded_file) chunk '.$this->request->get['resumableChunkNumber'].' for file '.$this->request->get['resumableFilename']);
             } else {
                 // check if all the parts present, and create the final destination file
                 $result = createFileFromChunks($temp_dir, $this->request->get['resumableFilename'],
-                                $this->request->get['resumableChunkSize'], 
+                                $this->request->get['resumableChunkSize'],
                                 $this->request->get['resumableTotalSize'],
-                                $this->request->get['resumableTotalChunks']);    
+                                $this->request->get['resumableTotalChunks']);
             }
         }
     }
@@ -267,7 +267,7 @@ public function process() {
             delete_uploaded_files($this->session, $draft_id);
             return;
         }
-        
+
         if ($this->module_is_supported('imap')) {
             $uploaded_files = explode(',', $uploaded_files);
             $userpath = md5($this->session->get('username', false));
@@ -346,7 +346,7 @@ public function process() {
         if ($draft_id <= 0 && array_key_exists('uid', $this->request->get)) {
             $draft_id = $this->request->get['uid'];
         }
-        
+
         $this->out('uploaded_files', get_uploaded_files($draft_id, $this->session));
         $compose_type = $this->user_config->get('smtp_compose_type_setting', 0);
         if ($this->get('is_mobile', false)) {
@@ -387,6 +387,13 @@ public function process() {
                         'server' => $form['new_smtp_address'],
                         'port' => $form['new_smtp_port'],
                         'tls' => $tls));
+                     ob_start();
+                     var_dump(Hm_SMTP_List::dump());
+                     $output = ob_get_clean();
+
+                     error_log('=============');
+                     error_log($output);
+                     error_log('=============');
                     Hm_Msgs::add('Added SMTP server!');
                     $this->session->record_unsaved('SMTP server added');
                 }
@@ -440,6 +447,11 @@ public function process() {
                     Hm_Msgs::add('ERRThis server and username are already configured');
                     return;
                 }
+
+               error_log("$form[smtp_server_id] ". $form['smtp_server_id']);
+               error_log("$form[smtp_server_id] ". $form['smtp_user']);
+               error_log("$form[smtp_server_id] ". $form['smtp_pass']);
+
                 $smtp = Hm_SMTP_List::connect($form['smtp_server_id'], false, $form['smtp_user'], $form['smtp_pass'], true);
                 if (smtp_authed($smtp)) {
                     $just_saved_credentials = true;
@@ -542,11 +554,11 @@ class Hm_Handler_profile_status extends Hm_Handler_Module {
     public function process() {
         $profiles = $this->user_config->get('profiles');
         $profile_value = $this->request->post['profile_value'];
-        
+
         if (!strstr($profile_value, '.')) {
             Hm_Msgs::add('ERRPlease create a profile for saving sent messages');
             return;
-        } 
+        }
         $profile = profile_from_compose_smtp_id($profiles, $profile_value);
         if (!$profile) {
             Hm_Msgs::add('ERRPlease create a profile for saving sent messages');
@@ -638,7 +650,7 @@ function get_mime_type($filename)
  * @subpackage smtp/handler
  */
 class Hm_Handler_process_compose_form_submit extends Hm_Handler_Module {
-    public function process() {       
+    public function process() {
         /* not sending */
         if (!array_key_exists('smtp_send', $this->request->post)) {
             return;
@@ -745,7 +757,7 @@ public function process() {
         if ($form['post_archive']) {
             $msg_path = explode('_', $this->request->post['compose_msg_path']);
             $msg_uid = $this->request->post['compose_msg_uid'];
-            
+
             $imap = Hm_IMAP_List::connect($msg_path[1]);
             if ($imap->select_mailbox(hex2bin($msg_path[2]))) {
                 $specials = get_special_folders($this, $msg_path[1]);
@@ -842,19 +854,19 @@ protected function output() {
         $size_in_kbs = 0;
         $num_chunks = 0;
         $rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->get('attachment_dir')));
-        $files = array(); 
-        
+        $files = array();
+
         foreach ($rii as $file) {
             if ($file->getFilename() == '.' || $file->getFilename() == '..') {
                 continue;
             }
-            if ($file->isDir()){ 
+            if ($file->isDir()){
                 continue;
             }
             if (strpos($file->getPathname(), '.part') !== False) {
                 $num_chunks++;
                 $size_in_kbs += filesize($file->getPathname());
-                $files[] = $file->getPathname(); 
+                $files[] = $file->getPathname();
             }
         }
         if ($size_in_kbs > 0) {
@@ -955,7 +967,7 @@ protected function output() {
         $msg_path = $this->get('list_path', '');
         $msg_uid = $this->get('uid', '');
         $from = $this->get('compose_from');
-        
+
         if (!$msg_path) {
             $msg_path = $this->get('compose_msg_path', '');
         }
@@ -1020,13 +1032,13 @@ protected function output() {
             }
             $draft_id = $msg_uid;
         }
-        
+
         // User clicked on compose
         if ($reply_type) {
             $imap_server_id = explode('_', $msg_path)[1];
             $imap_server = Hm_IMAP_List::get($imap_server_id, false);
             $reply_from = process_address_fld($reply['msg_headers']['From']);
-    
+
             if ($reply_type == 'reply_all' && $reply_from[0]['email'] != $imap_server['user'] && strpos($to, $reply_from[0]['email']) === false) {
                 $to .= ', '.$reply_from[0]['label'].' '.$reply_from[0]['email'];
             }
@@ -1479,7 +1491,7 @@ function save_uploaded_file($id, $atts, $session) {
 function format_attachment_row($file, $output_mod) {
     $unique_identifier = str_replace(' ', '_', $output_mod->html_safe($file['name']));
     return '<tr id="tr-'.$unique_identifier.'"><td>'.
-            $output_mod->html_safe($file['name']).'</td><td>'.$output_mod->html_safe($file['type']).' ' .$output_mod->html_safe(round($file['size']/1024, 2)). 'KB '. 
+            $output_mod->html_safe($file['name']).'</td><td>'.$output_mod->html_safe($file['type']).' ' .$output_mod->html_safe(round($file['size']/1024, 2)). 'KB '.
             '<td style="display:none"><input name="uploaded_files[]" type="text" value="'.$file['name'].'" /></td>'.
             '</td><td><a class="remove_attachment" id="remove-'.$unique_identifier.'" href="#">Remove</a><a style="display:none" id="pause-'.$unique_identifier.'" class="pause_upload" href="#">Pause</a><a style="display:none" id="resume-'.$unique_identifier.'" class="resume_upload" href="#">Resume</a></td></tr><tr><td colspan="2">'.
             '<div class="meter" style="width:100%; display: none;"><span id="progress-'.
@@ -1577,7 +1589,7 @@ function rrmdir($dir) {
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
                     if (filetype($dir . "/" . $object) == "dir") {
-                        rrmdir($dir . "/" . $object); 
+                        rrmdir($dir . "/" . $object);
                     } else {
                         unlink($dir . "/" . $object);
                     }
@@ -1591,7 +1603,7 @@ function rrmdir($dir) {
 
 /**
  *
- * Check if all the parts exist, and 
+ * Check if all the parts exist, and
  * gather all the parts of the file together
  * @param string $temp_dir - the temporary directory holding all the parts of the file
  * @param string $fileName - the original file name
@@ -1613,7 +1625,7 @@ function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize,$tota
         // check that all the parts are present
         // If the Size of all the chunks on the server is equal to the size of the file uploaded.
         if ($total_files_on_server_size >= $totalSize) {
-        // create the final destination file 
+        // create the final destination file
             if (($fp = fopen($temp_dir.'/../'.$fileName, 'w')) !== false) {
                 for ($i=1; $i<=$total_files; $i++) {
                     fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
@@ -1625,7 +1637,7 @@ function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize,$tota
                 return false;
             }
 
-            // rename the temporary directory (to avoid access from other 
+            // rename the temporary directory (to avoid access from other
             // concurrent chunks uploads) and than delete it
             if (rename($temp_dir, $temp_dir.'_UNUSED')) {
                 rrmdir($temp_dir.'_UNUSED');
@@ -1695,7 +1707,7 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
     $cache = Hm_IMAP_List::get_cache($mod_cache, $imap_profile['id']);
     $imap = Hm_IMAP_List::connect($imap_profile['id'], $cache);
     $draft_folder = $imap->select_mailbox($specials['draft']);
-    
+
     $mime = new Hm_MIME_Msg(
         $atts['draft_to'],
         $atts['draft_subject'],
@@ -1708,14 +1720,14 @@ function save_imap_draft($atts, $id, $session, $mod, $mod_cache, $uploaded_files
         $name,
         $atts['draft_in_reply_to']
     );
-    
+
     $mime->add_attachments($uploaded_files);
     $res = $mime->process_attachments();
-    
+
     $msg = str_replace("\r\n", "\n", $mime->get_mime_msg());
     $msg = str_replace("\n", "\r\n", $msg);
     $msg = rtrim($msg)."\r\n";
-    
+
     if ($imap->append_start($specials['draft'], strlen($msg), false, true)) {
         $imap->append_feed($msg."\r\n");
         if (!$imap->append_end()) {

From 443923b28f88be691e55c71ad84425a23da7cc67 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Mon, 6 Nov 2023 11:59:21 +0100
Subject: [PATCH 08/55] Feat: implement saving profile logic

---
 lib/output.php          |   3 +-
 modules/nux/modules.php |  65 +++++++++++++++++------
 modules/nux/setup.php   |   1 +
 modules/nux/site.js     | 113 +++++++++++++++++++---------------------
 4 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/lib/output.php b/lib/output.php
index 25dfd0e77c..33e662cb82 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -138,6 +138,7 @@ public static function __callStatic(string $method, array $parameters)
 
     public static $arrow_drop_down = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSJub25lIiBkPSJNMCAwaDI0djI0SDBWMHoiLz48cGF0aCBkPSJNNyAxMGw1IDUgNS01SDd6Ii8+PC9zdmc+';
     public static $arrow_drop_up = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSJub25lIiBkPSJNMCAwaDI0djI0SDBWMHoiLz48cGF0aCBkPSJNNyAxNGw1LTUgNSA1SDd6Ii8+PC9zdmc+';
+    public static $spinner = 'data:image/gif;base64,R0lGODlhGAAYAPcBAAAAAAD/AA0NDRAQEBMTExYWFiUlJScnJykpKSsrKz4+PllZWVtbW1xcXH5+fn9/f5mZmaSkpKampqenp6ioqKmpqaqqqq6urrCwsLS0tLm5ubq6ur+/v8XFxc3Nzc7Ozs/Pz9LS0tPT09zc3OLi4uXl5efn5+vr6/Dw8PLy8vT09P7+/v///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBAABACwAAAAAGAAYAIcAAAAA/wANDQ0QEBATExMWFhYlJSUnJycpKSkrKys+Pj5ZWVlbW1tcXFx+fn5/f3+ZmZmkpKSmpqanp6eoqKipqamqqqqurq6wsLC0tLS5ubm6urq/v7/FxcXNzc3Ozs7Pz8/S0tLT09Pc3Nzi4uLl5eXn5+fr6+vw8PDy8vL09PT+/v7///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8ImwBXsBBIcKDBgggNHlyYsOFAhwIjFBhgASILhgcJAABAACNBiwM2FhBIosECEwUXokBBsAIBAhIGMtjI4CBCFSc8sliwsUFKiwhLMGhAwqZOoAqRAlXKMISHpCxGjFAKYuOHhwNJjDhq0MPGEAK5OvwA4qNYrmeXptW5sEMHiw4eIETYgcPRBw4Wcr2AQS3EDBfQMoU4mG3hhgEBACH5BAUEAAEALAMAAgATABEAAAhgAAMIHBjAQgACGAgqXFhAYMOFEA8qRPHAgQqFFwVeKFDggsAHAh1MjBhAZACQJDE6eJAipcuXMFOeMBGABAmYJwQIOFEipokBO2MKPHFCqNGjLz18SAkBgkIQHZg6FRgQACH5BAUFAAEALAMAAgATABMAAAhqAAMIHBhgAwIDHQgqXHhAoIGFEB0KRCBwRYUILAimIMjBwAEOAicIlBARYgSBFUouZCFhwgqVMGPKVMniZQkTMlccSLDiBImcCQxknBlgxUuiSJPCDCFC5QQLCkWAUHmBpMoMGZJqwFAyIAAh+QQFBAABACwDAAIAEgATAAAIbwADCBwY4IMCBSIIKlSoQGDDhQEiEBAwwaFFgSA8DBwAAMAAgSIOghD4QaDGAAI6EoAY4OTIABIGDIjAsmXJmjhz6tx54sROFgsYoDCxM0CDBUUHskjKtCnLESNwXrhAkETUmhgs4NSwgSmHDCwDAgAh+QQFBAABACwDAAIAEgATAAAIagADCBwYgESDBSYIKlTYQCCDhQIlFCBwQeACgQ0FnkgosEBHgSUYNCChUYCAEwIJfIRoYsBJgRYKFKAAUSPKmjhz6typEAUKngEcPFBxc+cDB0CTKl26kwTJnBgIltCZoSLODh2UduBQMyAAIfkEBQQAAQAsBAACABEAEwAACGgAAwgciOKBAxUDEyoM4EBgw4UZDhjY4FDgg4EsVgg0sFGgCgcOUghccSCBRo4BDiwcmeAAiwAbDBjQsHKkxpo4c+rc6ZFnAAgQUPgE6rOo0aMrS5jImSHDwBMkcmrAgNPDh6IgOtQMCAAh+QQFBAABACwDAAIAEgATAAAIZgADCBwYYAWFCCwIKlQoQWDDhQE+KFAgQmAEgRQgBlAgkGMAFhIkrBDIYgGDgR49QmywYKCIiSA0kpRJs6bNmwFS4AwwwcLOABce/hxKtKjAEydoathAEIUJmhwy0AxRcaeImBADAgAh+QQFBAABACwCAAIAEwATAAAIbgADCBw4MIQHgggTBgAh8INCgSQaLDAh8GCAEA8DMBC4sSHDgQ4eEFwgsEHGBw4IlmDAgETGlzBjZoxQYIAFmQIJAABAQOYFDAN2FpCZ4UIFAgQk4FzKtKlMFCheduiAUMUJqRxgjhjRlARXhQEBACH5BAUFAAEALAIAAgARABMAAAhiAAMIHDjwhAmCCBGeECDgRMIAKB44UCHQxICGDx8IdFDQ4UAIEDYK1PgwAEiBKhw8SFGypcuXDy0EIIABZoACAnHCJGBz4IUCBS70HEq0aEKKLT18IIjCJYgOLUmQGFriYUAAIfkEBQQAAQAsAgACABMAEwAACGoAAwgcOJDFCoIIEwZYcSDBQYULK0RgIXBFAgMUIU4QKGHgiocCJ1ggGEFgBYgBLnQsKGECSJQwY8pMuAGBgQ4zBR4QaGBmhgw9AyCYqQEDBwMHOORcyrTpzBQxQ4hoKgJEzBImmp4gATEgACH5BAUEAAEALAIAAwATABIAAAhvAAMIHCiQxQIGBBMKBOGBYIMFCgl+ENhwIAuCFy4QrAgiokAMFhJ6mOixpMmTKAN8UKBAREqBCmCm1LAhZgCbJzlkEMGy48ufQEtGICBgws8BAAAMKDliBEEBSQmUJOF0oIQBAyIMPHEiKAoTHgMCACH5BAUEAAEALAIAAwATABIAAAhrAAMIHDjQwQOCCAWeMEHwgYOEBE8IEHAC4kAMBE0MoGgxQIYLCE9U7EiypMmOJBosYHgyQAOBDE526LBA4EuTHTiUYNCARMufQElKKEAAZMsCApFaJOFzIIGkHUsgtFCgAIWBKFAEVTEyYUAAIfkEBQQAAQAsAgADABMAEgAACGkAAwgcOBACBIIIBbJYQdBgQoIrDiRg+DBAhgwQExhgUTGABgwIV1DsSLKkyYooHjhQcVKgA5cnPXx4GeDBSRAdVDhwkKKlz58kMxwwsMGnAYFHK5YwQTDpgY4nSBDcYMCABoIsgaKoGBAAIfkEBQQAAQAsAgADABMAEQAACGEAAwgcOHCCBYIIEwq8IEHhQBYLGDgUqGEDwgYLJgbgkCEhC40gQ4pMuIJChI8jGwZQCTKEiAgCKYgUAYKFBAkrRurcqfGDAgUidCoQONThiRMEixZViMIEQRE/QQxMMTEgACH5BAUFAAEALAIAAwATABMAAAhxAAMIHDjwAgaCCBMKzHBBIUEHDxwK7NAB4QMHEgN04JCxo8ePIEN4ACkQhMAPH0eMGBkgxEcSIwJ8MEmypk2FJBosMEGSgUCfDlGgILhAYAOBEQoMsDBQxQmCJRg0ICGQAAAABEgOuFqAZAUCBCQoDAgAIfkEBQQAAQAsAgAFABMAEQAACGEAAwiEAEGgwYMBPHxASBAhQhAdHEqcSLGiRYonTFw8eEKAgBMbSZAwMeDjxhICT4DcyLLlRhQPHKho+UCgg4ozDd4MUDOAhQAEMBxEcVCFgwcpBBZQ2pKAS4EXChS4IDEgACH5BAUEAAEALAIAAwATABMAAAhtAAMIHDgwQwaCCBMK1IBBIcEJFhwKDCEC4QUJEgOIAJGxo8ePIFmsAClwxYEEIz2WMLEigQEWH0+QCLAiJcmbOBOuqBABJsgJAjE6TIEwgsAKAjcgMNBBIgsJE1IeEGiAZNUACEhyMHCAg8KAAAAh+QQFBAABACwCAAMAEwATAAAIcgADCBw4UMMGgggTCuSQQSHBCxccChwxAiEGCxIDkKiYsaPHjyBDCmSxgAHIEycCNFgAEoWJkSJjykwIwoPECAQETBj4QaBNhQMAABgw8CcIgR8UKBAhUIBQAgQ99BSogKpACQMGRJBYNUDXjyKUHk0YEAAh+QQFBAABACwDAAMAEgATAAAIbQADCBwosEMHgggTBujAQSFBDA4FkiBBMMOFiAFKYNzIsaPHjw4eeESB4oEDjypOfFzJ0uEJExElFCBwMcAJAQJUKiwgkGcAEwNySmywAGYAAj0HntAZoIFABgItFChAweECgU47lmDQgGLCgAAAIfkEBQQAAQAsAwADABIAEwAACG0AAwgcKNDDB4IIEwYA0UHhwAwZHAosYYKgBgwSA5wgkbGjx48gQUKAEFLFyJAoQqpc6ZDFCokZDhjYIHDFgQQvFRoQuDPAigQHWAhE8cCBCp4CDwxckTOAA4FPA2wwYECDw6gPQKpw4CCFwoAAACH5BAUFAAEALAMAAwARABMAAAhgAAMIHCgwhAiCCBOKAJFwoIYNDQeeODGQQ4aIAlGYwMixo8ePICdYAJniggSQKFOqVPlBgYKDLBYwwKhAYM0ADRYMXEEhAgubQAX+FHgyQFERLhkmjCCQwkcWEiSsSBgQACH5BAUEAAEALAMAAwATABMAAAhwAAMIHChwxAiCCBMKJHFQ4cAOHRwKRIECYQcOEgOoOJGxo8ePIENGKDDAwgUMHwkAAEAgw4WPA1YWCFmBAAEJIXPqHEiiwQITBB08kMhAYNGBDxwQDOFh4AKBDSSCEPhBYAkGDEhIbBogRM4PUx0GBAAh+QQFBAABACwFAAMAEQATAAAIZAADCBxIgsTAgwgHlkh40MMHhgdVDATRAeJAFBYzatzIcaOFAAQwcCwgkORGAh0FXihQ4ELKlx1RPHAgMQAECBYfCHQg8ObBEyYG8gygM+EJAQJOCFTh4EEKhiYGJO14QinEgAAAIfkEBQQAAQAsAwADABMAEwAACG0AAwgcKLCECYIIEwo8QUIhwRAiHApMkVAECIkYM2rcyLHjwA0IDHTIkGHjAYEGNGDYaEAggo4cDBzg4LGmzRUVIrAgOMGCxAkCJRC8IHQgixUDIwisIHHFgQRIA7CQMCGqwhUJDOzsuMJqwoAAACH5BAUEAAEALAMAAwATABMAAAhvAAMIHCjwxAmCCBMKRGFiYAQCAiYQHDFCocABAAAMIEiiokUBGQlYVChhwIAII1OqXMnygwIFIjRsYKlAoAIOGWjaZClQxEsQPIMKVQjCA8ILF0Z+EGh0IAYLI5sCtchiAQOCHpambLBgaAAWIwMCACH5BAUEAAEALAMAAwATABIAAAhqAAMIHCgQBQqCCBMKVHFioIQCBC4QJEFCocACFwmWsCiQQEaOCC0UKEABpMmTKDmSaLDARIcOKBsIZNCBA8oFAmWmLMGgQcWUQIMmPGEiIQaOJwQIaDgwg0SLJgYsBengAcETTDk+cMAxIAAh+QQFBQABACwDAAMAEwASAAAIagADCBw4UAXBgwgHohiY4YCBDQRLmEgo0EBFgidIUAxgMcCBjQg3GDCgAaTJkyg3onjgQIWHDygdCHQAokNMgQ9SBlDhwEEKnUCDEmSx4mCGDBtXHEhQdKAGDEkTGGABEgIEgiuabrS6MSAAIfkEBQUAAQAsAwADABMAEgAACGIAAwgcKDAFwYMIEwb4oECBCIInTigMoEBgxYEoTEy8eHEiQRENQXgcSbLkxBUUIrAI8ZCkBIESRIgkGUEgBZMBWEiQsAKnz58jNWyYyGIBg4McMnhssGDkBAsHWYy88FJhQAA7';
 }
 
 /**
@@ -210,7 +211,7 @@ class Hm_Msgs { use Hm_List; }
  * System debug notices
  */
 class Hm_Debug {
-    
+
     use Hm_List;
 
     /**
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 05cc700f42..6b8b5c1067 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -266,10 +266,13 @@ public function process() {
            'nux_enable_sieve',
            'nux_create_profile',
            'nux_profile_is_default',
-           'nux_profile_signature'
+           'nux_profile_signature',
+           'nux_profile_reply_to'
            ));
 
         if ($success) {
+             $smtp_server_id = null;
+             $imap_server_id = null;
              /*
              *  Connect to SMTP server if user wants to send emails
              */
@@ -348,12 +351,28 @@ public function process() {
                  Hm_Msgs::add("Server saved");
              }
 
-             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile']) {
-                 error_log($form['nux_create_profile']);
-                 error_log($form['nux_profile_signature']);
-                 error_log($form['nux_profile_is_default']);
-
-                 Hm_Msgs::add("SAVE PROFILE");
+             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset(imap_server_id)) {
+                 $profile = array(
+                             'name' => $form['nux_config_profile_name'],
+                             'sig' => $form['nux_profile_signature'],
+                             'smtp_id' => $imap_server_id,
+                             'replyto' => $form['nux_profile_reply_to'],
+                             'default' => $form['nux_profile_is_default'],
+                             'address' => $form['nux_config_email'],
+                             'server' =>  $form['nux_config_imap_address'],
+                             'user' => $form['nux_config_email'],
+                             'type' => 'imap'
+                         );
+
+                  $profiles = new Hm_Profiles($this);
+                  $profiles->add($profile);
+                  $this->session->record_unsaved('Profile added');
+
+                  $profiles->save($this->user_config);
+                  $user_data = $this->user_config->dump();
+                  $this->session->set('user_data', $user_data);
+
+                  Hm_Msgs::add('Profile Added');
              }
         }
     }
@@ -582,10 +601,10 @@ protected function output() {
     return '<div class="smtp_imap_server_setup">
          <div data-target=".server_config_section" class="server_section">'.
                 '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP & SMTP Servers').'
-                 <div class="server_count">10</div>
+                 <div class="server_count">-</div>
          </div>
          <div class="server_config_section">
-            <div class="stepper">
+            <div class="stepper" id="nux_config_stepper">
                 <div class="step-container">
                     <div id="step_config_1" class="step step_config">
                         <div class="step_config-title">
@@ -684,20 +703,32 @@ protected function output() {
                                     <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
                                     <label for="nux_create_profile">Create Profile</label>
                                </div>
-                               <div class="step_config-form_item nested" id="nux_profile_signature_bloc">
-                                   <label for="nux_profile_signature">Signature</label>
-                                   <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
-                               </div>
-                               <div class="step_config-form_item nested" id="nux_profile_default_bloc">
-                                   <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
-                                   <label for="nux_profile_is_default">Set this profile default</label>
+                               <div class="nested" id="nux_profile_bloc">
+                                   <div class="step_config-form_item nested">
+                                       <label for="nux_profile_reply_to">Reply to</label>
+                                       <br />
+                                        <input type="email"  class="stepper_input" id="nux_profile_reply_to" />
+                                  </div>
+                                   <div class="step_config-form_item nested">
+                                       <label for="nux_profile_signature">Signature</label>
+                                       <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
+                                   </div>
+                                   <div class="step_config-form_item nested">
+                                       <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
+                                       <label for="nux_profile_is_default">Set this profile default</label>
+                                   </div>
                                </div>
                             </form>
                         </div>
+                        <div class="nux_config_form_loader hide" id="nux_config_form_loader">
+                            <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
+                        </div>
                         <div class="step_config-actions">
                             <button class="nux_stepper_btn" onclick="display_config_step(1)">Previous</button>
                             <button class="nux_stepper_btn" onclick="display_config_step(0)">Cancel</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(3)">Finish</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(3)">
+                                Finish
+                            </button>
                         </div>
                     </div>
                     <button id="step_config_0" class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">Add a new server</button>
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 49c376ca7b..da3bf41e6a 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -105,6 +105,7 @@
         'nux_create_profile' => FILTER_VALIDATE_BOOLEAN,
         'nux_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
         'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     )
 );
 
diff --git a/modules/nux/site.js b/modules/nux/site.js
index e70a48dc5a..f02cbff32e 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -2,62 +2,58 @@
 
 
 function submitSmtpImapServer() {
-
-    var formData = {};
-
-    // Retrieve and assign the input values directly to the formData object
-    formData.profileName = document.getElementById('nux_config_profile_name').value;
-    formData.email = document.getElementById('nux_config_email').value;
-    formData.password = document.getElementById('nux_config_password').value;
-    formData.provider = document.getElementById('nux_config_provider').value;
-    formData.isSender = document.getElementById('nux_config_is_sender').checked;
-    formData.isReceiver = document.getElementById('nux_config_is_receiver').checked;
-    formData.smtpAddress = document.getElementById('nux_config_smtp_address').value;
-    formData.smtpPort = document.getElementById('nux_config_smtp_port').value;
-    formData.smtpConType = document.querySelector('input[name="nux_config_smtp_tls"]:checked').value;
-    formData.imapAddress = document.getElementById('nux_config_imap_address').value;
-    formData.imapPort = document.getElementById('nux_config_imap_port').value;
-    formData.imapConType = document.querySelector('input[name="nux_config_imap_tls"]:checked').value;
-    formData.enableSieve = document.getElementById('nux_enable_sieve').checked;
-    formData.createProfile = document.getElementById('nux_create_profile').checked;
-    formData.isProfilDefault = document.getElementById('nux_profile_is_default').checked;
-    formData.profileSignatue = document.getElementById('nux_profile_signature').value;
-
-    // Submit the form data via AJAX
-    Hm_Ajax.request(
-        [
-            {'name': 'hm_ajax_hook', 'value': 'ajax_quick_server_setup_nux'},
-            {'name': 'nux_config_profile_name', 'value': formData.profileName},
-            {'name': 'nux_config_email', 'value': formData.email},
-            {'name': 'nux_config_password', 'value': formData.password},
-            {'name': 'nux_config_provider', 'value': formData.provider},
-            {'name': 'nux_config_is_sender', 'value': formData.isSender},
-            {'name': 'nux_config_is_receiver', 'value': formData.isReceiver},
-            {'name': 'nux_config_smtp_address', 'value': formData.smtpAddress},
-            {'name': 'nux_config_smtp_port', 'value': formData.smtpPort},
-            {'name': 'nux_config_smtp_tls', 'value': formData.smtpConType},
-            {'name': 'nux_config_imap_address', 'value': formData.imapAddress},
-            {'name': 'nux_config_imap_port', 'value': formData.imapPort},
-            {'name': 'nux_config_imap_tls', 'value': formData.imapConType},
-            {'name': 'nux_enable_sieve', 'value': formData.enableSieve},
-            {'name': 'nux_create_profile', 'value': formData.createProfile},
-            {'name': 'nux_profile_is_default', 'value': formData.isProfilDefault},
-            {'name': 'nux_profile_signature', 'value': formData.profileSignatue},
-        ],
-        function (res) {
-            console.log("res", res);
-            // Handle the AJAX response here
-        }
-    );
+    $('#nux_config_form_loader').removeClass('hide');
+    $('.step_config-actions').addClass('hide');
+
+    var requestData = [
+        { name: 'hm_ajax_hook', value: 'ajax_quick_server_setup_nux' },
+        { name: 'nux_config_profile_name', value: $('#nux_config_profile_name').val() },
+        { name: 'nux_config_email', value: $('#nux_config_email').val() },
+        { name: 'nux_config_password', value: $('#nux_config_password').val() },
+        { name: 'nux_config_provider', value: $('#nux_config_provider').val() },
+        { name: 'nux_config_is_sender', value: $('#nux_config_is_sender').prop('checked') },
+        { name: 'nux_config_is_receiver', value: $('#nux_config_is_receiver').prop('checked') },
+        { name: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val() },
+        { name: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val() },
+        { name: 'nux_config_smtp_tls', value: $('input[name="nux_config_smtp_tls"]:checked').val() },
+        { name: 'nux_config_imap_address', value: $('#nux_config_imap_address').val() },
+        { name: 'nux_config_imap_port', value: $('#nux_config_imap_port').val() },
+        { name: 'nux_config_imap_tls', value: $('input[name="nux_config_imap_tls"]:checked').val() },
+        { name: 'nux_enable_sieve', value: $('#nux_enable_sieve').prop('checked') },
+        { name: 'nux_create_profile', value: $('#nux_create_profile').prop('checked') },
+        { name: 'nux_profile_is_default', value: $('#nux_profile_is_default').prop('checked') },
+        { name: 'nux_profile_signature', value: $('#nux_profile_signature').val() },
+        { name: 'nux_profile_reply_to', value: $('#nux_profile_reply_to').val() }
+    ];
+
+    Hm_Ajax.request(requestData, function(res) {
+        $('#nux_config_form_loader').addClass('hide');
+        $('.step_config-actions').removeClass('hide');
+
+        $('#nux_config_stepper').find('form').trigger('reset');
+        display_config_step(0);
+
+        //Initialize the form
+        $("#nux_profile_reply_to").val('');
+        $("#nux_profile_signature").val('');
+        $("#nux_config_profile_name").val('');
+        $("#nux_config_email").val('');
+        $("#nux_config_password").val('');
+        $("#nux_profile_is_default").prop('checked', true);
+        $("#nux_config_is_sender").prop('checked', true);
+        $("#nux_config_is_receiver").prop('checked', true);
+        $("#nux_enable_sieve").prop('checked', true);
+        $('#step_config-imap_bloc').show();
+        $('#step_config-smtp_bloc').show();
+        $('#nux_profile_bloc').show();
+    });
 }
 
 function handleCreateProfileCheckboxChange(checkbox) {
     if(checkbox.checked) {
-        $('#nux_profile_signature_bloc').show();
-        $('#nux_profile_default_bloc').show();
+        $('#nux_profile_bloc').show();
     }else{
-        $('#nux_profile_signature_bloc').hide();
-        $('#nux_profile_default_bloc').hide();
+        $('#nux_profile_bloc').hide();
     }
 }
 function handleSmtpImapCheckboxChange(checkbox) {
@@ -71,14 +67,12 @@ function handleSmtpImapCheckboxChange(checkbox) {
         else $('#step_config-imap_bloc').hide();
     }
 
-    if($('#nux_config_is_sender').checked &&
-        $('#nux_config_is_receiver').checked){
-        $('#nux_profile_signature_bloc').show();
-        $('#nux_profile_default_bloc').show();
+    if($('#nux_config_is_sender').prop('checked') &&
+        $('#nux_config_is_receiver').prop('checked')){
+        $('#nux_profile_bloc').show();
         $('#nux_profile_checkbox_bloc').show();
     }else{
-        $('#nux_profile_signature_bloc').hide();
-        $('#nux_profile_default_bloc').hide();
+        $('#nux_profile_bloc').hide();
         $('#nux_profile_checkbox_bloc').hide();
     }
 }
@@ -87,7 +81,7 @@ function display_config_step(stepNumber) {
 
         var isValid = true;
 
-        [{key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
+        [   {key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
             {key: 'nux_config_email', value: $('#nux_config_email').val()},
             {key: 'nux_config_password', value: $('#nux_config_password').val()}].forEach((item) => {
                 if(!item.value) {
@@ -105,7 +99,8 @@ function display_config_step(stepNumber) {
         $("#nux_config_provider").val(providerKey);
 
         Hm_Ajax.request(
-            [{'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
+            [
+                {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
                 {'name': 'nux_service', 'value': providerKey},],
             function(res) {
                 if(res.service_details){

From 02713a0884a95b76cf16fcf0f9e1609056960190 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 7 Nov 2023 09:01:37 +0100
Subject: [PATCH 09/55] [Ref] implement profil saving & refactor nux by
 splitting code in functions

---
 .DS_Store                        | Bin 0 -> 8196 bytes
 .github/.DS_Store                | Bin 0 -> 6148 bytes
 mail-debug                       |   1 +
 modules/.DS_Store                | Bin 0 -> 12292 bytes
 modules/imap/handler_modules.php |  16 +--
 modules/nux/modules.php          | 228 +++++++++++++++++++------------
 modules/nux/site.js              |   4 +
 modules/smtp/modules.php         |  12 +-
 tests/.DS_Store                  | Bin 0 -> 6148 bytes
 9 files changed, 152 insertions(+), 109 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .github/.DS_Store
 create mode 120000 mail-debug
 create mode 100644 modules/.DS_Store
 create mode 100644 tests/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e7977499f999e2ea41cd14bff51e5b83878a2930
GIT binary patch
literal 8196
zcmeHMJ%|%Q6n>NBlIWqH-GPV;VykyxbA_;;5gP^ZK(W%~5|T(_LVm=b15+r9Hp+E^
zSSTKXg2j~<f<`!O<lqWBMX>g;QX9YdF*|QJdsa%|W?<$m^S(FVw=ZvZm<<t$*=})~
zXp)Gs=+aJ%V;It;U-n2#n3*Y9fq1Hwr|0Gy^=1U=CR_$w23!VQ23!VQ21X?V*t2EJ
z#_apr>qeIWmw`>00r`IL(53Z_?P;rC9T?OR05*kb)o?u_FJL`mePest!h<GsD69?@
z=7=G5IOaWr^NsCktHVi{!-p`;!kkcqV#oTPf|KyIb)(CG%Rn>(^6Z|X{ZytZb=diR
z?aT|?S8wEUg<7M4x$M5rtGVk7{lnZ}+|b{wSl<TLKOmGce|V`vT`Dkkx-B6ggsoxQ
z&HIPGw3UVkDo_%SVtRxJG8%)PDix_jd8Q??b(wo@9ZN6oK3cr0bXf8AMxbFhg7GIl
zNq%`B9codYE<s0|X`qkaq6k~Zul%zo+w+5bSnJqY;!#YGXi7a<szJ*|)J7M!OeLl$
z-QO|{V{1C{e()Pb*0NP?gk!ogQ&LwFx~idiN%mWT$JVg2XZO#Ju2mCfGe^CQFLh7y
zWvEUK)I}G(rO@wkAp0hYu=$tY-RNG{{GoMh9q}lpXU5lh+BA<ksZta55~`C2X{CoD
zY&|EQJ`d_7gbHdl9>w(N%{WDEXz7INW5+cQN(Me#L;2z93rnZo>i36<wX-qI&v<vL
zIvA6j;11^?eQXBIme=N9Sp0tWvF2uo;NFKL7=Pw92xuJ472J6XwQ&x=MIKijy2754
z#Bm9YLE5@*ef_br{z~N}79D8(JDTZDsOLG2_eu%Ra}m|tVk&ptk<T*o+uHV?9Mo_K
z6DW$qFdYXy(6}}t8Axg!lk)t3H2(Ylh^TckTn1bQ{zV2vDmRy##mag+k5b69wugQm
vT{em9X{$mosN*=SI*!8*{xHO~2dIqkjqPcR8MOcYA;9hbZvR)6x4DPk6cF(1

literal 0
HcmV?d00001

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1c5dcb19766dca994fa3a8a5097aa93e5bd48331
GIT binary patch
literal 6148
zcmeHKJx{|h5PdF1v;v`yj2T%wFe0T@Iv|0BC=9RwrF=-VN<~3kBL+qUzk$C3zoc{d
z4ZO3hG@*ft1tD}-`JQvRvoFtS&IVwbcilQr15jZTELEurMD9zQk&?Hp5RDz9g=6fa
zg&pk9c&p(rG9YWWiY>JHJK)Mq*KZpQS<BvKy?qw<2QK;Y#ytOi97Ua8+@W7(@;Ets
z*?VowkLmt6W^k3wE94Yd#4XM-q#ow8K9$!ub2ppg`u+3fc=#qc<~*hu6?^38f0FsD
z7$L?Du5p1Ld!x^JEWH<dW%D_DNb@NeuOCnI`rb32pZvd7lmTTx8Ausm%@(OFJ5;R<
zC<Dqs%7A<y0ye?WW8%<$I;iXsfLNy43j21iK@7w|3_T_eX`vVwN_3&dA2Eyzr#<j~
zp~u9b3x}~Ya~waj@h24HcRD7p?l7T4)yjY}kY`}QUDl-jx4u6A=Y#Z08BhlP6$7Rm
zwWB5<$=BAIhm%?xu${1ph+pC`4PnQYV){xcUSqRDdmtTR=rM6f3q>~qmIhVIz^^j!
E0qGxh#{d8T

literal 0
HcmV?d00001

diff --git a/mail-debug b/mail-debug
new file mode 120000
index 0000000000..3d26826994
--- /dev/null
+++ b/mail-debug
@@ -0,0 +1 @@
+/usr/local/share/cypht/Applications/MAMP/htdocs/mail-debug
\ No newline at end of file
diff --git a/modules/.DS_Store b/modules/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d7965207a05557b3e4ffb425df726c7c5c071309
GIT binary patch
literal 12292
zcmeHNU1%It6uy(B%_dFKv`|`os0+0aL8>i2C~ag@SA0-GY@w7Y$tJr^mS(ddo2{){
zObfN3P>P87(_)N*f?^9TTCLb>&4WIa7K*-D5PzWHgH>D6hoaxPcXsBS`CnfOIumB@
zWX^ZyeCOPI&;6NIN?9B0#kETHDWx(vsqF2-<yob&i%_zI<aGLuRy?tAzK9d|y-H21
zF;!Q?m1;ikL;D}J;1TJ!;asRjRhjD#k5`BBJhT45yKnUr<_8-8&uzW-<*%Q7F#uV5
zq!CCXkVYVlKpKHG0?kK&#$Fs5&v<X1rq?tAX$1b)5up5##Ytt(E@w=sQwJ_Ig(o>p
z;q`%gtONA3tX<~pa>kTe6*^iKrBSu)C5C0x@jOd#lsUVcF{M#gmQh!hZP~I{D3-Pk
zy{v{SD`(2|nnoavfIkAmc;s1o7xRs^c4O`B#Y~Q^-853IOzPK}9@m5Qdqownh96gh
zYD87l1Xl9}+)b<6_$b4xm0O?}iKqR828XM;r|w(4aeg3P$K{<=NBCh9%_8hzl;FcS
zJQ!3@;5vo-qV(YQ<6skl<lGN`{6}N2A{6bijz>$rLm;6#!MBXqkAbBreevGBHw?$Q
zp1SC84SZ*%>N1VPN}h*^XS?QELu;Uj?w0XfLrL9(;M`8XZ1#YHP%f)*l;ksn*C1|X
zRYc56sO4$gS8z8aSuOi249B_Mb&16-;GH~faahSSM?Bj!w}P4!+}gW-;xf+X>T4fe
zIQX>gFODwfu>b1sgZt}JF6_4J`s!-fMSQlS&d>)aLf*c7_9%FSVmYtxSHGwC@uKl=
zZ6?7B-s%cojl5Du=AphYq3f3FwT8a}`bbH{P_0`Zhv)o1yv^YsX@kc)sgCqxi2PWp
zc7XYAHH_F75ceYLp@u$0y=NL(weHWW#SfC|alcNs|Jle<iEMKJn$?wl&XS+qx@Dn#
z!@tN;WA4>xH1}!qr@xJMW6wBF!)<NJG$en!z0pW9f;x&F_f}7VPY-aRc<#fBl~=aD
z`KaFKj?r<wNU9_K$blB}%mjQuKaqW8?PpxZ`7Jr&jLVKLZyP~!X?K$Bw!&^*?Gje4
zB{#bgZgWiCeLb^B*Q>3^EuMVvjww6y*-~N8tOQ!o(ndYmwBxZ(ZBI+My$f?r->~(#
zJ-<}g>(F^L1A9}b@$JY+G}?IPLXUp~%RUU}@Z;I9`<^lRJOJm`{fYJ8of`|m30`Uz
zCRGPmm2|tE)cIu0Tk}1;f>E5?%sD4M0q^6nibhI)j}X6Jn_pG!1kWj*{Yqd;WAy}T
z&=beyl>1_JIQP8|IQcw*o*U<8^aA|q(PI($WHNe5XZI0gc3<0g_#OBZiRb?Gee2Xk
zjE?I|QXT1s?zdg=qYTdEiD}!@xbw~rT5i1`K7?X9|AG7q{Xf)n-;Th$+>_u1?-t#z
z+B9!)6&Xh@-vgeGjPv^ZvXh6I+~pA@7j~6nw}RFy=W&aUy<*$dGH&<M&*v{LHMx%L
z+H%)!abN%Oy}RsroGll2yR&#Te4<sDufJqo;xcacXx-@-jxO)XL2_Z&_`48xsZHzo
zmx#61w+gm}oZG*Az_IVaxW0#B1P^N#W{~I18m_4Gu$~JFHmZC$7{xhld*0y`@ID@$
zXr$n0@-T6{kq3SQfH8O-`mkr@Uzc?yJQnQxyRFCl_e-VEI(M|AMULp%ULCo7TGq#!
zYq0A<aQpY{aK8WhP;LteM+NX%3_e9<vI5wQpv`(Rv*h;%tyN<*INw!Ao^0%2#A><x
zlWR$T&VwA<Jk6)e7&B?ENx!R@kUrc*E1v)q=e^-=hj$>-<r<BY{Bp!Eqvsto8=63@
zvAU7$M&A#@aBhDcaN2<HUA#3$;UuqP#H&~HqO}&W+8MVZshK$k&HW>EIPdCFC#JEs
zxF5~vNx#mJUlgN={kZ4)gD{-;>$3+tw^a35<9iq98HEer)uwr29xCd8LF+vDI5N&-
z**0e%h{@fS7$g^V7aXE^EJOX$NU#HAR24mC5bdyv`?8+NP<_%pMa(nH?5H%S&AG3*
z<(I~Kt_k}*y8rGC!hf^J*`fWXnH%MYNtB)*xZyhd3_x*z?yWm@5r}kaB^oLD>G7c(
z{B|Sy1<W4GXd|I{te@5>5opf$?|ly6NDY^FG7ZUJx32|gM<x6fJ?+Qpd<cA*l=C}1
z=j<a2gv%!wA?%wquGr5PeM_A>g0@{F9nAz6{PvH&|6`sW_WM5#N-t>y(g^%FBVe`V
zH|00NH=5c89W8j6#W{qNFlTVmfqSij3qj}~{W%_`{v40;PI^uU?sIlIV@f>1aRYt`
w(8TyFvu8T~=bi7e(W5$_w?rew_=U*`j)?JD)<-)2o3Y&e7N4W|B^v+#0U=~WBLDyZ

literal 0
HcmV?d00001

diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index 7c3330733b..43d1895091 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -672,7 +672,7 @@ public function process() {
                                     }
                                 }
                             }
-                            
+
                         }
                     }
                 }
@@ -876,7 +876,7 @@ public function process() {
         $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache);
         $archive_folder = false;
         $errors = 0;
-        
+
         $specials = get_special_folders($this, $form['imap_server_id']);
         if (array_key_exists('archive', $specials) && $specials['archive']) {
             $archive_folder = $specials['archive'];
@@ -894,13 +894,13 @@ public function process() {
             }
 
             $form_folder = hex2bin($form['folder']);
-            
+
             /* select source folder */
             if ($errors || !$imap->select_mailbox($form_folder)) {
                 Hm_Msgs::add('ERRAn error occurred archiving the message');
                 $errors++;
             }
-            
+
             /* path according to original option setting */
             if ($this->user_config->get('original_folder_setting', false)) {
                 $archive_folder .= '/'.$form_folder;
@@ -908,7 +908,7 @@ public function process() {
                     $imap->create_mailbox($archive_folder);
                 }
             }
-            
+
             /* try to move the message */
             if (!$errors && $imap->message_action('MOVE', array($form['imap_msg_uid']), $archive_folder)) {
                 Hm_Msgs::add("Message archived");
@@ -1040,7 +1040,7 @@ public function process() {
 }
 
 /**
- * Perform an IMAP message action 
+ * Perform an IMAP message action
  * @subpackage imap/handler
  */
 class Hm_Handler_imap_message_action extends Hm_Handler_Module {
@@ -1059,7 +1059,7 @@ public function process() {
                 foreach ($ids as $server => $folders) {
                     $specials = get_special_folders($this, $server);
                     $trash_folder = false;
-                    $archive_folder = false;                    
+                    $archive_folder = false;
                     $cache = Hm_IMAP_List::get_cache($this->cache, $server);
                     $imap = Hm_IMAP_List::connect($server, $cache);
                     if (imap_authed($imap)) {
@@ -1544,7 +1544,7 @@ public function process() {
                 else {
                     $name = $this->config->get('imap_auth_name', 'Default');
                 }
-                $imap_details = array( 
+                $imap_details = array(
                     'name' => $name,
                     'default' => true,
                     'server' => $auth_server['server'],
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 6b8b5c1067..482503b661 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -249,6 +249,12 @@ public function process() {
  * @subpackage nux/handler
  */
 class Hm_Handler_quick_server_setup_nux extends Hm_Handler_Module {
+    public $smtp_server_id = null;
+    public $imap_server_id = null;
+    public $just_saved_credentials = false;
+    public $imap = null;
+    public $smtp = null;
+
     public function process() {
         list($success, $form) = $this->process_form(array(
            'nux_config_profile_name',
@@ -271,111 +277,153 @@ public function process() {
            ));
 
         if ($success) {
-             $smtp_server_id = null;
-             $imap_server_id = null;
              /*
              *  Connect to SMTP server if user wants to send emails
              */
              if($form['nux_config_is_sender']){
-                 if ($con = @fsockopen($form['nux_config_smtp_address'], $form['nux_config_smtp_port'], $errno, $errstr, 2)) {
-
-                     Hm_SMTP_List::add( array(
-                         'name' => $form['nux_config_profile_name'],
-                         'server' => $form['nux_config_smtp_address'],
-                         'port' => $form['nux_config_smtp_port'],
-                         'user' => $form['nux_config_email'],
-                         'pass' => $form['nux_config_password'],
-                         'tls' => $form['nux_config_smtp_tls']));
-
-                     $smtp_servers = Hm_SMTP_List::dump(false, true);
-                     $ids = array_keys($smtp_servers);
-                     $smtp_server_id = array_pop($ids);
-
-
-                      $smtp = Hm_SMTP_List::connect($smtp_server_id, false, $form['nux_config_email'], $form['nux_config_password'], true);
-                      if (is_object($smtp) && $smtp->state == 'authed') {
-                          $this->user_config->set('smtp_servers', $smtp_servers);
-                          $just_saved_credentials = true;
-                          $this->session->record_unsaved('SMTP server saved');
-                      }
-                      else {
-                          Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
-                          Hm_SMTP_List::forget_credentials($smtp_server_id);
-                          return;
-                      }
-                 } else {
-                     Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
-                     return;
-                 }
+                 $this->connectToSMPT(
+                    $form['nux_config_smtp_address'],
+                    $form['nux_config_profile_name'],
+                    $form['nux_config_smtp_port'],
+                    $form['nux_config_email'],
+                    $form['nux_config_password'],
+                    $form['nux_config_smtp_tls']);
              }
 
              /*
               *  Connect to IMAP server if user wants to receive emails
               */
              if($form['nux_config_is_receiver']){
-                 if ($con = fsockopen($form['nux_config_imap_address'], $form['nux_config_imap_port'], $errno, $errstr, 5)) {
-                      $imap_list = array(
-                          'name' => $form['nux_config_profile_name'],
-                          'server' => $form['nux_config_imap_address'],
-                          'hide' => false,
-                          'port' => $form['nux_config_imap_port'],
-                          'user' => $form['nux_config_email'],
-                          'pass' => $form['nux_config_password'],
-                          'tls' => $form['nux_config_imap_tls']);
-
-
-                      Hm_IMAP_List::add($imap_list);
-                      $servers = Hm_IMAP_List::dump(false, true);
-                      $ids = array_keys($servers);
-                      $imap_server_id = array_pop($ids);
-                      Hm_IMAP_List::clean_up();
-
-
-                      $cache = Hm_IMAP_List::get_cache($this->cache, $imap_server_id);
-                      $imap = Hm_IMAP_List::connect($imap_server_id, $cache, $form['nux_config_email'], $form['nux_config_password'], true);
-                      if (imap_authed($imap)) {
-                          $this->user_config->set('imap_servers', $servers);
-                          $just_saved_credentials = true;
-                          $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
-                      }
-                      else {
-                          Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                          Hm_IMAP_List::forget_credentials($imap_server_id);
-                          return;
-                      }
-                  }else {
-                      Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
-                      return;
-                 }
-
-                 Hm_Msgs::add("Server saved");
+                 $this->connectToIMAP(
+                   $form['nux_config_imap_address'],
+                   $form['nux_config_profile_name'],
+                   $form['nux_config_imap_port'],
+                   $form['nux_config_email'],
+                   $form['nux_config_password'],
+                   $form['nux_config_imap_tls']);
              }
 
-             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset(imap_server_id)) {
-                 $profile = array(
-                             'name' => $form['nux_config_profile_name'],
-                             'sig' => $form['nux_profile_signature'],
-                             'smtp_id' => $imap_server_id,
-                             'replyto' => $form['nux_profile_reply_to'],
-                             'default' => $form['nux_profile_is_default'],
-                             'address' => $form['nux_config_email'],
-                             'server' =>  $form['nux_config_imap_address'],
-                             'user' => $form['nux_config_email'],
-                             'type' => 'imap'
-                         );
-
-                  $profiles = new Hm_Profiles($this);
-                  $profiles->add($profile);
-                  $this->session->record_unsaved('Profile added');
-
-                  $profiles->save($this->user_config);
-                  $user_data = $this->user_config->dump();
-                  $this->session->set('user_data', $user_data);
-
-                  Hm_Msgs::add('Profile Added');
+             Hm_Msgs::add("Server saved");
+
+             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                 $this->saveProfile(
+                    $form['nux_config_profile_name'],
+                    $form['nux_profile_signature'],
+                    $form['nux_profile_reply_to'],
+                    $form['nux_profile_is_default'],
+                    $form['nux_config_email'],
+                    $form['nux_config_imap_address']
+                    );
              }
+
+
+             $this->out('just_saved_credentials', $this->just_saved_credentials);
+             $this->out('is_jmap_supported', $this->module_is_supported('jmap'));
         }
     }
+
+    public function saveProfile($name, $signature, $replyTo, $isDefault, $email, $serverMail){
+        $profile = array(
+                         'name' => $name,
+                         'sig' => $signature,
+                         'smtp_id' => $this->imap_server_id,
+                         'replyto' => $replyTo,
+                         'default' => $isDefault,
+                         'address' => $email,
+                         'server' =>  $serverMail,
+                         'user' => $email,
+                         'type' => 'imap'
+                     );
+
+          $profiles = new Hm_Profiles($this);
+          $profiles->add($profile);
+          $this->session->record_unsaved('Profile added');
+
+          $profiles->save($this->user_config);
+          $user_data = $this->user_config->dump();
+          $this->session->set('user_data', $user_data);
+
+          Hm_Msgs::add('Profile Added');
+    }
+
+    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
+        if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
+              $imap_list = array(
+                  'name' => $name,
+                  'server' => $address,
+                  'hide' => false,
+                  'port' => $port,
+                  'user' => $user,
+                  'pass' => $pass,
+                  'tls' => $tls);
+
+
+              Hm_IMAP_List::add($imap_list);
+              $servers = Hm_IMAP_List::dump(false, true);
+              $ids = array_keys($servers);
+              $this->imap_server_id = array_pop($ids);
+
+              if (in_server_list('Hm_IMAP_List', $this->imap_server_id, $user)) {
+                  Hm_Msgs::add('ERRThis server and username are already configured');
+                  return;
+              }
+
+              Hm_IMAP_List::clean_up();
+              $cache = Hm_IMAP_List::get_cache($this->cache, $this->imap_server_id);
+              $imap = Hm_IMAP_List::connect($this->imap_server_id, $cache, $user, $pass, true);
+              if (imap_authed($imap)) {
+                  $this->user_config->set('imap_servers', $servers);
+                  $this->just_saved_credentials = true;
+                  $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+              }
+              else {
+                  Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                  Hm_IMAP_List::forget_credentials($this->imap_server_id);
+                  return;
+              }
+          }else {
+              Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
+              return;
+         }
+    }
+
+    public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
+         if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
+
+              Hm_SMTP_List::add( array(
+                  'name' => $name,
+                  'server' => $address,
+                  'port' => $port,
+                  'user' => $user,
+                  'pass' => $pass,
+                  'tls' => $tls));
+
+              $smtp_servers = Hm_SMTP_List::dump(false, true);
+              $ids = array_keys($smtp_servers);
+              $this->smtp_server_id = array_pop($ids);
+
+              if (in_server_list('Hm_SMTP_List', $this->smtp_server_id, $user)) {
+                  Hm_Msgs::add('ERRThis SMTP server and username are already configured');
+                  return;
+              }
+
+
+               $this->smtp = Hm_SMTP_List::connect($this->smtp_server_id, false, $user, $pass, true);
+               if (is_object($this->smtp) && $this->smtp->state == 'authed') {
+                   $this->user_config->set('smtp_servers', $smtp_servers);
+                   $this->just_saved_credentials = true;
+                   $this->session->record_unsaved('SMTP server saved');
+               }
+               else {
+                   Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
+                   Hm_SMTP_List::forget_credentials($this->smtp_server_id);
+                   return;
+               }
+          } else {
+              Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
+              return;
+          }
+    }
 }
 
 /**
diff --git a/modules/nux/site.js b/modules/nux/site.js
index f02cbff32e..bd38bc1d0c 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -27,6 +27,7 @@ function submitSmtpImapServer() {
     ];
 
     Hm_Ajax.request(requestData, function(res) {
+        console.log(res)
         $('#nux_config_form_loader').addClass('hide');
         $('.step_config-actions').removeClass('hide');
 
@@ -46,6 +47,9 @@ function submitSmtpImapServer() {
         $('#step_config-imap_bloc').show();
         $('#step_config-smtp_bloc').show();
         $('#nux_profile_bloc').show();
+
+        Hm_Utils.set_unsaved_changes(1);
+        Hm_Folders.reload_folders(true);
     });
 }
 
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 4f0d963d53..26eb0a866a 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -387,13 +387,7 @@ public function process() {
                         'server' => $form['new_smtp_address'],
                         'port' => $form['new_smtp_port'],
                         'tls' => $tls));
-                     ob_start();
-                     var_dump(Hm_SMTP_List::dump());
-                     $output = ob_get_clean();
 
-                     error_log('=============');
-                     error_log($output);
-                     error_log('=============');
                     Hm_Msgs::add('Added SMTP server!');
                     $this->session->record_unsaved('SMTP server added');
                 }
@@ -448,11 +442,7 @@ public function process() {
                     return;
                 }
 
-               error_log("$form[smtp_server_id] ". $form['smtp_server_id']);
-               error_log("$form[smtp_server_id] ". $form['smtp_user']);
-               error_log("$form[smtp_server_id] ". $form['smtp_pass']);
-
-                $smtp = Hm_SMTP_List::connect($form['smtp_server_id'], false, $form['smtp_user'], $form['smtp_pass'], true);
+               $smtp = Hm_SMTP_List::connect($form['smtp_server_id'], false, $form['smtp_user'], $form['smtp_pass'], true);
                 if (smtp_authed($smtp)) {
                     $just_saved_credentials = true;
                     Hm_Msgs::add("Server saved");
diff --git a/tests/.DS_Store b/tests/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9e2adcb101ace96c00314b8ea925d1b64cb1f457
GIT binary patch
literal 6148
zcmeHKO-jR15S~}7Mg%FYT;>S&075MB1igUPN-HELP_q=WbmKx7;sIQ^@fe=Oi}=kC
zwJ}j#iIf?b_a*aYGLtVMlOduos-{Dt0TD$|#@-H=4&i;)mh{ZRn?bH|MVEA)&4%Oi
zqUG&||HuG8yKO3I4y|bA`Q@dQyZLn2_Q;Dgon*xXJJJ3A>+{~(+i{oI^cP;`oZlA9
zwk1g;TF?b$P_Cz<T;C}3p~n}_`_*T)rkmS`qxXf>)ZzD8)lYtny22q+x;O*QfHSZ*
z44`MTM7xT<Is?vtGq7ZUzYj5#F)^$a<<o&hMgU+RW)U3oEWt6cVPaS-Vh0j56sV!W
zMvS20u*c??7}km!PQiwcV3~tWC_%F0`mwlENECf_2AqK=0~>le;QoK|{ruky@-t_^
z8CWX@LO&g+Bixep*4E8&uZ^LnP!{&96_+76kX8&|Zp8;s5!hos049dDA}kR95fB=D
JaR&aBfe*y3Qi=co

literal 0
HcmV?d00001


From 1e9d4208ef0cea9395c7a1b535a6227990f99d25 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 9 Nov 2023 21:25:06 +0100
Subject: [PATCH 10/55] [Feat] Translaste stepper form label

---
 .DS_Store                       | Bin 8196 -> 8196 bytes
 language/en.php                 |  21 +++-
 modules/.DS_Store               | Bin 12292 -> 12292 bytes
 modules/core/site.css           |  10 +-
 modules/imap/output_modules.php |  25 ++---
 modules/imap/setup.php          |   3 +-
 modules/imap/site.css           |   2 +-
 modules/nux/modules.php         | 169 +++++++++++++++++++-------------
 modules/nux/setup.php           |   2 +-
 modules/nux/site.css            |   8 +-
 modules/nux/site.js             |  50 +++++-----
 modules/smtp/modules.php        |   9 +-
 modules/smtp/setup.php          |   2 +-
 13 files changed, 175 insertions(+), 126 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index e7977499f999e2ea41cd14bff51e5b83878a2930..665f2824bbdc1c93f08f324d55d16488b6457484 100644
GIT binary patch
delta 115
zcmZp1XmQw}DiC+gypVx`frUYjA)O(Up(Hoo#U&{xKM5$tF}r-GiE!;vM^yO~xP15X
kUk2#%1sR6H$@#ejKs^i$pBpwe3!G$P;#A-4C%laZ0P^D>AOHXW

delta 115
zcmZp1XmQw}DiC)yd@Tb50}F#5LpnnyLrHGFi%U{YeiBfOL-pY$m-?Ecj;Qh}c;yQ+
e41<&Na|?ia7#KcY*xW2|l8K4q@Mb^ZZ9D)>jv)5{

diff --git a/language/en.php b/language/en.php
index ca321bb9d7..2db28c43da 100755
--- a/language/en.php
+++ b/language/en.php
@@ -575,7 +575,24 @@
     'Archive to the original folder' => false,
     'Move To Blocked Folder' => false,
     'Sieve server capabilities' => false,
-    'Connection To Sieve Server Failed' => false
-); 
+    'Connection To Sieve Server Failed' => false,
+    'Step 1' => false,
+    'Step 2' => false,
+    'Authentication' => false,
+    'Profile name' => false,
+    'Email' => false,
+    'Password' => false,
+    'Mail server configuration' => false,
+    'Sender account' => false,
+    'Receiver account' => false,
+    'Address' => false,
+    'Enable Sieve' => false,
+    'Create Profile' => false,
+    'Sieve server' => false,
+    'Reply to' => false,
+    'Set this profile default' => false,
+    'Finish' => false,
+    'Add a new server' => false,
+);
 
 ?>
diff --git a/modules/.DS_Store b/modules/.DS_Store
index d7965207a05557b3e4ffb425df726c7c5c071309..a87c9976fc1c68c3f09bac25ef26e53ad98d0aee 100644
GIT binary patch
delta 41
vcmZokXi3<xP(o%B0|NsyLmopZLq%@Bi%U{YeiBfGgMVRKu;k{w67J#v{z?n6

delta 41
vcmZokXi3<xP(ntEfq{XUA&;Syp&~cm#U&{xKM5$pk-=c`mt*r@33qV-?{f=W

diff --git a/modules/core/site.css b/modules/core/site.css
index 5505e5d4aa..d56fcc4a1c 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -65,7 +65,7 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .debug { color: teal; font-size: 75%; float: right; clear: both; margin: 20px; }
 .inner_list a { padding-right: 5px; }
 .folders { margin-top: 10px; margin-bottom: 20px; margin-left: 20px !important;}
-.inner_list { margin-bottom: 10px; } 
+.inner_list { margin-bottom: 10px; }
 .folders a, .unread_link { color: #555; text-decoration: none; line-height: 1.25em; }
 .folder_list { background-color: #fff; margin-right: 20px; padding-right: 15px; padding-bottom: 40px; min-width: 200px; padding-top: 0px; }
 .folder_cell { vertical-align: top; height: 100%; max-width: 15%; display: table-cell; padding: 0px; margin: 0px; }
@@ -142,9 +142,9 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .section_caret { opacity: .15; vertical-align: 4px; padding-right: 10px; }
 .server_count { float: right; margin-right: 120px; font-size: 90%; }
 .email_setting, .all_setting, .unread_setting, .flagged_setting, .general_setting, .junk_setting, .trash_setting, .drafts_setting { display: none; }
-.configured_server, .add_server { margin-top: 10px; color: #666; background-color: #fff; margin-bottom: 20px; padding: 10px; width: 200px; }
+.configured_server, .add_server { margin-top: 10px; color: #666; background-color: #fff; padding: 10px; width: 200px; }
 .message_list { min-height: 600px; background-color: #fff; height: 100%; padding-bottom: 20px; }
-.configured_server { float: left; margin-left: 25px; width: 230px; }
+.configured_server { float: left; margin-left: 25px; width:90%; display: flex; justify-content: space-between; gap: 15px; border: 1px solid #ccc; border-radius: 10px; }
 .add_server { margin-right: 25px; float: left; clear: left; margin-left: 25px; width: 230px; }
 .configured_server input, .add_server input, .add_server select { margin-bottom: 10px; padding: 5px; margin-right: 5px; }
 .list_sources, .update_search_label_field { z-index: 100; border-left: solid 1px #ede8e6; border-bottom: solid 1px #ede8e6; position: absolute; right: 0px; top: 54px; background-color: #fafafa; font-size: 85%; padding: 30px; padding-top: 10px; display: none;}
@@ -231,7 +231,7 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .mobile .update_message_list { margin-right: 20px; }
 .mobile .msg_text { width: 100%; max-width: 480px !important; word-break: break-all; word-wrap: break-word; font-size: 100%; }
 .mobile .msg_controls { background: linear-gradient(180deg, #fff, #fff, #f7f2ef) !important; z-index: 100; position: fixed; right: -10px; height: 54px; font-size: 115%; padding-left: 5px; padding-top: 5px; top: 1px; left: 65px !important; }
-@media (orientation: landscape) { 
+@media (orientation: landscape) {
     .mobile .msg_controls { top: 12px; height: 26px; }
     .mobile .toggle_link { height: 17px !important; }
     .mobile .search_form { margin-left: -18px !important; }
@@ -310,7 +310,7 @@ div.unseen, .unseen .subject { font-weight: 700; }
 
 #list_controls_menu {
     position: absolute;
-    width: 50px; 
+    width: 50px;
     right: 0px;
     display: none;
     padding-left: 14px;
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 6ba5bb0593..a7c6f2542d 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -439,7 +439,12 @@ protected function output() {
                 $disabled = '';
             }
             $res .= '<div class="configured_server">';
-            $res .= sprintf('<div class="server_title">%s</div><div class="server_subtitle">%s/%d %s</div>',
+            $res .= sprintf('
+                    <div>
+                        <div class="server_type_tag">IMAP</div>
+                        <div class="server_title">%s</div>
+                        <div class="server_subtitle">%s/%d %s</div>
+                    </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']),
                 $vals['tls'] ? 'TLS' : '' );
             $res .= '<form class="imap_connect" method="POST">'.
@@ -521,23 +526,7 @@ protected function output() {
 
         return '<div class="imap_server_setup"><div data-target=".imap_section" class="server_section">'.
             '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'.
-            ' '.$this->trans('IMAP Servers').'<div class="server_count">'.$count.'</div></div><div class="imap_section"><form class="add_server" method="POST">'.
-            '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
-            '<div class="subtitle">'.$this->trans('Add an IMAP Server').'</div><table>'.
-            '<tr><td colspan="2"><label class="screen_reader" for="new_imap_name">'.$this->trans('Account name').'</label>'.
-            '<input id="new_imap_name" required type="text" name="new_imap_name" class="txt_fld" value="" placeholder="'.$this->trans('Account name').'" /></td></tr>'.
-            '<tr><td colspan="2"><label class="screen_reader" for="new_imap_address">'.$this->trans('Server address').'</label>'.
-            '<input required type="text" id="new_imap_address" name="new_imap_address" class="txt_fld" placeholder="'.$this->trans('IMAP server address').'" value=""/></td></tr>'.
-            '<tr><td colspan="2"><label class="screen_reader" for="new_imap_port">'.$this->trans('IMAP port').'</label>'.
-            '<input required type="number" id="new_imap_port" name="new_imap_port" class="txt_fld" value="993" placeholder="'.$this->trans('Port').'"></td></tr>'.
-             $sieve_extra.
-            '<tr><td colspan="2"><input type="checkbox" id="new_imap_hidden" name="new_imap_hidden" class="" value="1">'.
-            '<label for="new_imap_hidden">'.$this->trans('Hide From Combined Pages').'</label></td></tr>'.
-             $sieve_extra2.
-            '<tr><td><input type="radio" name="tls" value="1" id="imap_tls" checked="checked" /> <label for="imap_tls">'.$this->trans('Use TLS').'</label>'.
-            '<br /><input type="radio" name="tls" value="0" id="imap_notls" /><label for="imap_notls">'.$this->trans('STARTTLS or unencrypted').'</label></td>'.
-            '</tr><tr><td><input type="submit" value="'.$this->trans('Add').'" name="submit_imap_server" /></td></tr>'.
-            '</table></form>';
+            ' '.$this->trans('IMAP Servers').'<div class="server_count">'.$count.'</div></div><div class="imap_section"></div></div>';
     }
 }
 
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 4ba7d7d30a..1ada0a6de4 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -21,8 +21,7 @@
 add_handler('servers', 'process_add_imap_server', true, 'imap', 'message_list_type', 'after');
 add_handler('servers', 'process_add_jmap_server', true, 'imap', 'process_add_imap_server', 'after');
 add_handler('servers', 'save_imap_servers',  true, 'imap', 'process_add_jmap_server', 'after');
-add_output('servers', 'add_imap_server_dialog', true, 'imap', 'server_content_start', 'after');
-add_output('servers', 'display_configured_imap_servers', true, 'imap', 'add_imap_server_dialog', 'after');
+add_output('servers', 'display_configured_imap_servers', true, 'imap', 'display_configured_smtp_servers', 'after');
 add_output('servers', 'add_jmap_server_dialog', true, 'imap', 'display_configured_imap_servers', 'after');
 add_output('servers', 'display_configured_jmap_servers', true, 'imap', 'add_jmap_server_dialog', 'after');
 add_output('servers', 'imap_server_ids', true, 'imap', 'page_js', 'before');
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 3d7b8dedcf..0c6a5de024 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -10,7 +10,7 @@
 .add_server .txt_fld { width: 205px; }
 .add_server .port_fld { width: 50px; }
 .server_title { font-size: 110%; margin-bottom: 0px; color: #666; }
-.server_subtitle { margin-bottom: 20px; color: #666; overflow: hidden; text-overflow: ellipsis}
+.server_subtitle {font-size: x-small; color: teal; overflow: hidden; text-overflow: ellipsis}
 .msg_text { min-height: 600px; background-color: #fff; height: 100%; }
 .msg_text_inner { min-height: 300px; font-family: monospace; width: 90%; padding: 30px; padding-left: 40px; }
 .msg_headers { max-width: 100%; border-bottom: solid 1px #ddd; color: #777; padding: 0px; padding-bottom: 10px; padding-top: 10px; }
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 482503b661..f46bbd60c7 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -281,26 +281,30 @@ public function process() {
              *  Connect to SMTP server if user wants to send emails
              */
              if($form['nux_config_is_sender']){
-                 $this->connectToSMPT(
+                 $result = $this->connectToSMPT(
                     $form['nux_config_smtp_address'],
                     $form['nux_config_profile_name'],
                     $form['nux_config_smtp_port'],
                     $form['nux_config_email'],
                     $form['nux_config_password'],
                     $form['nux_config_smtp_tls']);
+
+                 if(!isset($result)) return;
              }
 
              /*
               *  Connect to IMAP server if user wants to receive emails
               */
              if($form['nux_config_is_receiver']){
-                 $this->connectToIMAP(
+                 $result = $this->connectToIMAP(
                    $form['nux_config_imap_address'],
                    $form['nux_config_profile_name'],
                    $form['nux_config_imap_port'],
                    $form['nux_config_email'],
                    $form['nux_config_password'],
                    $form['nux_config_imap_tls']);
+
+                 if(!isset($result)) return;
              }
 
              Hm_Msgs::add("Server saved");
@@ -318,7 +322,6 @@ public function process() {
 
 
              $this->out('just_saved_credentials', $this->just_saved_credentials);
-             $this->out('is_jmap_supported', $this->module_is_supported('jmap'));
         }
     }
 
@@ -346,7 +349,7 @@ public function saveProfile($name, $signature, $replyTo, $isDefault, $email, $se
           Hm_Msgs::add('Profile Added');
     }
 
-    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
+    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $enableSieve = false, $errno = null, $errstr = null) {
         if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
               $imap_list = array(
                   'name' => $name,
@@ -357,6 +360,20 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $errno
                   'pass' => $pass,
                   'tls' => $tls);
 
+//               if (isset($enableSieve) && $enableSieve) {
+//                   $imap_list['sieve_config_host'] = $enableSieve;
+//
+//                    require_once VENDOR_PATH . 'autoload.php';
+//                    try {
+//                        list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($this->request->post['imap_sieve_host']);
+//                        $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
+//                        $client->connect($form['imap_user'], $form['imap_pass'], $sieve_tls, "", "PLAIN");
+//                    } catch (Exception $e) {
+//                        Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
+//                        return;
+//                    }
+//               }
+
 
               Hm_IMAP_List::add($imap_list);
               $servers = Hm_IMAP_List::dump(false, true);
@@ -385,6 +402,8 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $errno
               Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
               return;
          }
+
+        return true;
     }
 
     public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
@@ -423,6 +442,8 @@ public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno
               Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
               return;
           }
+
+        return true;
     }
 }
 
@@ -645,146 +666,158 @@ protected function output() {
 
 class Hm_Output_server_config_stepper extends Hm_Output_Module {
     protected function output() {
+    $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
+    $smtp_servers_count = count($this->get('smtp_servers', array()));
 
-    return '<div class="smtp_imap_server_setup">
+    $res = '<div class="smtp_imap_server_setup">
          <div data-target=".server_config_section" class="server_section">'.
                 '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP & SMTP Servers').'
-                 <div class="server_count">-</div>
+                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP</div>
          </div>
          <div class="server_config_section">
             <div class="stepper" id="nux_config_stepper">
                 <div class="step-container">
                     <div id="step_config_1" class="step step_config">
                         <div class="step_config-title">
-                            <h2>Step 1</h2>
-                            <span>(Authentication)</span>
+                            <h2>'.$this->trans('Step 1').'</h2>
+                            <span>('.$this->trans('Authentication').')</span>
                         </div>
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_profile_name">Name</label>
+                                    <label for="nux_config_profile_name">'.$this->trans('Name').'</label>
                                     <br />
-                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="Profile name" />
+                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Profile name').'" />
                                     <span id="nux_config_profile_name-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_email">Email</label>
+                                    <label for="nux_config_email">'.$this->trans('Email').'</label>
                                     <br />
                                     <input type="email"  class="stepper_input" id="nux_config_email" placeholder="email" />
                                     <span id="nux_config_email-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_password">Password</label>
+                                    <label for="nux_config_password">'.$this->trans('Password').'</label>
                                     <br />
-                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="password" />
+                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="'.$this->trans('Password').'" />
                                     <span id="nux_config_password-error" class="error-message"></span>
                                </div>
                             </form>
                         </div>
                         <div class="step_config-actions">
-                            <button class="nux_stepper_btn" onclick="display_config_step(2)">Cancel</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(2)">Next</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
                         </div>
                     </div>
                     <div id="step_config_2" class="step step_config">
                         <div class="step_config-title">
-                            <h2>Step 2</h2>
-                            <span>(Mail server configuration)</span>
+                            <h2>'.$this->trans('Step 2').'</h2>
+                            <span>('.$this->trans('Mail server configuration').')</span>
                         </div>
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_provider">Provider</label>
+                                    <label for="nux_config_provider">'.$this->trans('Provider').'</label>
                                     <br />
                                     <select id="nux_config_provider" class="stepper_input" name="nux_config_provider"><option value="">'.$this->trans('Select an E-mail provider').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
                                </div>
                                <div class="step_config-form_item">
                                     <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
-                                    <label for="nux_config_is_sender">Sender account</label>
+                                    <label for="nux_config_is_sender">'.$this->trans('Sender account').'</label>
                                </div>
                                <div class="step_config-form_item">
                                     <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
-                                    <label for="nux_config_is_receiver">Receiver account</label>
+                                    <label for="nux_config_is_receiver">'.$this->trans('Receiver account').'</label>
                                </div>
 
                                <div class="step_config-smtp_imap_bloc">
                                     <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
                                        <label>SMTP</label>
                                        <div class="step_config-form_item">
-                                           <label for="nux_config_smtp_address">Address</label>
+                                           <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
                                            <br />
-                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="Address" />
+                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="'.$this->trans('Address').'" />
                                        </div>
                                        <div class="step_config-smtp_imap_port_bloc">
                                            <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
                                            <div>
                                                <input type="radio" id="smtp_tls" name="nux_config_smtp_tls" value="true">
-                                               <label for="smtp_tls">Use TLS</label><br>
+                                               <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
                                                <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
-                                               <label for="smtp_start_tls">STARTTLS or unencrypted</label><br>
+                                               <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
                                       <label>IMAP</label>
                                       <div class="step_config-form_item">
-                                          <label for="nux_config_imap_address">Address</label>
+                                          <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
                                           <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="Address" />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="'.$this->trans('Address').'" />
                                       </div>
                                       <div class="step_config-smtp_imap_port_bloc">
                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
                                          <div>
                                              <input type="radio" id="imap_tls" name="nux_config_imap_tls" value="true">
-                                             <label for="imap_tls">Use TLS</label><br>
+                                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
                                              <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
-                                             <label for="imap_start_tls">STARTTLS or unencrypted</label><br>
+                                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                          </div>
                                       </div>
                                    </div>
                                    <div class="step_config-form_item">
                                         <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" />
-                                        <label for="nux_enable_sieve">Enable Sieve</label>
-                                   </div>
-                               </div>
-                               <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
-                                    <label for="nux_create_profile">Create Profile</label>
-                               </div>
-                               <div class="nested" id="nux_profile_bloc">
-                                   <div class="step_config-form_item nested">
-                                       <label for="nux_profile_reply_to">Reply to</label>
-                                       <br />
-                                        <input type="email"  class="stepper_input" id="nux_profile_reply_to" />
-                                  </div>
-                                   <div class="step_config-form_item nested">
-                                       <label for="nux_profile_signature">Signature</label>
-                                       <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
-                                   </div>
-                                   <div class="step_config-form_item nested">
-                                       <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
-                                       <label for="nux_profile_is_default">Set this profile default</label>
-                                   </div>
-                               </div>
-                            </form>
-                        </div>
-                        <div class="nux_config_form_loader hide" id="nux_config_form_loader">
-                            <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
-                        </div>
-                        <div class="step_config-actions">
-                            <button class="nux_stepper_btn" onclick="display_config_step(1)">Previous</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(0)">Cancel</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(3)">
-                                Finish
-                            </button>
-                        </div>
-                    </div>
-                    <button id="step_config_0" class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">Add a new server</button>
+                                        <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                                   </div>';
+
+         if ($this->get('sieve_filters_enabled')) {
+             $default_value = '';
+                 $res .=  '
+                           <div class="step_config-form_item nested">
+                               <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
+                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px;" placeholder="'.$this->trans('Sieve Host').'" type="text" name="imap_sieve_host">
+                           </div>';
+         }
+
+         $res .= '</div>
+                             <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
+                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
+                                  <label for="nux_create_profile">'.$this->trans('Create Profile').'</label>
+                             </div>
+                             <div class="nested" id="nux_profile_bloc">
+                                 <div class="step_config-form_item nested">
+                                     <label for="nux_profile_reply_to">'.$this->trans('Reply to').'</label>
+                                     <br />
+                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="nux_profile_reply_to" />
+                                </div>
+                                 <div class="step_config-form_item nested">
+                                     <label for="nux_profile_signature">'.$this->trans('Signature').'</label>
+                                     <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
+                                 </div>
+                                 <div class="step_config-form_item nested">
+                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
+                                     <label for="nux_profile_is_default">'.$this->trans('Set this profile default').'</label>
+                                 </div>
+                             </div>
+                          </form>
+                      </div>
+                      <div class="nux_config_form_loader hide" id="nux_config_form_loader">
+                          <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
+                      </div>
+                      <div class="step_config-actions">
+                          <button class="nux_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
+                          <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                          <button class="nux_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
+                      </div>
+                  </div>
+                  <div id="step_config_0">
+                      <button class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+                  </div>
                 </div>
-            </div>
-         </div>
-    </div>
-';
+         </div>';
+
+         return $res;
+
     }
 }
 
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index da3bf41e6a..e78b9f1d66 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -7,7 +7,7 @@
 
 /* servers page */
 add_output('servers', 'server_config_stepper', true, 'smtp', 'server_content_start', 'after');
-add_output('servers', 'quick_add_section', true, 'nux', 'server_config_stepper', 'after');
+add_output('servers', 'quick_add_section', true, 'nux', 'display_configured_imap_servers', 'after');
 add_output('servers', 'quick_add_dialog', true, 'nux', 'quick_add_section', 'after');
 
 add_handler('ajax_nux_service_select', 'login', false, 'core');
diff --git a/modules/nux/site.css b/modules/nux/site.css
index 32346bddba..dd3afa0fe1 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -30,16 +30,17 @@
 .step_config-title {display: flex;align-items: center;gap: 10px;}
 .step_config-title > span {font-size: small;}
 .step_config-title > h2 {color: #777}
-.stepper_input {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.stepper_input {width: 350px;height: 20px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 
 .step_config-form_item {margin: 10px 0px;}
 .step_config-form_item.nested {margin-left: 20px !important;}
 .step_config-form_item-checkbox {}
 .step_config-form_item > label {color: #232323;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 .step_config-form_item > textarea {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.step_config-form_item > select {height: 32px;}
 .step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
 .nux_stepper_btn:hover {cursor: pointer;}
-.stepper {display: flex;overflow: hidden;padding: 10px 30px 15px 30px;}
+.stepper {display: flex;overflow: hidden;padding: 10px 30px 100px 30px;}
 .step_config {width: 100%;transition: transform 0.5s;display: none;}
 .current_config_step {display: block;}
 .step-container {display: flex;width: 400px;}
@@ -54,3 +55,6 @@
 .server_config_section { display: none; }
 .error-message {color: red; font-size: small;}
 .hide {display: none;}
+.server_type_tag {background-color: teal;border-radius: 5px;padding: 0px 5px;color: white;font-size: x-small;width: max-content;font-weight: 900;}
+input[type="submit"], button {cursor: pointer; min-width: 70px;}
+input[type="submit"]:hover, button:hover {background-color: rgba(139, 137, 137, 0.16);}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index bd38bc1d0c..74502770af 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -27,29 +27,31 @@ function submitSmtpImapServer() {
     ];
 
     Hm_Ajax.request(requestData, function(res) {
-        console.log(res)
         $('#nux_config_form_loader').addClass('hide');
         $('.step_config-actions').removeClass('hide');
 
-        $('#nux_config_stepper').find('form').trigger('reset');
-        display_config_step(0);
-
-        //Initialize the form
-        $("#nux_profile_reply_to").val('');
-        $("#nux_profile_signature").val('');
-        $("#nux_config_profile_name").val('');
-        $("#nux_config_email").val('');
-        $("#nux_config_password").val('');
-        $("#nux_profile_is_default").prop('checked', true);
-        $("#nux_config_is_sender").prop('checked', true);
-        $("#nux_config_is_receiver").prop('checked', true);
-        $("#nux_enable_sieve").prop('checked', true);
-        $('#step_config-imap_bloc').show();
-        $('#step_config-smtp_bloc').show();
-        $('#nux_profile_bloc').show();
-
-        Hm_Utils.set_unsaved_changes(1);
-        Hm_Folders.reload_folders(true);
+        if (res.just_saved_credentials) {
+            $('#nux_config_stepper').find('form').trigger('reset');
+            display_config_step(0);
+
+            //Initialize the form
+            $("#nux_profile_reply_to").val('');
+            $("#nux_profile_signature").val('');
+            $("#nux_config_profile_name").val('');
+            $("#nux_config_email").val('');
+            $("#nux_config_password").val('');
+            $("#nux_profile_is_default").prop('checked', true);
+            $("#nux_config_is_sender").prop('checked', true);
+            $("#nux_config_is_receiver").prop('checked', true);
+            $("#nux_enable_sieve").prop('checked', true);
+            $('#step_config-imap_bloc').show();
+            $('#step_config-smtp_bloc').show();
+            $('#nux_profile_bloc').show();
+
+            Hm_Utils.set_unsaved_changes(1);
+            Hm_Folders.reload_folders(true);
+            location.reload();
+        }
     });
 }
 
@@ -62,13 +64,13 @@ function handleCreateProfileCheckboxChange(checkbox) {
 }
 function handleSmtpImapCheckboxChange(checkbox) {
     if (checkbox.id === 'nux_config_is_receiver') {
-        if(checkbox.checked) $('#step_config-smtp_bloc').show();
-        else $('#step_config-smtp_bloc').hide();
+        if(checkbox.checked) $('#step_config-imap_bloc').show();
+        else $('#step_config-imap_bloc').hide();
     }
 
     if (checkbox.id === 'nux_config_is_sender') {
-        if(checkbox.checked) $('#step_config-imap_bloc').show();
-        else $('#step_config-imap_bloc').hide();
+        if(checkbox.checked) $('#step_config-smtp_bloc').show();
+        else $('#step_config-smtp_bloc').hide();
     }
 
     if($('#nux_config_is_sender').prop('checked') &&
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 26eb0a866a..2ce8e77e23 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1279,7 +1279,12 @@ protected function output() {
                 $disabled = '';
             }
             $res .= '<div class="configured_server">';
-            $res .= sprintf('<div class="server_title">%s</div><div class="server_subtitle">%s/%d %s</div>',
+            $res .= sprintf('
+                    <div>
+                        <div class="server_type_tag">SMTP</div>
+                        <div class="server_title">%s</div>
+                        <div class="server_subtitle">%s/%d %s</div>
+                    </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']), $vals['tls'] ? 'TLS' : '' );
             $res .=
                 '<form class="smtp_connect" method="POST">'.
@@ -1305,7 +1310,7 @@ protected function output() {
             }
             $res .= '</form></div>';
         }
-        $res .= '<br class="clear_float" /></div></div>';
+        $res .= '<br class="clear_float" />';
         return $res;
     }
 }
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index bb81ae3e32..f4d2591dec 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -30,7 +30,7 @@
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
 add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
-add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'add_smtp_server_dialog', 'after');
+add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper', 'after');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');
 add_handler('settings', 'process_auto_bcc', true, 'smtp', 'save_user_settings', 'before');

From ee913498aed2e0f3f2b079bb28ea5f6510c4c071 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Fri, 10 Nov 2023 15:18:00 +0100
Subject: [PATCH 11/55] [Fix]: add sieve filter

---
 modules/nux/modules.php  | 78 +++++++++++++++++++++++-----------------
 modules/nux/services.php |  2 +-
 modules/nux/setup.php    |  1 +
 modules/nux/site.js      | 13 +++++--
 4 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index f46bbd60c7..3818f3e5f7 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -273,7 +273,8 @@ public function process() {
            'nux_create_profile',
            'nux_profile_is_default',
            'nux_profile_signature',
-           'nux_profile_reply_to'
+           'nux_profile_reply_to',
+           'nux_imap_sieve_host'
            ));
 
         if ($success) {
@@ -302,13 +303,26 @@ public function process() {
                    $form['nux_config_imap_port'],
                    $form['nux_config_email'],
                    $form['nux_config_password'],
-                   $form['nux_config_imap_tls']);
-
-                 if(!isset($result)) return;
+                   $form['nux_config_imap_tls'],
+                   $form['nux_imap_sieve_host'],
+                   $form['nux_enable_sieve']);
+
+                 if(!isset($result)) {
+                   /**
+                   * Delete the SMPT server created before
+                   **/
+                   if(!isset($result) && $form['nux_config_is_sender']){
+                       $res = Hm_SMTP_List::del($this->smtp_server_id);
+                       if ($res) {
+                           Hm_SMTP_List::forget_credentials($this->smtp_server_id);
+                           $smtp_servers = Hm_SMTP_List::dump(false, true);
+                           $this->user_config->set('smtp_servers', $smtp_servers);
+                       }
+                   }
+                    return;
+                 }
              }
 
-             Hm_Msgs::add("Server saved");
-
              if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
                  $this->saveProfile(
                     $form['nux_config_profile_name'],
@@ -320,7 +334,7 @@ public function process() {
                     );
              }
 
-
+             Hm_Msgs::add("Server saved");
              $this->out('just_saved_credentials', $this->just_saved_credentials);
         }
     }
@@ -345,11 +359,9 @@ public function saveProfile($name, $signature, $replyTo, $isDefault, $email, $se
           $profiles->save($this->user_config);
           $user_data = $this->user_config->dump();
           $this->session->set('user_data', $user_data);
-
-          Hm_Msgs::add('Profile Added');
     }
 
-    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $enableSieve = false, $errno = null, $errstr = null) {
+    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve = false, $errno = null, $errstr = null) {
         if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
               $imap_list = array(
                   'name' => $name,
@@ -360,19 +372,19 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $enabl
                   'pass' => $pass,
                   'tls' => $tls);
 
-//               if (isset($enableSieve) && $enableSieve) {
-//                   $imap_list['sieve_config_host'] = $enableSieve;
-//
-//                    require_once VENDOR_PATH . 'autoload.php';
-//                    try {
-//                        list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($this->request->post['imap_sieve_host']);
-//                        $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
-//                        $client->connect($form['imap_user'], $form['imap_pass'], $sieve_tls, "", "PLAIN");
-//                    } catch (Exception $e) {
-//                        Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
-//                        return;
-//                    }
-//               }
+              if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && isset($enableSieve) && $enableSieve) {
+                  $imap_list['sieve_config_host'] = $enableSieve;
+
+                   require_once VENDOR_PATH . 'autoload.php';
+                   try {
+                       list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
+                       $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
+                       $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
+                   } catch (Exception $e) {
+                       Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
+                       return;
+                   }
+              }
 
 
               Hm_IMAP_List::add($imap_list);
@@ -764,22 +776,24 @@ protected function output() {
                                              <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                          </div>
                                       </div>
-                                   </div>
-                                   <div class="step_config-form_item">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" />
-                                        <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
-                                   </div>';
 
-         if ($this->get('sieve_filters_enabled')) {
+                                        <div class="step_config-form_item">
+                                            <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
+                                            <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                                        </div>
+                                   ';
+
+         if (!$this->get('sieve_filters_enabled')) {
              $default_value = '';
                  $res .=  '
-                           <div class="step_config-form_item nested">
+                           <div class="step_config-form_item nested hide" id="nux_imap_sieve_host_bloc">
                                <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px;" placeholder="'.$this->trans('Sieve Host').'" type="text" name="imap_sieve_host">
+                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="'.$this->trans('Sieve Host').'" type="text" name="imap_sieve_host">
                            </div>';
          }
 
-         $res .= '</div>
+         $res .= '      </div>
+                    </div>
                              <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
                                   <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
                                   <label for="nux_create_profile">'.$this->trans('Create Profile').'</label>
diff --git a/modules/nux/services.php b/modules/nux/services.php
index 31e7d5b2e9..1bdc3dc8da 100644
--- a/modules/nux/services.php
+++ b/modules/nux/services.php
@@ -77,7 +77,7 @@
     'auth' => 'login',
     'smtp' => array(
         'server' => 'smtp.mail.yahoo.com',
-        'port' => 587,
+        'port' => 465,
         'tls' => true
     )
 ));
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index e78b9f1d66..a1cbd0639d 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -106,6 +106,7 @@
         'nux_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
         'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_imap_sieve_host' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     )
 );
 
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 74502770af..3c2acd3a3a 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -23,7 +23,8 @@ function submitSmtpImapServer() {
         { name: 'nux_create_profile', value: $('#nux_create_profile').prop('checked') },
         { name: 'nux_profile_is_default', value: $('#nux_profile_is_default').prop('checked') },
         { name: 'nux_profile_signature', value: $('#nux_profile_signature').val() },
-        { name: 'nux_profile_reply_to', value: $('#nux_profile_reply_to').val() }
+        { name: 'nux_profile_reply_to', value: $('#nux_profile_reply_to').val() },
+        { name: 'nux_imap_sieve_host', value: $('#nux_imap_sieve_host').val() },
     ];
 
     Hm_Ajax.request(requestData, function(res) {
@@ -62,6 +63,14 @@ function handleCreateProfileCheckboxChange(checkbox) {
         $('#nux_profile_bloc').hide();
     }
 }
+
+function handleSieveStatusChange (checkbox) {
+    if(checkbox.checked) {
+        $('#nux_imap_sieve_host_bloc').show();
+    }else{
+        $('#nux_imap_sieve_host_bloc').hide();
+    }
+}
 function handleSmtpImapCheckboxChange(checkbox) {
     if (checkbox.id === 'nux_config_is_receiver') {
         if(checkbox.checked) $('#step_config-imap_bloc').show();
@@ -164,7 +173,7 @@ function getEmailProviderKey(email) {
         "office365": ["office365.com"],
         "outlook": ["outlook.com", "outlook.fr"],
         "postale": ["postale.io"],
-        "yahoo": ["yahoo.com"],
+        "yahoo": ["yahoo.com", "yahoo.fr"],
         "yandex": ["yandex.com", "yandex.ru"],
         "zoho": ["zoho.com"]
     };

From 2ff0da2f5c615a68b527e80cd796403dccf18605 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 15 Nov 2023 21:40:14 +0100
Subject: [PATCH 12/55] [Fix] handle errors and provider change

---
 modules/nux/modules.php |   7 ++-
 modules/nux/site.js     | 116 ++++++++++++++++++++++++++++++++--------
 2 files changed, 100 insertions(+), 23 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 3818f3e5f7..9593863f28 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -731,7 +731,7 @@ protected function output() {
                                <div class="step_config-form_item">
                                     <label for="nux_config_provider">'.$this->trans('Provider').'</label>
                                     <br />
-                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider"><option value="">'.$this->trans('Select an E-mail provider').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
+                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
                                </div>
                                <div class="step_config-form_item">
                                     <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
@@ -741,6 +741,7 @@ protected function output() {
                                     <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
                                     <label for="nux_config_is_receiver">'.$this->trans('Receiver account').'</label>
                                </div>
+                               <span id="nux_config_serve_type-error" class="error-message"></span>
 
                                <div class="step_config-smtp_imap_bloc">
                                     <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
@@ -749,6 +750,7 @@ protected function output() {
                                            <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
                                            <br />
                                            <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="nux_config_smtp_address-error" class="error-message"></span>
                                        </div>
                                        <div class="step_config-smtp_imap_port_bloc">
                                            <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
@@ -758,6 +760,7 @@ protected function output() {
                                                <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
                                                <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                            </div>
+                                           <span id="nux_config_smtp_port-error" class="error-message"></span>
                                        </div>
                                    </div>
                                    <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
@@ -766,6 +769,7 @@ protected function output() {
                                           <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
                                           <br />
                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="nux_config_imap_address-error" class="error-message"></span>
                                       </div>
                                       <div class="step_config-smtp_imap_port_bloc">
                                          <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
@@ -775,6 +779,7 @@ protected function output() {
                                              <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
                                              <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                          </div>
+                                         <span id="nux_config_imap_port-error" class="error-message"></span>
                                       </div>
 
                                         <div class="step_config-form_item">
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 3c2acd3a3a..ec3b48de68 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -91,28 +91,10 @@ function handleSmtpImapCheckboxChange(checkbox) {
         $('#nux_profile_checkbox_bloc').hide();
     }
 }
-function display_config_step(stepNumber) {
-    if(stepNumber == 2) {
-
-        var isValid = true;
-
-        [   {key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
-            {key: 'nux_config_email', value: $('#nux_config_email').val()},
-            {key: 'nux_config_password', value: $('#nux_config_password').val()}].forEach((item) => {
-                if(!item.value) {
-                    $(`#${item.key}-error`).text('Required');
-                    isValid = false;
-                }
-                else $(`#${item.key}-error`).text('');
-        })
-
-        if (!isValid) {
-            return
-        }
-
-        let providerKey = getEmailProviderKey($('#nux_config_email').val());
-        $("#nux_config_provider").val(providerKey);
 
+function handleProviderChange(select) {
+    let providerKey = select.value;
+    if(providerKey) {
         Hm_Ajax.request(
             [
                 {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
@@ -137,10 +119,97 @@ function display_config_step(stepNumber) {
             [],
             false
         );
+    }else{
+        $("#nux_config_smtp_address").val('');
+        $("#nux_config_smtp_port").val(465);
+        $("#nux_config_imap_address").val('');
+        $("#nux_config_imap_port").val(993);
+    }
+}
+function display_config_step(stepNumber) {
+    if(stepNumber == 2) {
+
+        var isValid = true;
+
+        [   {key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
+            {key: 'nux_config_email', value: $('#nux_config_email').val()},
+            {key: 'nux_config_password', value: $('#nux_config_password').val()}].forEach((item) => {
+                if(!item.value) {
+                    $(`#${item.key}-error`).text('Required');
+                    isValid = false;
+                }
+                else $(`#${item.key}-error`).text('');
+        })
+
+        if (!isValid) {
+            return
+        }
+
+        let providerKey = getEmailProviderKey($('#nux_config_email').val());
+        if(providerKey) {
+            $("#nux_config_provider").val(providerKey);
+
+            Hm_Ajax.request(
+                [
+                    {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
+                    {'name': 'nux_service', 'value': providerKey},],
+                function(res) {
+                    if(res.service_details){
+                        let serverConfig = JSON.parse(res.service_details)
+
+                        $("#nux_config_smtp_address").val(serverConfig.smtp.server);
+                        $("#nux_config_smtp_port").val(serverConfig.smtp.port);
+
+                        if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_tls'][value='true']").prop("checked", true);
+                        else $("input[name='nux_config_smtp_tls'][value='false']").prop("checked", true);
+
+                        $("#nux_config_imap_address").val(serverConfig.server);
+                        $("#nux_config_imap_port").val(serverConfig.port);
+
+                        if(serverConfig.tls)$("input[name='nux_config_imap_tls'][value='true']").prop("checked", true);
+                        else $("input[name='nux_config_imap_tls'][value='false']").prop("checked", true);
+                    }
+                },
+                [],
+                false
+            );
+        }
     }
 
     if(stepNumber == 3) {
-        submitSmtpImapServer();
+        var requiredFields = [];
+        var isValid = true;
+
+        if(!$('#nux_config_is_sender').is(':checked') && !$('#nux_config_is_receiver').is(':checked')){
+            $('#nux_config_serve_type-error').text('Required');
+            return;
+        }
+
+        if($('#nux_config_is_sender').is(':checked')){
+            requiredFields.push(
+                {key: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val()},
+                {key: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val()},
+            )
+        }
+
+        if($('#nux_config_is_receiver').is(':checked')) {
+            requiredFields.push(
+                {key: 'nux_config_imap_address', value: $('#nux_config_imap_address').val()},
+                {key: 'nux_config_imap_port', value: $('#nux_config_imap_port').val()},
+            )
+        }
+
+        requiredFields.forEach((item) => {
+            if(!item.value) {
+                $(`#${item.key}-error`).text('Required');
+                isValid = false;
+            }
+            else $(`#${item.key}-error`).text('');
+        })
+
+        if(isValid) return
+
+        //submitSmtpImapServer();
         return
     }
     // Hide all step elements
@@ -179,6 +248,9 @@ function getEmailProviderKey(email) {
     };
 
     const emailParts = email.split("@");
+
+    if(emailParts.length !== 2) return "";
+
     const provider = emailParts[1].toLowerCase();
 
     for (const providerKey in emailProviderMap) {

From ca26667e24faf7a01699a20c5c8ce148bd04ccd9 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 21 Dec 2023 12:44:52 +0100
Subject: [PATCH 13/55] Add: validation

---
 modules/nux/site.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/nux/site.js b/modules/nux/site.js
index ec3b48de68..4f17976b41 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -207,9 +207,11 @@ function display_config_step(stepNumber) {
             else $(`#${item.key}-error`).text('');
         })
 
-        if(isValid) return
 
-        //submitSmtpImapServer();
+
+        if(!isValid) return
+
+        submitSmtpImapServer();
         return
     }
     // Hide all step elements

From 871b1337a4fd7ac27272e27faba6f5ec567d2bad Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Fri, 29 Dec 2023 14:29:41 +0100
Subject: [PATCH 14/55] Fix: enable sieve

---
 modules/nux/modules.php | 15 ++++++++-------
 modules/nux/setup.php   |  2 +-
 modules/nux/site.js     |  8 +++++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 9593863f28..4cf777d904 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -372,7 +372,7 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_
                   'pass' => $pass,
                   'tls' => $tls);
 
-              if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && isset($enableSieve) && $enableSieve) {
+              if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && $enableSieve) {
                   $imap_list['sieve_config_host'] = $enableSieve;
 
                    require_once VENDOR_PATH . 'autoload.php';
@@ -782,18 +782,19 @@ protected function output() {
                                          <span id="nux_config_imap_port-error" class="error-message"></span>
                                       </div>
 
-                                        <div class="step_config-form_item">
-                                            <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
-                                            <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
-                                        </div>
                                    ';
 
-         if (!$this->get('sieve_filters_enabled')) {
+         if ($this->get('sieve_filters_enabled')) {
              $default_value = '';
                  $res .=  '
+                            <div class="step_config-form_item">
+                                <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
+                                <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                            </div>
                            <div class="step_config-form_item nested hide" id="nux_imap_sieve_host_bloc">
                                <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="'.$this->trans('Sieve Host').'" type="text" name="imap_sieve_host">
+                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
+                                <span id="nux_imap_sieve_host-error" class="error-message"></span>
                            </div>';
          }
 
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index a1cbd0639d..d5f03f9400 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -101,7 +101,7 @@
         'nux_config_imap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_config_imap_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_config_imap_tls' => FILTER_VALIDATE_BOOLEAN,
-        'nux_enable_sieve' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_enable_sieve' => FILTER_VALIDATE_BOOLEAN,
         'nux_create_profile' => FILTER_VALIDATE_BOOLEAN,
         'nux_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
         'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 4f17976b41..bb8fe6b339 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -44,7 +44,7 @@ function submitSmtpImapServer() {
             $("#nux_profile_is_default").prop('checked', true);
             $("#nux_config_is_sender").prop('checked', true);
             $("#nux_config_is_receiver").prop('checked', true);
-            $("#nux_enable_sieve").prop('checked', true);
+            $("#nux_enable_sieve").prop('checked', false);
             $('#step_config-imap_bloc').show();
             $('#step_config-smtp_bloc').show();
             $('#nux_profile_bloc').show();
@@ -199,6 +199,12 @@ function display_config_step(stepNumber) {
             )
         }
 
+        if($('#nux_enable_sieve').is(':checked')) {
+            requiredFields.push(
+                {key: 'nux_imap_sieve_host', value: $('#nux_imap_sieve_host').val()},
+            )
+        }
+
         requiredFields.forEach((item) => {
             if(!item.value) {
                 $(`#${item.key}-error`).text('Required');

From 1d7d42b21b5eff92d5ab90adde9296546b94a867 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 11:20:40 +0100
Subject: [PATCH 15/55] Feat: add jmap to the config

---
 modules/imap/output_modules.php |   5 +-
 modules/nux/modules.php         | 299 +++++++++++++++++++++-----------
 modules/nux/setup.php           |   3 +
 modules/nux/site.js             |  61 +++++--
 4 files changed, 252 insertions(+), 116 deletions(-)

diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 7fb7116464..fd273facbf 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -426,9 +426,10 @@ protected function output() {
         }
         $res = '';
         foreach ($this->get('imap_servers', array()) as $index => $vals) {
+            $type = 'IMAP';
 
             if (array_key_exists('type', $vals) && $vals['type'] == 'jmap') {
-                continue;
+                $type = 'JMAP';
             }
 
             if (array_key_exists('user', $vals) && !array_key_exists('nopass', $vals)) {
@@ -454,7 +455,7 @@ protected function output() {
             $res .= '<div class="configured_server">';
             $res .= sprintf('
                     <div>
-                        <div class="server_type_tag">IMAP</div>
+                        <div class="server_type_tag">'.$type.'</div>
                         <div class="server_title">%s</div>
                         <div class="server_subtitle">%s/%d %s</div>
                     </div>',
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 4cf777d904..b49b526ac8 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -251,6 +251,7 @@ public function process() {
 class Hm_Handler_quick_server_setup_nux extends Hm_Handler_Module {
     public $smtp_server_id = null;
     public $imap_server_id = null;
+    public $jmap_server_id = null;
     public $just_saved_credentials = false;
     public $imap = null;
     public $smtp = null;
@@ -274,68 +275,89 @@ public function process() {
            'nux_profile_is_default',
            'nux_profile_signature',
            'nux_profile_reply_to',
-           'nux_imap_sieve_host'
+           'nux_imap_sieve_host',
+           'nux_config_only_jmap',
+           'nux_config_jmap_hide_from_c_page',
+           'nux_config_jmap_address',
            ));
 
         if ($success) {
-             /*
-             *  Connect to SMTP server if user wants to send emails
-             */
-             if($form['nux_config_is_sender']){
-                 $result = $this->connectToSMPT(
-                    $form['nux_config_smtp_address'],
-                    $form['nux_config_profile_name'],
-                    $form['nux_config_smtp_port'],
-                    $form['nux_config_email'],
-                    $form['nux_config_password'],
-                    $form['nux_config_smtp_tls']);
-
-                 if(!isset($result)) return;
-             }
-
-             /*
-              *  Connect to IMAP server if user wants to receive emails
-              */
-             if($form['nux_config_is_receiver']){
-                 $result = $this->connectToIMAP(
-                   $form['nux_config_imap_address'],
-                   $form['nux_config_profile_name'],
-                   $form['nux_config_imap_port'],
-                   $form['nux_config_email'],
-                   $form['nux_config_password'],
-                   $form['nux_config_imap_tls'],
-                   $form['nux_imap_sieve_host'],
-                   $form['nux_enable_sieve']);
-
-                 if(!isset($result)) {
-                   /**
-                   * Delete the SMPT server created before
-                   **/
-                   if(!isset($result) && $form['nux_config_is_sender']){
-                       $res = Hm_SMTP_List::del($this->smtp_server_id);
-                       if ($res) {
-                           Hm_SMTP_List::forget_credentials($this->smtp_server_id);
-                           $smtp_servers = Hm_SMTP_List::dump(false, true);
-                           $this->user_config->set('smtp_servers', $smtp_servers);
+            /*
+            * When JMAP selected only configure JMAP
+            */
+             if($form['nux_config_only_jmap']) {
+                $result = $this->connectToJMAP(
+                            $form['nux_config_jmap_address'], 
+                            $form['nux_config_jmap_hide_from_c_page'], 
+                            $form['nux_config_profile_name'], 
+                            $form['nux_config_email'],
+                            $form['nux_config_password']);
+                
+                if(!isset($result)) return;
+                
+                Hm_Msgs::add("JMAP Server saved");
+                $this->out('just_saved_credentials', $this->just_saved_credentials);
+                          
+             } else {
+                 /*
+                 *  Connect to SMTP server if user wants to send emails
+                 */
+                 if($form['nux_config_is_sender']){
+                     $result = $this->connectToSMPT(
+                        $form['nux_config_smtp_address'],
+                        $form['nux_config_profile_name'],
+                        $form['nux_config_smtp_port'],
+                        $form['nux_config_email'],
+                        $form['nux_config_password'],
+                        $form['nux_config_smtp_tls']);
+    
+                     if(!isset($result)) return;
+                 }
+    
+                 /*
+                  *  Connect to IMAP server if user wants to receive emails
+                  */
+                 if($form['nux_config_is_receiver']){
+                     $result = $this->connectToIMAP(
+                       $form['nux_config_imap_address'],
+                       $form['nux_config_profile_name'],
+                       $form['nux_config_imap_port'],
+                       $form['nux_config_email'],
+                       $form['nux_config_password'],
+                       $form['nux_config_imap_tls'],
+                       $form['nux_imap_sieve_host'],
+                       $form['nux_enable_sieve']);
+    
+                     if(!isset($result)) {
+                       /**
+                       * Delete the SMPT server created before
+                       **/
+                       if(!isset($result) && $form['nux_config_is_sender']){
+                           $res = Hm_SMTP_List::del($this->smtp_server_id);
+                           if ($res) {
+                               Hm_SMTP_List::forget_credentials($this->smtp_server_id);
+                               $smtp_servers = Hm_SMTP_List::dump(false, true);
+                               $this->user_config->set('smtp_servers', $smtp_servers);
+                           }
                        }
-                   }
-                    return;
+                        return;
+                     }
                  }
-             }
-
-             if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
-                 $this->saveProfile(
-                    $form['nux_config_profile_name'],
-                    $form['nux_profile_signature'],
-                    $form['nux_profile_reply_to'],
-                    $form['nux_profile_is_default'],
-                    $form['nux_config_email'],
-                    $form['nux_config_imap_address']
-                    );
-             }
-
-             Hm_Msgs::add("Server saved");
-             $this->out('just_saved_credentials', $this->just_saved_credentials);
+    
+                 if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                     $this->saveProfile(
+                        $form['nux_config_profile_name'],
+                        $form['nux_profile_signature'],
+                        $form['nux_profile_reply_to'],
+                        $form['nux_profile_is_default'],
+                        $form['nux_config_email'],
+                        $form['nux_config_imap_address']
+                        );
+                 }
+    
+                 Hm_Msgs::add("Server saved");
+                 $this->out('just_saved_credentials', $this->just_saved_credentials);
+            }
         }
     }
 
@@ -373,7 +395,7 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_
                   'tls' => $tls);
 
               if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && $enableSieve) {
-                  $imap_list['sieve_config_host'] = $enableSieve;
+                  $imap_list['sieve_config_host'] = $imap_sieve_host;
 
                    require_once VENDOR_PATH . 'autoload.php';
                    try {
@@ -404,6 +426,7 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_
                   $this->user_config->set('imap_servers', $servers);
                   $this->just_saved_credentials = true;
                   $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+                  return true;
               }
               else {
                   Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
@@ -414,48 +437,98 @@ public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_
               Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
               return;
          }
-
-        return true;
     }
-
-    public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
-         if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
-
-              Hm_SMTP_List::add( array(
-                  'name' => $name,
-                  'server' => $address,
-                  'port' => $port,
-                  'user' => $user,
-                  'pass' => $pass,
-                  'tls' => $tls));
-
-              $smtp_servers = Hm_SMTP_List::dump(false, true);
-              $ids = array_keys($smtp_servers);
-              $this->smtp_server_id = array_pop($ids);
-
-              if (in_server_list('Hm_SMTP_List', $this->smtp_server_id, $user)) {
-                  Hm_Msgs::add('ERRThis SMTP server and username are already configured');
+    
+    public function connectToJMAP($jmap_address, $hide_from_c_page, $name, $user, $pass) {
+        $hidden = false;
+                        
+        if($hide_from_c_page) {
+            $hidden = true;
+        }
+        
+        $parsed = parse_url($jmap_address);
+        
+        if (array_key_exists('host', $parsed) && @get_headers($jmap_address)) {
+            try{
+                Hm_IMAP_List::add(array(
+                    'name' => $name,
+                    'server' => $jmap_address,
+                    'hide' => $hidden,
+                    'type' => 'jmap',
+                    'port' => false,
+                    'tls' => false));
+                $servers = Hm_IMAP_List::dump(false, true);
+                $ids = array_keys($servers);
+                $this->jmap_server_id = array_pop($ids);
+    
+                if (in_server_list('Hm_IMAP_List', $this->jmap_server_id, $user)) {
+                  Hm_Msgs::add('ERRThis server and username are already configured');
                   return;
-              }
-
-
-               $this->smtp = Hm_SMTP_List::connect($this->smtp_server_id, false, $user, $pass, true);
-               if (is_object($this->smtp) && $this->smtp->state == 'authed') {
-                   $this->user_config->set('smtp_servers', $smtp_servers);
-                   $this->just_saved_credentials = true;
-                   $this->session->record_unsaved('SMTP server saved');
-               }
-               else {
-                   Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
-                   Hm_SMTP_List::forget_credentials($this->smtp_server_id);
-                   return;
-               }
-          } else {
-              Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
-              return;
-          }
+                } else{
+                    Hm_IMAP_List::clean_up();
+                    $cache = Hm_IMAP_List::get_cache($this->cache, $this->jmap_server_id);
+                    $imap = Hm_IMAP_List::connect($this->jmap_server_id, $cache, $user, $pass, true);
+                    
+                    if (imap_authed($imap)) {
+                         $this->user_config->set('imap_servers', $servers);
+                         $this->just_saved_credentials = true;
+                         $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+                    
+                         return true;
+                    }
+                    else {
+                      Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                      Hm_IMAP_List::forget_credentials($this->jmap_server_id);
+                      return;
+                    }
+                }
+            }catch(Exception $e){
+                Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                return;
+            }
+        }
+    }
 
-        return true;
+    public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
+        try {
+            if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
+                  Hm_SMTP_List::add( array(
+                      'name' => $name,
+                      'server' => $address,
+                      'port' => $port,
+                      'user' => $user,
+                      'pass' => $pass,
+                      'tls' => $tls));
+    
+                  $smtp_servers = Hm_SMTP_List::dump(false, true);
+                  $ids = array_keys($smtp_servers);
+                  $this->smtp_server_id = array_pop($ids);
+    
+                  if (in_server_list('Hm_SMTP_List', $this->smtp_server_id, $user)) {
+                      Hm_Msgs::add('ERRThis SMTP server and username are already configured');
+                      return;
+                  }
+    
+                   $this->smtp = Hm_SMTP_List::connect($this->smtp_server_id, false, $user, $pass, true);
+                   if (is_object($this->smtp) && $this->smtp->state == 'authed') {
+                       $this->user_config->set('smtp_servers', $smtp_servers);
+                       $this->just_saved_credentials = true;
+                       $this->session->record_unsaved('SMTP server saved');
+                       return true;
+                   }
+                   else {
+                       Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
+                       Hm_SMTP_List::forget_credentials($this->smtp_server_id);
+                       return;
+                   }
+            } else {
+                Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
+                return;
+            }
+        }catch(Exception $e){
+            Hm_Msgs::add("ERRCan not add connect to the server");
+            return;
+        }
     }
 }
 
@@ -679,12 +752,13 @@ protected function output() {
 class Hm_Output_server_config_stepper extends Hm_Output_Module {
     protected function output() {
     $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
+    $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
     $smtp_servers_count = count($this->get('smtp_servers', array()));
 
     $res = '<div class="smtp_imap_server_setup">
          <div data-target=".server_config_section" class="server_section">'.
-                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP & SMTP Servers').'
-                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP</div>
+                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP - SMTP - JMAP Servers').'
+                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP/ '. $jmap_servers_count .' JMAP</div>
          </div>
          <div class="server_config_section">
             <div class="stepper" id="nux_config_stepper">
@@ -699,13 +773,13 @@ protected function output() {
                                <div class="step_config-form_item">
                                     <label for="nux_config_profile_name">'.$this->trans('Name').'</label>
                                     <br />
-                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Profile name').'" />
+                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Name').'" />
                                     <span id="nux_config_profile_name-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_email">'.$this->trans('Email').'</label>
+                                    <label for="nux_config_email">'.$this->trans('Email or Username').'</label>
                                     <br />
-                                    <input type="email"  class="stepper_input" id="nux_config_email" placeholder="email" />
+                                    <input type="text"  class="stepper_input" id="nux_config_email" placeholder="email" />
                                     <span id="nux_config_email-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
@@ -744,8 +818,25 @@ protected function output() {
                                <span id="nux_config_serve_type-error" class="error-message"></span>
 
                                <div class="step_config-smtp_imap_bloc">
+                                    <div class="step_config-form_item" id="nux_config_jmap_select_box">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="nux_config_only_jmap" id="nux_config_only_jmap"/>
+                                        <label for="nux_config_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
+                                    </div>
+                                    <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
+                                      <label><strong>JMAP</strong></label>
+                                      <div class="step_config-form_item">
+                                          <label for="nux_config_jmap_address">'.$this->trans('Address').'</label>
+                                          <br />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_jmap_address" placeholder="'.$this->trans('Address').'" />
+                                          <span id="nux_config_jmap_address-error" class="error-message"></span>
+                                      </div>
+                                      <div class="step_config-form_item">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="nux_config_jmap_hide_from_c_page" />
+                                        <label for="nux_config_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
+                                      </div>
+                                    </div>
                                     <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
-                                       <label>SMTP</label>
+                                       <label><strong>SMTP</strong></label>
                                        <div class="step_config-form_item">
                                            <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
                                            <br />
@@ -764,7 +855,7 @@ protected function output() {
                                        </div>
                                    </div>
                                    <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
-                                      <label>IMAP</label>
+                                      <label><strong>IMAP</strong></label>
                                       <div class="step_config-form_item">
                                           <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
                                           <br />
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index d5f03f9400..c91e7de8c8 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -107,6 +107,9 @@
         'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_imap_sieve_host' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_config_only_jmap' => FILTER_VALIDATE_BOOLEAN,
+        'nux_config_jmap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN,
+        'nux_config_jmap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     )
 );
 
diff --git a/modules/nux/site.js b/modules/nux/site.js
index bb8fe6b339..606caea01e 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -25,6 +25,9 @@ function submitSmtpImapServer() {
         { name: 'nux_profile_signature', value: $('#nux_profile_signature').val() },
         { name: 'nux_profile_reply_to', value: $('#nux_profile_reply_to').val() },
         { name: 'nux_imap_sieve_host', value: $('#nux_imap_sieve_host').val() },
+        { name: 'nux_config_only_jmap', value: $('input[name="nux_config_only_jmap"]:checked').val() },
+        { name: 'nux_config_jmap_hide_from_c_page', value: $('input[name="nux_config_jmap_hide_from_c_page"]:checked').val() },
+        { name: 'nux_config_jmap_address', value: $('#nux_config_jmap_address').val() },
     ];
 
     Hm_Ajax.request(requestData, function(res) {
@@ -45,6 +48,7 @@ function submitSmtpImapServer() {
             $("#nux_config_is_sender").prop('checked', true);
             $("#nux_config_is_receiver").prop('checked', true);
             $("#nux_enable_sieve").prop('checked', false);
+            $("#nux_config_only_jmap").prop('checked', false);
             $('#step_config-imap_bloc').show();
             $('#step_config-smtp_bloc').show();
             $('#nux_profile_bloc').show();
@@ -72,6 +76,8 @@ function handleSieveStatusChange (checkbox) {
     }
 }
 function handleSmtpImapCheckboxChange(checkbox) {
+    $(".step_config-smtp_imap_bloc").show();
+    
     if (checkbox.id === 'nux_config_is_receiver') {
         if(checkbox.checked) $('#step_config-imap_bloc').show();
         else $('#step_config-imap_bloc').hide();
@@ -86,9 +92,36 @@ function handleSmtpImapCheckboxChange(checkbox) {
         $('#nux_config_is_receiver').prop('checked')){
         $('#nux_profile_bloc').show();
         $('#nux_profile_checkbox_bloc').show();
+        $('#nux_config_jmap_select_box').show();
+        $("#nux_config_only_jmap").show();
     }else{
+        $("#nux_config_only_jmap").prop('checked', false);
+        
         $('#nux_profile_bloc').hide();
         $('#nux_profile_checkbox_bloc').hide();
+        $('#nux_config_jmap_select_box').hide();
+        $("#nux_config_only_jmap").hide();
+
+        if(!$('#nux_config_is_sender').prop('checked') &&
+            !$('#nux_config_is_receiver').prop('checked')){
+            $(".step_config-smtp_imap_bloc").hide();
+        }
+    }
+}
+
+function handleJmapCheckboxChange(checkbox) {
+    if(checkbox.checked){
+        $('#step_config-jmap_bloc').show();
+        $('#step_config-smtp_bloc').hide();
+        $('#step_config-imap_bloc').hide();
+        $('#nux_profile_bloc').hide();
+        $('#nux_profile_checkbox_bloc').hide();
+    }else {
+        $('#step_config-jmap_bloc').hide();
+        $('#step_config-smtp_bloc').show();
+        $('#step_config-imap_bloc').show();
+        $('#nux_profile_bloc').show();
+        $('#nux_profile_checkbox_bloc').show();
     }
 }
 
@@ -184,19 +217,27 @@ function display_config_step(stepNumber) {
             $('#nux_config_serve_type-error').text('Required');
             return;
         }
-
-        if($('#nux_config_is_sender').is(':checked')){
+        
+        if($('#nux_config_is_sender').is(':checked') && 
+            $('#nux_config_is_receiver').is(':checked') && 
+            $('#nux_config_only_jmap').is(':checked')){
             requiredFields.push(
-                {key: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val()},
-                {key: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val()},
+                {key: 'nux_config_jmap_address', value: $('#nux_config_jmap_address').val()},
             )
-        }
+        }else {
+            if($('#nux_config_is_sender').is(':checked')){
+                requiredFields.push(
+                    {key: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val()},
+                    {key: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val()},
+                )
+            }
 
-        if($('#nux_config_is_receiver').is(':checked')) {
-            requiredFields.push(
-                {key: 'nux_config_imap_address', value: $('#nux_config_imap_address').val()},
-                {key: 'nux_config_imap_port', value: $('#nux_config_imap_port').val()},
-            )
+            if($('#nux_config_is_receiver').is(':checked')) {
+                requiredFields.push(
+                    {key: 'nux_config_imap_address', value: $('#nux_config_imap_address').val()},
+                    {key: 'nux_config_imap_port', value: $('#nux_config_imap_port').val()},
+                )
+            }
         }
 
         if($('#nux_enable_sieve').is(':checked')) {

From ef2894208030081b8115bda0a34295143e0ade17 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 11:21:23 +0100
Subject: [PATCH 16/55] Ref: hide old jmap setup

---
 modules/imap/setup.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 1ada0a6de4..c2ab56e88e 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -22,8 +22,6 @@
 add_handler('servers', 'process_add_jmap_server', true, 'imap', 'process_add_imap_server', 'after');
 add_handler('servers', 'save_imap_servers',  true, 'imap', 'process_add_jmap_server', 'after');
 add_output('servers', 'display_configured_imap_servers', true, 'imap', 'display_configured_smtp_servers', 'after');
-add_output('servers', 'add_jmap_server_dialog', true, 'imap', 'display_configured_imap_servers', 'after');
-add_output('servers', 'display_configured_jmap_servers', true, 'imap', 'add_jmap_server_dialog', 'after');
 add_output('servers', 'imap_server_ids', true, 'imap', 'page_js', 'before');
 
 /* settings page data */

From 709e4df25c03ca1728ef692394ccdef1665a4d30 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 11:32:55 +0100
Subject: [PATCH 17/55] Fix: git ignore env files

---
 .DS_Store         | Bin 8196 -> 0 bytes
 .github/.DS_Store | Bin 6148 -> 0 bytes
 .gitignore        |   1 +
 3 files changed, 1 insertion(+)
 delete mode 100644 .DS_Store
 delete mode 100644 .github/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 665f2824bbdc1c93f08f324d55d16488b6457484..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMJ%|%Q6n>NBlAMQnVsjwkf`y&l!GT;MtY^eVK|BzwG`WN%l9*h6{5@d{Me!Qt
zDiyI%JOm4iD=jRHaM)N0c7mX-a+PP}H$U#q?2lGT;AUXwE%UxN-?uMsc9;zjvDtok
zifDp}^0>GiA43<@xSwB<mQo{=unh6ks7}qzx0>w;(hk@R*bLYV*bLYV*bEFy2C!%I
zmQUFCrPua012zMjG6Vem;NarcRo0VMygJZ{BLHj$!=mASoZrAY%DT#W(!ztrWGJi*
zW$K8*WH`nhg>#klq?O^s)Zv3EW~NRkOt52qN5F}>(%Rl;z-Azt0e*JR(0-~?oqERk
z{lmcp-Pddt3Z+J?gt7d?OZTUDULPDb{bk?3^mSu0>~Gh!Zv*QdLMiu~mul3flEF^5
z-$xO;hOIa69s1lA8bb3lTY-{fl%a<?AfplJsZ*IMR5Y}twyc_7UB}AHrN_%xg$^xV
z*AR~|_*0)aKYxxMb*M-ep`&YPppW082wlg|;`685ihe${d2}twC_@ixb3J)#K+6Tx
zMjy6H6+=;WFdB!^H63~9|3;CybX9-C8M<=3TqzA*^-#T}2c5v9YgpT}d!x4~@}lB&
z=BU@;%iQIBIcic1b<qcJCG@)-7~K~|==`g1Z}cxq{?I(Sj%1XfXU3I!x-^eEsZ$&E
z5~`C2S)s>3=z2~(dlA%02o<cGWR#&tZpInvLQ5}HAKR}vP~!V^4b?}d&##<%Bi|n?
zR?kM9-{9RL>R^O(f;*gp?6DazYhImuae4jB6Ul8Lf@hCM82q`{AfPcY*YM;W)W%u-
z7De3k=!&sQQpY(o0jcY{_2tLf_g5k(iReJ%-_eHNlvvMMyjLn%&t+6|$56TJ4qwZL
zU)Q$xq+i1!OrR(UW9XQ6Kx5mGWFRedOz`vn(d6&{L!#Eouo<u!_!k*qnZjIQ7BkE3
zJW9dO+77OBxOn3@Pg)UzP8`Q!#c>?g|HBaX4xl{7Ro0UhBWVBqLxA1??fx$+Z*zCQ
E0QPn76aWAK

diff --git a/.github/.DS_Store b/.github/.DS_Store
deleted file mode 100644
index 1c5dcb19766dca994fa3a8a5097aa93e5bd48331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJx{|h5PdF1v;v`yj2T%wFe0T@Iv|0BC=9RwrF=-VN<~3kBL+qUzk$C3zoc{d
z4ZO3hG@*ft1tD}-`JQvRvoFtS&IVwbcilQr15jZTELEurMD9zQk&?Hp5RDz9g=6fa
zg&pk9c&p(rG9YWWiY>JHJK)Mq*KZpQS<BvKy?qw<2QK;Y#ytOi97Ua8+@W7(@;Ets
z*?VowkLmt6W^k3wE94Yd#4XM-q#ow8K9$!ub2ppg`u+3fc=#qc<~*hu6?^38f0FsD
z7$L?Du5p1Ld!x^JEWH<dW%D_DNb@NeuOCnI`rb32pZvd7lmTTx8Ausm%@(OFJ5;R<
zC<Dqs%7A<y0ye?WW8%<$I;iXsfLNy43j21iK@7w|3_T_eX`vVwN_3&dA2Eyzr#<j~
zp~u9b3x}~Ya~waj@h24HcRD7p?l7T4)yjY}kY`}QUDl-jx4u6A=Y#Z08BhlP6$7Rm
zwWB5<$=BAIhm%?xu${1ph+pC`4PnQYV){xcUSqRDdmtTR=rM6f3q>~qmIhVIz^^j!
E0qGxh#{d8T

diff --git a/.gitignore b/.gitignore
index 29d5003282..e357418d39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ scripts/test.php
 *.sublime-workspace
 composer.phar
 lib/hm3/users/
+.env

From 91684e5df24790e22580ef937140ce1d7a4a5608 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 11:34:36 +0100
Subject: [PATCH 18/55] Fix: git ignore env files

---
 modules/.DS_Store | Bin 12292 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 modules/.DS_Store

diff --git a/modules/.DS_Store b/modules/.DS_Store
deleted file mode 100644
index a87c9976fc1c68c3f09bac25ef26e53ad98d0aee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12292
zcmeHNU5Hgx6y9fMbbg#a1yNt@f(a9ZHPTDy#2vfQLj{q7h{epEx!0MCbLS3o=bBd1
zD40+nA`$&4jZ;uiq@a{#q-8$TgD6P7Bt$<T^pMpU^$_)~z0W;ot@D3-5$c@boPFl3
zZ=Ln6wfA28=Uk<fwW(I<SE^4b)rOPG-cDSeQ!29rB|At?r|)RS6AR~yIC0;r)QlQe
zH8oPM<Z?c=|3MQTk$wx##cE8Ixc<mQWdzULHXMBC&F=ig!TSI6+irgG%g3J&LY5wB
z1kwnk5lADDMj(wq;}M{-7e||Cyf;tNYZ`$x0{`m>P=3hZq%v!lv!>Lk0~eaYlbojT
z`oKNb0s2|SF0*zyYf7yO9j%Jes9N?C!!qi4o*_8OtX<BU(x@xTs4L61Y}qRmOIwFt
zM#GhrHD!8DBalYGAAu1(@~piJx%yhWzV`NFrpEg>k5<Z4`gNwqbz}WrR(Y)9C)AJ{
zRTVXf)qEazGpaf<#_($OR_I0IY5$<kVIlkU{XLs54#w-ayp!q(KTM)of*p(^e3*a-
zL+VLfr*U799^82fY(kKn`_YenukTfaqFvVUXvudNBvc3ZmJs`Kur#GF-dpyC;W*c`
zR~@c_?<`kbrg2!w^Dyyj)jX?c4HVHmGM?)wse2Hd+qsv`9#9a<WfhK+e1`EF#I2+X
zh*=S}JcIi(?xrQH<zI&3IJbMQvA6}ilgBL%D|u##XN%^RS5typYv+$##`!F~_TiO7
z&*=W*=yDDR7JeH#P?K_Dw^i3yXWcI1vjcU8K0p!j_T>vFz#|mPd40F`UA>PNjdyD^
z310A4H}GoYl@c-!^@T}Yw^XlH{N>R{iXw(;{f0O^=l{VS4*y6SJl08dq#wiN$1=4O
z%=f4f#6FL>7f=sX^dag!Gsvnne_k!TpHz?gb*A-?dX7qDll#}GuJm(`{Or;#3+)^J
zMUEQtuSTP}Pg_3ub*u|}#&H^MYfGjf`P=P{Mv76?QS7+4b{c%TfeXcRA6BluvF(k=
z^geftj_XBI9qC6Fw2)^e;RE`K>?8f3avA5h^t3ZBJG#7W1j(h{DYDxPyEV02ShbcO
zaV6Yl&+#3bSMAmHYU^=}XCAt1+Rl8oRM;~sfo8O{F;6yaf4oE6(-Lm)%DmGzY&~wz
zFBSIMbslYly=m0=4rC-6Z9H?KC%%SdABJ=I;lfva&zgK5fOG5q^oDOQjfda_FEs~~
zsvWF~y4_Ccd@}B>`R?7pD9&y6k`teR_wiUoBPG8_iC?eHucCH==d{j#MKGnYdJ;A0
ziQ@{&eX%;6`@RRAe4aqhjdLS<0e*Gsv50&!8NH~p`zSKIuWdZ?HhhZ2bAS52aq1#Q
z$Mq$tj`TzK+fMjV0%!8XwCx$(dFKaBw?6<MLb06xVD8Ak_f_4uBk(TwBzVEQNw=#O
z%^O@r#!)Nwf~O<nygs|`<Y6Xvc?8LYUFFy<qxH&p+>(>8*mkvy+r9SF<*Um~t|Pm)
z+_hWSKX7W_ZhIbQ%Z1&p3|<YNXcgw`FKsVz8Mk|)=JX3km-pl#xv*>eT@1U_ruF<w
z#M<gx1KUE*?O#9W*!N&u-@`D1hcyQ?$a7{5SI~J_&jke=RXQ4s;+(d>;BX3fACFEn
zQt&f*m^j|b1HS>l7`z^R*fa94&$tpE3-<lp*5m&BrP61eJ6h2qNA+y4hFm@)>to$b
z*!3W|{d;#h-~W9mw}phG0{HZRPXU=M4>qG{v!2W>`5mXVYK#WwyXM$a_5F)jEth|C
zE$Po?kVBiN`E&_mCe1bJcNLS;hgG!l2|#h)8{cwx2O?dr(MZWJOZ?jOyn|*#lZZ7|
zH<I1hdqEh^?azZw8}Pl0x5g-(<aLsG^=e+U)*@EB;#MS8Gv}bWe}oR_T{+>zG}adP
zqY*vn*Lm`bVid6-_xwN*hVy=X?oh|piXLlx@8Ue8Z~?qpG%w6UMg1>oz6d^!jPqE&
z-Ps3Xa<?T0$%WlThbbP*QNJ`2?8F#VK~EV%JFMWoq-QczpL9<V^UN~a%Z+Js?kjKm
zxxSujz&?-ezk7r5-|TU=YyWBHM)_e1rKbmO{0n{tptwKx)ttHrM7p&Sjg<WK_|OG@
zdl3CRW)CH_k<dIgKx>o;H0S&Geur<QhRZvdhUBl?*CMo|BK``V_G5KC48Bat`JJ10
z_7Mfb<r9n$_RShs?B|QVrOqBh+pdz1W`YZT`$ymZF;5Ts{htP<mox%t1pb>5uv&7P
zbDQ8BO>KjYCOpjG9L7nQ^Em0iy;i}6AoP#^9FJ0ejz@VnJ*NZrS-YGyC7$581wRC6
vVEmQYGadhP&Ue}9QJv3QqLE_!!ej(T#P}@hBOU+ESnhs{&r<vnjsO1u>5fEr


From d9eafa6d10d40b35703cafb002593d78b23fe518 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 11:35:29 +0100
Subject: [PATCH 19/55] Fix: git ignore env files

---
 tests/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tests/.DS_Store

diff --git a/tests/.DS_Store b/tests/.DS_Store
deleted file mode 100644
index 9e2adcb101ace96c00314b8ea925d1b64cb1f457..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO-jR15S~}7Mg%FYT;>S&075MB1igUPN-HELP_q=WbmKx7;sIQ^@fe=Oi}=kC
zwJ}j#iIf?b_a*aYGLtVMlOduos-{Dt0TD$|#@-H=4&i;)mh{ZRn?bH|MVEA)&4%Oi
zqUG&||HuG8yKO3I4y|bA`Q@dQyZLn2_Q;Dgon*xXJJJ3A>+{~(+i{oI^cP;`oZlA9
zwk1g;TF?b$P_Cz<T;C}3p~n}_`_*T)rkmS`qxXf>)ZzD8)lYtny22q+x;O*QfHSZ*
z44`MTM7xT<Is?vtGq7ZUzYj5#F)^$a<<o&hMgU+RW)U3oEWt6cVPaS-Vh0j56sV!W
zMvS20u*c??7}km!PQiwcV3~tWC_%F0`mwlENECf_2AqK=0~>le;QoK|{ruky@-t_^
z8CWX@LO&g+Bixep*4E8&uZ^LnP!{&96_+76kX8&|Zp8;s5!hos049dDA}kR95fB=D
JaR&aBfe*y3Qi=co


From 2112008621254246a27e4976c7a4233339d37313 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 3 Jan 2024 12:30:35 +0100
Subject: [PATCH 20/55] Fix: cancel config btn

---
 modules/nux/site.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/nux/site.js b/modules/nux/site.js
index 606caea01e..04f37df127 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -269,8 +269,10 @@ function display_config_step(stepNumber) {
 
     // Show the selected step
     var selectedStep = document.getElementById('step_config_' + stepNumber);
+
     if (selectedStep) {
         selectedStep.style.display = 'block';
+        if(stepNumber == 0) $('.nux_stepper_btn').show();
     }
 }
 

From ff6af03e711cc1a9ae34686b3433216527d11efb Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 4 Jan 2024 18:54:12 +0100
Subject: [PATCH 21/55] fix: remove mail-debug from git

---
 mail-debug | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 mail-debug

diff --git a/mail-debug b/mail-debug
deleted file mode 120000
index 3d26826994..0000000000
--- a/mail-debug
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share/cypht/Applications/MAMP/htdocs/mail-debug
\ No newline at end of file

From bfd3aa3853c23241bb4d9eccd18c7c6dd0d3d736 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 6 Jan 2024 15:39:27 +0100
Subject: [PATCH 22/55] Ref: move functions to modules

---
 modules/core/output_modules.php | 183 +++++++++++++
 modules/core/setup.php          |   1 +
 modules/imap/functions.php      | 134 ++++++++++
 modules/nux/modules.php         | 459 ++++----------------------------
 modules/nux/setup.php           |   1 -
 modules/profiles/functions.php  |  27 ++
 modules/profiles/modules.php    |   1 +
 modules/smtp/functions.php      |  60 +++++
 modules/smtp/modules.php        |   1 +
 9 files changed, 457 insertions(+), 410 deletions(-)
 create mode 100644 modules/profiles/functions.php
 create mode 100644 modules/smtp/functions.php

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 3153f3abad..5cc38f93be 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2002,3 +2002,186 @@ protected function output() {
             '<td><input type="checkbox" '.$checked.' id="warn_for_unsaved_changes" name="warn_for_unsaved_changes" value="1" />'.$reset.'</td></tr>';
     }
 }
+
+class Hm_Output_server_config_stepper extends Hm_Output_Module {
+    protected function output() {
+    $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
+    $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
+    $smtp_servers_count = count($this->get('smtp_servers', array()));
+
+    $res = '<div class="smtp_imap_server_setup">
+         <div data-target=".server_config_section" class="server_section">'.
+                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP - SMTP - JMAP Servers').'
+                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP/ '. $jmap_servers_count .' JMAP</div>
+         </div>
+         <div class="server_config_section">
+            <div class="stepper" id="nux_config_stepper">
+                <div class="step-container">
+                    <div id="step_config_1" class="step step_config">
+                        <div class="step_config-title">
+                            <h2>'.$this->trans('Step 1').'</h2>
+                            <span>('.$this->trans('Authentication').')</span>
+                        </div>
+                        <div>
+                            <form>
+                               <div class="step_config-form_item">
+                                    <label for="nux_config_profile_name">'.$this->trans('Name').'</label>
+                                    <br />
+                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Name').'" />
+                                    <span id="nux_config_profile_name-error" class="error-message"></span>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <label for="nux_config_email">'.$this->trans('Email or Username').'</label>
+                                    <br />
+                                    <input type="text"  class="stepper_input" id="nux_config_email" placeholder="email" />
+                                    <span id="nux_config_email-error" class="error-message"></span>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <label for="nux_config_password">'.$this->trans('Password').'</label>
+                                    <br />
+                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="'.$this->trans('Password').'" />
+                                    <span id="nux_config_password-error" class="error-message"></span>
+                               </div>
+                            </form>
+                        </div>
+                        <div class="step_config-actions">
+                            <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                            <button class="nux_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
+                        </div>
+                    </div>
+                    <div id="step_config_2" class="step step_config">
+                        <div class="step_config-title">
+                            <h2>'.$this->trans('Step 2').'</h2>
+                            <span>('.$this->trans('Mail server configuration').')</span>
+                        </div>
+                        <div>
+                            <form>
+                               <div class="step_config-form_item">
+                                    <label for="nux_config_provider">'.$this->trans('Provider').'</label>
+                                    <br />
+                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
+                                    <label for="nux_config_is_sender">'.$this->trans('Sender account').'</label>
+                               </div>
+                               <div class="step_config-form_item">
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
+                                    <label for="nux_config_is_receiver">'.$this->trans('Receiver account').'</label>
+                               </div>
+                               <span id="nux_config_serve_type-error" class="error-message"></span>
+
+                               <div class="step_config-smtp_imap_bloc">
+                                    <div class="step_config-form_item" id="nux_config_jmap_select_box">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="nux_config_only_jmap" id="nux_config_only_jmap"/>
+                                        <label for="nux_config_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
+                                    </div>
+                                    <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
+                                      <label><strong>JMAP</strong></label>
+                                      <div class="step_config-form_item">
+                                          <label for="nux_config_jmap_address">'.$this->trans('Address').'</label>
+                                          <br />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_jmap_address" placeholder="'.$this->trans('Address').'" />
+                                          <span id="nux_config_jmap_address-error" class="error-message"></span>
+                                      </div>
+                                      <div class="step_config-form_item">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="nux_config_jmap_hide_from_c_page" />
+                                        <label for="nux_config_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
+                                      </div>
+                                    </div>
+                                    <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+                                       <label><strong>SMTP</strong></label>
+                                       <div class="step_config-form_item">
+                                           <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
+                                           <br />
+                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="nux_config_smtp_address-error" class="error-message"></span>
+                                       </div>
+                                       <div class="step_config-smtp_imap_port_bloc">
+                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
+                                           <div>
+                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_tls" value="true">
+                                               <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
+                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
+                                               <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
+                                           </div>
+                                           <span id="nux_config_smtp_port-error" class="error-message"></span>
+                                       </div>
+                                   </div>
+                                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
+                                      <label><strong>IMAP</strong></label>
+                                      <div class="step_config-form_item">
+                                          <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
+                                          <br />
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="nux_config_imap_address-error" class="error-message"></span>
+                                      </div>
+                                      <div class="step_config-smtp_imap_port_bloc">
+                                         <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
+                                         <div>
+                                             <input type="radio" id="imap_tls" name="nux_config_imap_tls" value="true">
+                                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
+                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
+                                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
+                                         </div>
+                                         <span id="nux_config_imap_port-error" class="error-message"></span>
+                                      </div>
+
+                                   ';
+
+         if ($this->get('sieve_filters_enabled')) {
+             $default_value = '';
+                 $res .=  '
+                            <div class="step_config-form_item">
+                                <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
+                                <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                            </div>
+                           <div class="step_config-form_item nested hide" id="nux_imap_sieve_host_bloc">
+                               <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
+                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
+                                <span id="nux_imap_sieve_host-error" class="error-message"></span>
+                           </div>';
+         }
+
+         $res .= '      </div>
+                    </div>
+                             <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
+                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
+                                  <label for="nux_create_profile">'.$this->trans('Create Profile').'</label>
+                             </div>
+                             <div class="nested" id="nux_profile_bloc">
+                                 <div class="step_config-form_item nested">
+                                     <label for="nux_profile_reply_to">'.$this->trans('Reply to').'</label>
+                                     <br />
+                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="nux_profile_reply_to" />
+                                </div>
+                                 <div class="step_config-form_item nested">
+                                     <label for="nux_profile_signature">'.$this->trans('Signature').'</label>
+                                     <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
+                                 </div>
+                                 <div class="step_config-form_item nested">
+                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
+                                     <label for="nux_profile_is_default">'.$this->trans('Set this profile default').'</label>
+                                 </div>
+                             </div>
+                          </form>
+                      </div>
+                      <div class="nux_config_form_loader hide" id="nux_config_form_loader">
+                          <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
+                      </div>
+                      <div class="step_config-actions">
+                          <button class="nux_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
+                          <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                          <button class="nux_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
+                      </div>
+                  </div>
+                  <div id="step_config_0">
+                      <button class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+                  </div>
+                </div>
+         </div>';
+
+         return $res;
+
+    }
+}
diff --git a/modules/core/setup.php b/modules/core/setup.php
index 84e7e572c1..db80448110 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -15,6 +15,7 @@
 setup_base_page('home');
 add_handler('home', 'check_missing_passwords', true, 'core', 'load_user_data', 'after');
 add_output('home', 'home_heading', true, 'core', 'content_section_start', 'after');
+add_output('servers', 'server_config_stepper', true, 'core', 'server_content_start', 'after');
 add_output('home', 'home_password_dialogs', true, 'core', 'home_heading', 'after');
 
 /* servers page */
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index c2adc185b6..a99c3244c7 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1416,3 +1416,137 @@ function parse_sieve_config_host($host) {
     // $host = '$scheme://'.$host;
     return [$host, $port, $tls];
 }}
+
+if (!hm_exists('connect_to_imap_serve')) {
+    function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $context, $errno = null, $errstr = null) {
+        if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
+              $imap_list = array(
+                  'name' => $name,
+                  'server' => $address,
+                  'hide' => false,
+                  'port' => $port,
+                  'user' => $user,
+                  'pass' => $pass,
+                  'tls' => $tls);
+                  
+              Hm_IMAP_List::add($imap_list);
+              $servers = Hm_IMAP_List::dump(false, true);
+              $ids = array_keys($servers);
+              $imap_server_id = array_pop($ids);
+              
+             return $imap_server_id;
+        }
+    }
+}
+
+
+if (!hm_exists('connect_to_jmap_serve')) {
+    function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user, $pass) {
+       $hidden = false;
+                       
+       if($hide_from_c_page) {
+           $hidden = true;
+       }
+       
+       $parsed = parse_url($jmap_address);
+       
+       if (array_key_exists('host', $parsed) && @get_headers($jmap_address)) {
+           Hm_IMAP_List::add(array(
+               'name' => $name,
+               'server' => $jmap_address,
+               'hide' => $hidden,
+               'type' => 'jmap',
+               'port' => false,
+               'tls' => false));
+           $servers = Hm_IMAP_List::dump(false, true);
+           $ids = array_keys($servers);
+           $jmap_server_id = array_pop($ids);
+           
+           return $jmap_server_id;
+       }
+    }
+}
+
+if (!hm_exists('authenticate_to_imap_server')) {
+    function authenticate_to_imap_server($user, $pass, $imap_server_id, $context) {
+        if (in_server_list('Hm_IMAP_List', $imap_server_id, $user)) {
+              Hm_Msgs::add('ERRThis server and username are already configured');
+              return;
+        } else{
+            Hm_IMAP_List::clean_up();
+            $cache = Hm_IMAP_List::get_cache($context->cache, $imap_server_id);
+            $imap = Hm_IMAP_List::connect($imap_server_id, $cache, $user, $pass, true);
+            
+            if (imap_authed($imap)) {
+                  $servers = Hm_IMAP_List::dump(false, true);
+                  $context->user_config->set('imap_servers', $servers);
+                  $context->just_saved_credentials = true;
+                  $context->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+                  return true;
+            }
+            else {
+                  Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                  Hm_IMAP_List::forget_credentials($context->imap_server_id);
+                  return;
+            }
+        }
+    }
+}
+
+if (!hm_exists('test_function')) {
+    function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve = false, $errno = null, $errstr = null) {
+            if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
+                  $imap_list = array(
+                      'name' => $name,
+                      'server' => $address,
+                      'hide' => false,
+                      'port' => $port,
+                      'user' => $user,
+                      'pass' => $pass,
+                      'tls' => $tls);
+    
+                  if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && $enableSieve) {
+                      $imap_list['sieve_config_host'] = $imap_sieve_host;
+    
+                       require_once VENDOR_PATH . 'autoload.php';
+                       try {
+                           list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
+                           $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
+                           $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
+                       } catch (Exception $e) {
+                           Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
+                           return;
+                       }
+                  }
+    
+    
+                  Hm_IMAP_List::add($imap_list);
+                  $servers = Hm_IMAP_List::dump(false, true);
+                  $ids = array_keys($servers);
+                  $this->imap_server_id = array_pop($ids);
+    
+                  if (in_server_list('Hm_IMAP_List', $this->imap_server_id, $user)) {
+                      Hm_Msgs::add('ERRThis server and username are already configured');
+                      return;
+                  }
+    
+                  Hm_IMAP_List::clean_up();
+                  $cache = Hm_IMAP_List::get_cache($this->cache, $this->imap_server_id);
+                  $imap = Hm_IMAP_List::connect($this->imap_server_id, $cache, $user, $pass, true);
+                  if (imap_authed($imap)) {
+                      $this->user_config->set('imap_servers', $servers);
+                      $this->just_saved_credentials = true;
+                      $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
+                      return true;
+                  }
+                  else {
+                      Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
+                      Hm_IMAP_List::forget_credentials($this->imap_server_id);
+                      return;
+                  }
+              }else {
+                  Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
+                  return;
+             }
+        }
+}
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index b49b526ac8..680840620d 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -253,8 +253,6 @@ class Hm_Handler_quick_server_setup_nux extends Hm_Handler_Module {
     public $imap_server_id = null;
     public $jmap_server_id = null;
     public $just_saved_credentials = false;
-    public $imap = null;
-    public $smtp = null;
 
     public function process() {
         list($success, $form) = $this->process_form(array(
@@ -282,18 +280,37 @@ public function process() {
            ));
 
         if ($success) {
+            // Destructure form array into variables
+            [
+                'nux_config_profile_name' => $profileName,
+                'nux_config_email' => $email,
+                'nux_config_password' => $password,
+                'nux_config_provider' => $provider,
+                'nux_config_is_sender' => $isSender,
+                'nux_config_is_receiver' => $isReceiver,
+                'nux_config_smtp_address' => $smtpAddress,
+                'nux_config_smtp_port' => $smtpPort,
+                'nux_config_smtp_tls' => $smtpTls,
+                'nux_config_imap_address' => $imapAddress,
+                'nux_config_imap_port' => $imapPort,
+                'nux_config_imap_tls' => $imapTls,
+                'nux_enable_sieve' => $enableSieve,
+                'nux_create_profile' => $createProfile,
+                'nux_profile_is_default' => $profileIsDefault,
+                'nux_profile_signature' => $profileSignature,
+                'nux_profile_reply_to' => $profileReplyTo,
+                'nux_imap_sieve_host' => $imapSieveHost,
+                'nux_config_only_jmap' => $onlyJmap,
+                'nux_config_jmap_hide_from_c_page' => $jmapHideFromCPage,
+                'nux_config_jmap_address' => $jmapAddress,
+            ] = $form;
+                
             /*
             * When JMAP selected only configure JMAP
             */
              if($form['nux_config_only_jmap']) {
-                $result = $this->connectToJMAP(
-                            $form['nux_config_jmap_address'], 
-                            $form['nux_config_jmap_hide_from_c_page'], 
-                            $form['nux_config_profile_name'], 
-                            $form['nux_config_email'],
-                            $form['nux_config_password']);
-                
-                if(!isset($result)) return;
+                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password);
+                $is_jmap_server_authenticated = authenticate_to_imap_server($email, $password, $this->jmap_server_id, $this);
                 
                 Hm_Msgs::add("JMAP Server saved");
                 $this->out('just_saved_credentials', $this->just_saved_credentials);
@@ -302,57 +319,36 @@ public function process() {
                  /*
                  *  Connect to SMTP server if user wants to send emails
                  */
-                 if($form['nux_config_is_sender']){
-                     $result = $this->connectToSMPT(
-                        $form['nux_config_smtp_address'],
-                        $form['nux_config_profile_name'],
-                        $form['nux_config_smtp_port'],
-                        $form['nux_config_email'],
-                        $form['nux_config_password'],
-                        $form['nux_config_smtp_tls']);
-    
-                     if(!isset($result)) return;
+                 if($isSender){
+                    $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this, $errno = null, $errstr = null);
+                    $is_smtp_server_authenticated = authenticate_to_smtp_server($email, $password, $this->smtp_server_id, $this);
+                    
+                    Hm_Msgs::add("is_smtp_server_authenticated => ".!$is_smtp_server_authenticated);
+                    Hm_Msgs::add("$this->smtp_server_id => ".!$this->smtp_server_id);
+                        
+                    if(!isset($this->smtp_server_id) || !$is_smtp_server_authenticated) return;
                  }
     
                  /*
                   *  Connect to IMAP server if user wants to receive emails
                   */
-                 if($form['nux_config_is_receiver']){
-                     $result = $this->connectToIMAP(
-                       $form['nux_config_imap_address'],
-                       $form['nux_config_profile_name'],
-                       $form['nux_config_imap_port'],
-                       $form['nux_config_email'],
-                       $form['nux_config_password'],
-                       $form['nux_config_imap_tls'],
-                       $form['nux_imap_sieve_host'],
-                       $form['nux_enable_sieve']);
-    
-                     if(!isset($result)) {
-                       /**
-                       * Delete the SMPT server created before
-                       **/
-                       if(!isset($result) && $form['nux_config_is_sender']){
-                           $res = Hm_SMTP_List::del($this->smtp_server_id);
-                           if ($res) {
-                               Hm_SMTP_List::forget_credentials($this->smtp_server_id);
-                               $smtp_servers = Hm_SMTP_List::dump(false, true);
-                               $this->user_config->set('smtp_servers', $smtp_servers);
-                           }
-                       }
-                        return;
-                     }
+                 if($isReceiver){
+                      $this->imap_server_id = connect_to_imap_server($imapAddress, $profileName, $imapPort, $email, $password, $imapTls, $imapSieveHost, $enableSieve, $this, $errno = null, $errstr = null);
+                      $is_imap_server_authenticated = authenticate_to_imap_server($email, $password, $this->imap_server_id, $this);
+                      
+                      
+                      if(!isset($this->imap_server_id) || !$is_imap_server_authenticated) {
+                          if($isSender && isset($this->smtp_server_id)){
+                                delete_smtp_server($this->smtp_server_id, $this);
+                          }
+                          return;
+                      };
                  }
+                 
+                 
     
-                 if($form['nux_config_is_sender'] && $form['nux_config_is_receiver'] && $form['nux_create_profile'] && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
-                     $this->saveProfile(
-                        $form['nux_config_profile_name'],
-                        $form['nux_profile_signature'],
-                        $form['nux_profile_reply_to'],
-                        $form['nux_profile_is_default'],
-                        $form['nux_config_email'],
-                        $form['nux_config_imap_address']
-                        );
+                 if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                     add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $context);
                  }
     
                  Hm_Msgs::add("Server saved");
@@ -360,176 +356,6 @@ public function process() {
             }
         }
     }
-
-    public function saveProfile($name, $signature, $replyTo, $isDefault, $email, $serverMail){
-        $profile = array(
-                         'name' => $name,
-                         'sig' => $signature,
-                         'smtp_id' => $this->imap_server_id,
-                         'replyto' => $replyTo,
-                         'default' => $isDefault,
-                         'address' => $email,
-                         'server' =>  $serverMail,
-                         'user' => $email,
-                         'type' => 'imap'
-                     );
-
-          $profiles = new Hm_Profiles($this);
-          $profiles->add($profile);
-          $this->session->record_unsaved('Profile added');
-
-          $profiles->save($this->user_config);
-          $user_data = $this->user_config->dump();
-          $this->session->set('user_data', $user_data);
-    }
-
-    public function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve = false, $errno = null, $errstr = null) {
-        if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
-              $imap_list = array(
-                  'name' => $name,
-                  'server' => $address,
-                  'hide' => false,
-                  'port' => $port,
-                  'user' => $user,
-                  'pass' => $pass,
-                  'tls' => $tls);
-
-              if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && $enableSieve) {
-                  $imap_list['sieve_config_host'] = $imap_sieve_host;
-
-                   require_once VENDOR_PATH . 'autoload.php';
-                   try {
-                       list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
-                       $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
-                       $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
-                   } catch (Exception $e) {
-                       Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
-                       return;
-                   }
-              }
-
-
-              Hm_IMAP_List::add($imap_list);
-              $servers = Hm_IMAP_List::dump(false, true);
-              $ids = array_keys($servers);
-              $this->imap_server_id = array_pop($ids);
-
-              if (in_server_list('Hm_IMAP_List', $this->imap_server_id, $user)) {
-                  Hm_Msgs::add('ERRThis server and username are already configured');
-                  return;
-              }
-
-              Hm_IMAP_List::clean_up();
-              $cache = Hm_IMAP_List::get_cache($this->cache, $this->imap_server_id);
-              $imap = Hm_IMAP_List::connect($this->imap_server_id, $cache, $user, $pass, true);
-              if (imap_authed($imap)) {
-                  $this->user_config->set('imap_servers', $servers);
-                  $this->just_saved_credentials = true;
-                  $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
-                  return true;
-              }
-              else {
-                  Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                  Hm_IMAP_List::forget_credentials($this->imap_server_id);
-                  return;
-              }
-          }else {
-              Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
-              return;
-         }
-    }
-    
-    public function connectToJMAP($jmap_address, $hide_from_c_page, $name, $user, $pass) {
-        $hidden = false;
-                        
-        if($hide_from_c_page) {
-            $hidden = true;
-        }
-        
-        $parsed = parse_url($jmap_address);
-        
-        if (array_key_exists('host', $parsed) && @get_headers($jmap_address)) {
-            try{
-                Hm_IMAP_List::add(array(
-                    'name' => $name,
-                    'server' => $jmap_address,
-                    'hide' => $hidden,
-                    'type' => 'jmap',
-                    'port' => false,
-                    'tls' => false));
-                $servers = Hm_IMAP_List::dump(false, true);
-                $ids = array_keys($servers);
-                $this->jmap_server_id = array_pop($ids);
-    
-                if (in_server_list('Hm_IMAP_List', $this->jmap_server_id, $user)) {
-                  Hm_Msgs::add('ERRThis server and username are already configured');
-                  return;
-                } else{
-                    Hm_IMAP_List::clean_up();
-                    $cache = Hm_IMAP_List::get_cache($this->cache, $this->jmap_server_id);
-                    $imap = Hm_IMAP_List::connect($this->jmap_server_id, $cache, $user, $pass, true);
-                    
-                    if (imap_authed($imap)) {
-                         $this->user_config->set('imap_servers', $servers);
-                         $this->just_saved_credentials = true;
-                         $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
-                    
-                         return true;
-                    }
-                    else {
-                      Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                      Hm_IMAP_List::forget_credentials($this->jmap_server_id);
-                      return;
-                    }
-                }
-            }catch(Exception $e){
-                Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                return;
-            }
-        }
-    }
-
-    public function connectToSMPT($address, $name, $port, $user, $pass, $tls, $errno = null, $errstr = null) {
-        try {
-            if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
-                  Hm_SMTP_List::add( array(
-                      'name' => $name,
-                      'server' => $address,
-                      'port' => $port,
-                      'user' => $user,
-                      'pass' => $pass,
-                      'tls' => $tls));
-    
-                  $smtp_servers = Hm_SMTP_List::dump(false, true);
-                  $ids = array_keys($smtp_servers);
-                  $this->smtp_server_id = array_pop($ids);
-    
-                  if (in_server_list('Hm_SMTP_List', $this->smtp_server_id, $user)) {
-                      Hm_Msgs::add('ERRThis SMTP server and username are already configured');
-                      return;
-                  }
-    
-                   $this->smtp = Hm_SMTP_List::connect($this->smtp_server_id, false, $user, $pass, true);
-                   if (is_object($this->smtp) && $this->smtp->state == 'authed') {
-                       $this->user_config->set('smtp_servers', $smtp_servers);
-                       $this->just_saved_credentials = true;
-                       $this->session->record_unsaved('SMTP server saved');
-                       return true;
-                   }
-                   else {
-                       Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
-                       Hm_SMTP_List::forget_credentials($this->smtp_server_id);
-                       return;
-                   }
-            } else {
-                Hm_Msgs::add(sprintf('ERRCan not add connect to the SMTP server: %s', $errstr));
-                return;
-            }
-        }catch(Exception $e){
-            Hm_Msgs::add("ERRCan not add connect to the server");
-            return;
-        }
-    }
 }
 
 /**
@@ -747,191 +573,6 @@ protected function output() {
     }
 }
 
-
-
-class Hm_Output_server_config_stepper extends Hm_Output_Module {
-    protected function output() {
-    $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
-    $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
-    $smtp_servers_count = count($this->get('smtp_servers', array()));
-
-    $res = '<div class="smtp_imap_server_setup">
-         <div data-target=".server_config_section" class="server_section">'.
-                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP - SMTP - JMAP Servers').'
-                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP/ '. $jmap_servers_count .' JMAP</div>
-         </div>
-         <div class="server_config_section">
-            <div class="stepper" id="nux_config_stepper">
-                <div class="step-container">
-                    <div id="step_config_1" class="step step_config">
-                        <div class="step_config-title">
-                            <h2>'.$this->trans('Step 1').'</h2>
-                            <span>('.$this->trans('Authentication').')</span>
-                        </div>
-                        <div>
-                            <form>
-                               <div class="step_config-form_item">
-                                    <label for="nux_config_profile_name">'.$this->trans('Name').'</label>
-                                    <br />
-                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Name').'" />
-                                    <span id="nux_config_profile_name-error" class="error-message"></span>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <label for="nux_config_email">'.$this->trans('Email or Username').'</label>
-                                    <br />
-                                    <input type="text"  class="stepper_input" id="nux_config_email" placeholder="email" />
-                                    <span id="nux_config_email-error" class="error-message"></span>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <label for="nux_config_password">'.$this->trans('Password').'</label>
-                                    <br />
-                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="'.$this->trans('Password').'" />
-                                    <span id="nux_config_password-error" class="error-message"></span>
-                               </div>
-                            </form>
-                        </div>
-                        <div class="step_config-actions">
-                            <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
-                        </div>
-                    </div>
-                    <div id="step_config_2" class="step step_config">
-                        <div class="step_config-title">
-                            <h2>'.$this->trans('Step 2').'</h2>
-                            <span>('.$this->trans('Mail server configuration').')</span>
-                        </div>
-                        <div>
-                            <form>
-                               <div class="step_config-form_item">
-                                    <label for="nux_config_provider">'.$this->trans('Provider').'</label>
-                                    <br />
-                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
-                                    <label for="nux_config_is_sender">'.$this->trans('Sender account').'</label>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
-                                    <label for="nux_config_is_receiver">'.$this->trans('Receiver account').'</label>
-                               </div>
-                               <span id="nux_config_serve_type-error" class="error-message"></span>
-
-                               <div class="step_config-smtp_imap_bloc">
-                                    <div class="step_config-form_item" id="nux_config_jmap_select_box">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="nux_config_only_jmap" id="nux_config_only_jmap"/>
-                                        <label for="nux_config_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
-                                    </div>
-                                    <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
-                                      <label><strong>JMAP</strong></label>
-                                      <div class="step_config-form_item">
-                                          <label for="nux_config_jmap_address">'.$this->trans('Address').'</label>
-                                          <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_jmap_address" placeholder="'.$this->trans('Address').'" />
-                                          <span id="nux_config_jmap_address-error" class="error-message"></span>
-                                      </div>
-                                      <div class="step_config-form_item">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="nux_config_jmap_hide_from_c_page" />
-                                        <label for="nux_config_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
-                                      </div>
-                                    </div>
-                                    <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
-                                       <label><strong>SMTP</strong></label>
-                                       <div class="step_config-form_item">
-                                           <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
-                                           <br />
-                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="nux_config_smtp_address-error" class="error-message"></span>
-                                       </div>
-                                       <div class="step_config-smtp_imap_port_bloc">
-                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
-                                           <div>
-                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_tls" value="true">
-                                               <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
-                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
-                                               <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
-                                           </div>
-                                           <span id="nux_config_smtp_port-error" class="error-message"></span>
-                                       </div>
-                                   </div>
-                                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
-                                      <label><strong>IMAP</strong></label>
-                                      <div class="step_config-form_item">
-                                          <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
-                                          <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="nux_config_imap_address-error" class="error-message"></span>
-                                      </div>
-                                      <div class="step_config-smtp_imap_port_bloc">
-                                         <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
-                                         <div>
-                                             <input type="radio" id="imap_tls" name="nux_config_imap_tls" value="true">
-                                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
-                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
-                                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
-                                         </div>
-                                         <span id="nux_config_imap_port-error" class="error-message"></span>
-                                      </div>
-
-                                   ';
-
-         if ($this->get('sieve_filters_enabled')) {
-             $default_value = '';
-                 $res .=  '
-                            <div class="step_config-form_item">
-                                <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
-                                <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
-                            </div>
-                           <div class="step_config-form_item nested hide" id="nux_imap_sieve_host_bloc">
-                               <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
-                                <span id="nux_imap_sieve_host-error" class="error-message"></span>
-                           </div>';
-         }
-
-         $res .= '      </div>
-                    </div>
-                             <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
-                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
-                                  <label for="nux_create_profile">'.$this->trans('Create Profile').'</label>
-                             </div>
-                             <div class="nested" id="nux_profile_bloc">
-                                 <div class="step_config-form_item nested">
-                                     <label for="nux_profile_reply_to">'.$this->trans('Reply to').'</label>
-                                     <br />
-                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="nux_profile_reply_to" />
-                                </div>
-                                 <div class="step_config-form_item nested">
-                                     <label for="nux_profile_signature">'.$this->trans('Signature').'</label>
-                                     <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
-                                 </div>
-                                 <div class="step_config-form_item nested">
-                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
-                                     <label for="nux_profile_is_default">'.$this->trans('Set this profile default').'</label>
-                                 </div>
-                             </div>
-                          </form>
-                      </div>
-                      <div class="nux_config_form_loader hide" id="nux_config_form_loader">
-                          <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
-                      </div>
-                      <div class="step_config-actions">
-                          <button class="nux_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
-                          <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                          <button class="nux_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
-                      </div>
-                  </div>
-                  <div id="step_config_0">
-                      <button class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
-                  </div>
-                </div>
-         </div>';
-
-         return $res;
-
-    }
-}
-
 /**
  * @subpackage nux/functions
  */
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index c91e7de8c8..7edb3ad1fb 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -6,7 +6,6 @@
 output_source('nux');
 
 /* servers page */
-add_output('servers', 'server_config_stepper', true, 'smtp', 'server_content_start', 'after');
 add_output('servers', 'quick_add_section', true, 'nux', 'display_configured_imap_servers', 'after');
 add_output('servers', 'quick_add_dialog', true, 'nux', 'quick_add_section', 'after');
 
diff --git a/modules/profiles/functions.php b/modules/profiles/functions.php
new file mode 100644
index 0000000000..b079b826a1
--- /dev/null
+++ b/modules/profiles/functions.php
@@ -0,0 +1,27 @@
+<?php
+
+if (!defined('DEBUG_MODE')) { die(); }
+
+if (!hm_exists('add_profile')) {
+    function add_profile($name, $signature, $reply_to, $is_default, $email, $server_mail, $smtp_server_id, $imap_server_id, $context) {
+        $profile = array(
+            'name' => $name,
+            'sig' => $signature,
+            'smtp_id' => $smtp_server_id,
+            'replyto' => $reply_to,
+            'default' => $is_default,
+            'address' => $email,
+            'server' =>  $server_mail,
+            'user' => $email,
+            'type' => 'imap'
+        );
+       
+         $profiles = new Hm_Profiles($context);
+         $profiles->add($profile);
+         $context->session->record_unsaved('Profile added');
+
+         $profiles->save($context->user_config);
+         $user_data = $context->user_config->dump();
+         $context->session->set('user_data', $user_data);
+    }
+}
\ No newline at end of file
diff --git a/modules/profiles/modules.php b/modules/profiles/modules.php
index 79a36389a1..aae3d090e0 100644
--- a/modules/profiles/modules.php
+++ b/modules/profiles/modules.php
@@ -9,6 +9,7 @@
 if (!defined('DEBUG_MODE')) { die(); }
 
 require APP_PATH.'modules/profiles/hm-profiles.php';
+require APP_PATH.'modules/profiles/functions.php';
 
 /**
  * @subpackage profile/handler
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
new file mode 100644
index 0000000000..fc97299092
--- /dev/null
+++ b/modules/smtp/functions.php
@@ -0,0 +1,60 @@
+<?php
+
+
+if (!defined('DEBUG_MODE')) { die(); }
+
+if (!hm_exists('connect_to_smtp_serve')) {
+    function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $context, $errno = null, $errstr = null) {
+        if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
+              Hm_SMTP_List::add( array(
+                  'name' => $name,
+                  'server' => $address,
+                  'port' => $port,
+                  'user' => $user,
+                  'pass' => $pass,
+                  'tls' => $tls));
+
+              $smtp_servers = Hm_SMTP_List::dump(false, true);
+              $ids = array_keys($smtp_servers);
+              $smtp_server_id = array_pop($ids);
+              
+              return $smtp_server_id;
+        }
+        
+        return null;
+    }
+}
+
+if (!hm_exists('authenticate_to_smtp_server')) {
+    function authenticate_to_smtp_server($user, $pass, $smtp_server_id, $context) {
+        if (in_server_list('Hm_SMTP_List', $smtp_server_id, $user)) {
+          Hm_Msgs::add('ERRThis SMTP server and username are already configured');
+          return false;
+       }
+
+       $smtp = Hm_SMTP_List::connect($smtp_server_id, false, $user, $pass, true);
+       if (is_object($smtp) && $smtp->state == 'authed') {
+           $smtp_servers = Hm_SMTP_List::dump(false, true);
+           $context->user_config->set('smtp_servers', $smtp_servers);
+           $context->just_saved_credentials = true;
+           $context->session->record_unsaved('SMTP server saved');
+           return true;
+       }
+       else {
+           Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
+           Hm_SMTP_List::forget_credentials($smtp_server_id);
+           return false;
+       }
+    }
+}
+
+if (!hm_exists('delete_smtp_server')) {
+    function delete_smtp_server($smtp_server_id, $context) {
+       $res = Hm_SMTP_List::del($smtp_server_id);
+       if ($res) {
+           Hm_SMTP_List::forget_credentials($smtp_server_id);
+           $smtp_servers = Hm_SMTP_List::dump(false, true);
+           $context->user_config->set('smtp_servers', $smtp_servers);
+       }
+    }
+}
\ No newline at end of file
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 64509cabcb..0e04d6ae6a 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -11,6 +11,7 @@
 use League\CommonMark\GithubFlavoredMarkdownConverter;
 
 define('MAX_RECIPIENT_WARNING', 20);
+require_once APP_PATH.'modules/smtp/functions.php';
 require APP_PATH.'modules/smtp/hm-smtp.php';
 require APP_PATH.'modules/smtp/hm-mime-message.php';
 

From 2fa7c32552527cc70bbdced6b406debb7eea2912 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 11 Jan 2024 16:37:20 +0100
Subject: [PATCH 23/55] Ref: move functions to modules

---
 modules/core/handler_modules.php | 108 +++++++++++
 modules/core/output_modules.php  | 124 ++++++------
 modules/core/setup.php           |  38 +++-
 modules/core/site.css            |  33 ++++
 modules/core/site.js             | 297 +++++++++++++++++++++++++++++
 modules/imap/functions.php       |  58 ------
 modules/nux/modules.php          | 113 -----------
 modules/nux/setup.php            |  37 +---
 modules/nux/site.css             |  33 ----
 modules/nux/site.js              | 314 -------------------------------
 10 files changed, 538 insertions(+), 617 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index 389f9278b2..e7adcc9590 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -962,3 +962,111 @@ function warn_for_unsaved_changes_callback($val) {
         process_site_setting('warn_for_unsaved_changes', $this, 'warn_for_unsaved_changes_callback');
     }
 }
+
+/**
+ * @subpackage core/handler
+ */
+class Hm_Handler_quick_servers_setup extends Hm_Handler_Module {
+    public $smtp_server_id = null;
+    public $imap_server_id = null;
+    public $jmap_server_id = null;
+    public $just_saved_credentials = false;
+
+    public function process() {
+        list($success, $form) = $this->process_form(array(
+           'srv_setup_stepper_profile_name',
+           'srv_setup_stepper_email',
+           'srv_setup_stepper_password',
+           'srv_setup_stepper_provider',
+           'srv_setup_stepper_is_sender',
+           'srv_setup_stepper_is_receiver',
+           'srv_setup_stepper_smtp_address',
+           'srv_setup_stepper_smtp_port',
+           'srv_setup_stepper_smtp_tls',
+           'srv_setup_stepper_imap_address',
+           'srv_setup_stepper_imap_port',
+           'srv_setup_stepper_imap_tls',
+           'srv_setup_stepper_enable_sieve',
+           'srv_setup_stepper_create_profile',
+           'srv_setup_stepper_profile_is_default',
+           'srv_setup_stepper_profile_signature',
+           'srv_setup_stepper_profile_reply_to',
+           'srv_setup_stepper_imap_sieve_host',
+           'srv_setup_stepper_only_jmap',
+           'srv_setup_stepper_jmap_hide_from_c_page',
+           'srv_setup_stepper_jmap_address',
+           ));
+
+        if ($success) {
+            // Destructure form array into variables
+            [
+                'srv_setup_stepper_profile_name' => $profileName,
+                'srv_setup_stepper_email' => $email,
+                'srv_setup_stepper_password' => $password,
+                'srv_setup_stepper_provider' => $provider,
+                'srv_setup_stepper_is_sender' => $isSender,
+                'srv_setup_stepper_is_receiver' => $isReceiver,
+                'srv_setup_stepper_smtp_address' => $smtpAddress,
+                'srv_setup_stepper_smtp_port' => $smtpPort,
+                'srv_setup_stepper_smtp_tls' => $smtpTls,
+                'srv_setup_stepper_imap_address' => $imapAddress,
+                'srv_setup_stepper_imap_port' => $imapPort,
+                'srv_setup_stepper_imap_tls' => $imapTls,
+                'srv_setup_stepper_enable_sieve' => $enableSieve,
+                'srv_setup_stepper_create_profile' => $createProfile,
+                'srv_setup_stepper_profile_is_default' => $profileIsDefault,
+                'srv_setup_stepper_profile_signature' => $profileSignature,
+                'srv_setup_stepper_profile_reply_to' => $profileReplyTo,
+                'srv_setup_stepper_imap_sieve_host' => $imapSieveHost,
+                'srv_setup_stepper_only_jmap' => $onlyJmap,
+                'srv_setup_stepper_jmap_hide_from_c_page' => $jmapHideFromCPage,
+                'srv_setup_stepper_jmap_address' => $jmapAddress,
+            ] = $form;
+            
+            /*
+            * When JMAP selected only configure JMAP
+            */
+             if(isset($onlyJmap) && $onlyJmap) {
+                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password);
+                $is_jmap_server_authenticated = authenticate_to_imap_server($email, $password, $this->jmap_server_id, $this);
+                
+                Hm_Msgs::add("JMAP Server saved");
+                $this->out('just_saved_credentials', $this->just_saved_credentials);
+                          
+             } else {
+                 /*
+                 *  Connect to SMTP server if user wants to send emails
+                 */
+                 if($isSender){
+                    $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this, $errno = null, $errstr = null);
+                    $is_smtp_server_authenticated = authenticate_to_smtp_server($email, $password, $this->smtp_server_id, $this);
+                    
+                     if(!isset($this->smtp_server_id) || !$is_smtp_server_authenticated) return;
+                 }
+    
+                 /*
+                  *  Connect to IMAP server if user wants to receive emails
+                  */
+                 if($isReceiver){
+                      $this->imap_server_id = connect_to_imap_server($imapAddress, $profileName, $imapPort, $email, $password, $imapTls, $imapSieveHost, $enableSieve, $this, $errno = null, $errstr = null);
+                      $is_imap_server_authenticated = authenticate_to_imap_server($email, $password, $this->imap_server_id, $this);
+                      
+                      
+                      if(!isset($this->imap_server_id) || !$is_imap_server_authenticated) {
+                          if($isSender && isset($this->smtp_server_id)){
+                                delete_smtp_server($this->smtp_server_id, $this);
+                          }
+                          return;
+                      };
+                 }
+    
+                 if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                     add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $this);
+                 }
+    
+                 Hm_Msgs::add("Server saved");
+                 $this->out('just_saved_credentials', $this->just_saved_credentials);
+            }
+        }
+    }
+}
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 5cc38f93be..ebe9a2a88e 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2015,7 +2015,7 @@ protected function output() {
                  <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP/ '. $jmap_servers_count .' JMAP</div>
          </div>
          <div class="server_config_section">
-            <div class="stepper" id="nux_config_stepper">
+            <div class="stepper" id="srv_setup_stepper_stepper">
                 <div class="step-container">
                     <div id="step_config_1" class="step step_config">
                         <div class="step_config-title">
@@ -2025,28 +2025,28 @@ protected function output() {
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_profile_name">'.$this->trans('Name').'</label>
+                                    <label for="srv_setup_stepper_profile_name">'.$this->trans('Name').'</label>
                                     <br />
-                                    <input type="text" class="stepper_input" id="nux_config_profile_name" placeholder="'.$this->trans('Name').'" />
-                                    <span id="nux_config_profile_name-error" class="error-message"></span>
+                                    <input type="text" class="stepper_input" id="srv_setup_stepper_profile_name" placeholder="'.$this->trans('Name').'" />
+                                    <span id="srv_setup_stepper_profile_name-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_email">'.$this->trans('Email or Username').'</label>
+                                    <label for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
                                     <br />
-                                    <input type="text"  class="stepper_input" id="nux_config_email" placeholder="email" />
-                                    <span id="nux_config_email-error" class="error-message"></span>
+                                    <input type="text"  class="stepper_input" id="srv_setup_stepper_email" placeholder="email" />
+                                    <span id="srv_setup_stepper_email-error" class="error-message"></span>
                                </div>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_password">'.$this->trans('Password').'</label>
+                                    <label for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
                                     <br />
-                                    <input type="password"  class="stepper_input" id="nux_config_password" placeholder="'.$this->trans('Password').'" />
-                                    <span id="nux_config_password-error" class="error-message"></span>
+                                    <input type="password"  class="stepper_input" id="srv_setup_stepper_password" placeholder="'.$this->trans('Password').'" />
+                                    <span id="srv_setup_stepper_password-error" class="error-message"></span>
                                </div>
                             </form>
                         </div>
                         <div class="step_config-actions">
-                            <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                            <button class="nux_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
+                            <button class="srv_setup_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                            <button class="srv_setup_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
                         </div>
                     </div>
                     <div id="step_config_2" class="step step_config">
@@ -2057,74 +2057,74 @@ protected function output() {
                         <div>
                             <form>
                                <div class="step_config-form_item">
-                                    <label for="nux_config_provider">'.$this->trans('Provider').'</label>
+                                    <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
                                     <br />
-                                    <select id="nux_config_provider" class="stepper_input" name="nux_config_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
+                                    <select id="srv_setup_stepper_provider" class="stepper_input" name="srv_setup_stepper_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_sender" checked />
-                                    <label for="nux_config_is_sender">'.$this->trans('Sender account').'</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked />
+                                    <label for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
                                </div>
                                <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="nux_config_is_receiver" checked />
-                                    <label for="nux_config_is_receiver">'.$this->trans('Receiver account').'</label>
+                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked />
+                                    <label for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
                                </div>
-                               <span id="nux_config_serve_type-error" class="error-message"></span>
+                               <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
 
                                <div class="step_config-smtp_imap_bloc">
-                                    <div class="step_config-form_item" id="nux_config_jmap_select_box">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="nux_config_only_jmap" id="nux_config_only_jmap"/>
-                                        <label for="nux_config_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
+                                    <div class="step_config-form_item" id="srv_setup_stepper_jmap_select_box">
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="srv_setup_stepper_only_jmap" id="srv_setup_stepper_only_jmap"/>
+                                        <label for="srv_setup_stepper_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
                                     </div>
                                     <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
                                       <label><strong>JMAP</strong></label>
                                       <div class="step_config-form_item">
-                                          <label for="nux_config_jmap_address">'.$this->trans('Address').'</label>
+                                          <label for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
                                           <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_jmap_address" placeholder="'.$this->trans('Address').'" />
-                                          <span id="nux_config_jmap_address-error" class="error-message"></span>
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_jmap_address" placeholder="'.$this->trans('Address').'" />
+                                          <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
                                       </div>
                                       <div class="step_config-form_item">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="nux_config_jmap_hide_from_c_page" />
-                                        <label for="nux_config_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
+                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="srv_setup_stepper_jmap_hide_from_c_page" />
+                                        <label for="srv_setup_stepper_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
                                       </div>
                                     </div>
                                     <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
                                        <label><strong>SMTP</strong></label>
                                        <div class="step_config-form_item">
-                                           <label for="nux_config_smtp_address">'.$this->trans('Address').'</label>
+                                           <label for="srv_setup_stepper_smtp_address">'.$this->trans('Address').'</label>
                                            <br />
-                                           <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_smtp_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="nux_config_smtp_address-error" class="error-message"></span>
+                                           <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_smtp_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="srv_setup_stepper_smtp_address-error" class="error-message"></span>
                                        </div>
                                        <div class="step_config-smtp_imap_port_bloc">
-                                           <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_smtp_port"/>
+                                           <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_smtp_port"/>
                                            <div>
-                                               <input type="radio" id="smtp_tls" name="nux_config_smtp_tls" value="true">
+                                               <input type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls" value="true">
                                                <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
-                                               <input type="radio" id="smtp_start_tls" name="nux_config_smtp_tls" value="false">
+                                               <input type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" value="false">
                                                <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                            </div>
-                                           <span id="nux_config_smtp_port-error" class="error-message"></span>
+                                           <span id="srv_setup_stepper_smtp_port-error" class="error-message"></span>
                                        </div>
                                    </div>
                                    <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
                                       <label><strong>IMAP</strong></label>
                                       <div class="step_config-form_item">
-                                          <label for="nux_config_imap_address">'.$this->trans('Address').'</label>
+                                          <label for="srv_setup_stepper_imap_address">'.$this->trans('Address').'</label>
                                           <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="nux_config_imap_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="nux_config_imap_address-error" class="error-message"></span>
+                                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_imap_address" placeholder="'.$this->trans('Address').'" />
+                                           <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
                                       </div>
                                       <div class="step_config-smtp_imap_port_bloc">
-                                         <input type="number" style="height: 20px;" class="stepper_input" id="nux_config_imap_port"/>
+                                         <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_imap_port"/>
                                          <div>
-                                             <input type="radio" id="imap_tls" name="nux_config_imap_tls" value="true">
+                                             <input type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls" value="true">
                                              <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
-                                             <input type="radio" id="imap_start_tls" name="nux_config_imap_tls" value="false">
+                                             <input type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" value="false">
                                              <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
                                          </div>
-                                         <span id="nux_config_imap_port-error" class="error-message"></span>
+                                         <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
                                       </div>
 
                                    ';
@@ -2133,50 +2133,50 @@ protected function output() {
              $default_value = '';
                  $res .=  '
                             <div class="step_config-form_item">
-                                <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_enable_sieve" onchange="handleSieveStatusChange(this)"/>
-                                <label for="nux_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                                <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_enable_sieve" onchange="handleSieveStatusChange(this)"/>
+                                <label for="srv_setup_stepper_enable_sieve">'.$this->trans('Enable Sieve').'</label>
                             </div>
-                           <div class="step_config-form_item nested hide" id="nux_imap_sieve_host_bloc">
-                               <label class="screen_reader" for="nux_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                               <input id="nux_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
-                                <span id="nux_imap_sieve_host-error" class="error-message"></span>
+                           <div class="step_config-form_item nested hide" id="srv_setup_stepper_imap_sieve_host_bloc">
+                               <label class="screen_reader" for="srv_setup_stepper_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
+                               <input id="srv_setup_stepper_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
+                                <span id="srv_setup_stepper_imap_sieve_host-error" class="error-message"></span>
                            </div>';
          }
 
          $res .= '      </div>
                     </div>
-                             <div class="step_config-form_item" id="nux_profile_checkbox_bloc">
-                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="nux_create_profile" checked />
-                                  <label for="nux_create_profile">'.$this->trans('Create Profile').'</label>
+                             <div class="step_config-form_item" id="srv_setup_stepper_profile_checkbox_bloc">
+                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked />
+                                  <label for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
                              </div>
-                             <div class="nested" id="nux_profile_bloc">
+                             <div class="nested" id="srv_setup_stepper_profile_bloc">
                                  <div class="step_config-form_item nested">
-                                     <label for="nux_profile_reply_to">'.$this->trans('Reply to').'</label>
+                                     <label for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
                                      <br />
-                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="nux_profile_reply_to" />
+                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="srv_setup_stepper_profile_reply_to" />
                                 </div>
                                  <div class="step_config-form_item nested">
-                                     <label for="nux_profile_signature">'.$this->trans('Signature').'</label>
-                                     <textarea id="nux_profile_signature" name="nux_profile_signature" checked ></textarea>
+                                     <label for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
+                                     <textarea id="srv_setup_stepper_profile_signature" name="srv_setup_stepper_profile_signature" checked ></textarea>
                                  </div>
                                  <div class="step_config-form_item nested">
-                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="nux_profile_is_default" checked />
-                                     <label for="nux_profile_is_default">'.$this->trans('Set this profile default').'</label>
+                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_profile_is_default" checked />
+                                     <label for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
                                  </div>
                              </div>
                           </form>
                       </div>
-                      <div class="nux_config_form_loader hide" id="nux_config_form_loader">
+                      <div class="srv_setup_stepper_form_loader hide" id="srv_setup_stepper_form_loader">
                           <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
                       </div>
                       <div class="step_config-actions">
-                          <button class="nux_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
-                          <button class="nux_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                          <button class="nux_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
+                          <button class="srv_setup_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
+                          <button class="srv_setup_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                          <button class="srv_setup_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
                       </div>
                   </div>
                   <div id="step_config_0">
-                      <button class="nux_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+                      <button class="srv_setup_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
                   </div>
                 </div>
          </div>';
diff --git a/modules/core/setup.php b/modules/core/setup.php
index db80448110..a205d5dc9f 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -167,6 +167,18 @@
 add_handler('ajax_test', 'date', true, 'core');
 add_handler('ajax_test', 'http_headers', true, 'core');
 
+/* Server setup */
+add_handler('ajax_quick_servers_setup', 'login', false, 'core');
+add_handler('ajax_quick_servers_setup', 'load_user_data', true, 'core');
+add_handler('ajax_quick_servers_setup', 'quick_servers_setup', true);
+add_handler('ajax_quick_servers_setup', 'load_smtp_servers_from_config',  true, 'smtp');
+add_handler('ajax_quick_servers_setup', 'load_imap_servers_from_config',  true, 'imap');
+add_handler('ajax_quick_servers_setup', 'compose_profile_data',  true, 'profiles');
+add_handler('ajax_quick_servers_setup', 'save_user_data',  true, 'core');
+add_handler('ajax_quick_servers_setup', 'language',  true, 'core');
+add_handler('ajax_quick_servers_setup', 'date', true, 'core');
+add_handler('ajax_quick_servers_setup', 'http_headers', true, 'core');
+
 /* allowed input */
 return array(
     'allowed_pages' => array(
@@ -184,7 +196,8 @@
         'ajax_update_server_pw',
         'ajax_no_op',
         'notfound',
-        'search'
+        'search',
+        'ajax_quick_servers_setup',
     ),
     'allowed_output' => array(
         'date' => array(FILTER_SANITIZE_FULL_SPECIAL_CHARS, false),
@@ -290,7 +303,28 @@
         'trash_since' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'drafts_per_source' => FILTER_VALIDATE_INT,
         'drafts_since' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'warn_for_unsaved_changes' => FILTER_VALIDATE_BOOLEAN
+        'warn_for_unsaved_changes' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_profile_name'  => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_email' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_password' => FILTER_UNSAFE_RAW,
+        'srv_setup_stepper_provider' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_is_sender' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_is_receiver' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_smtp_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_smtp_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_smtp_tls' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_imap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_imap_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_imap_tls' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_enable_sieve' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_create_profile' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_imap_sieve_host' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_only_jmap' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_jmap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN,
+        'srv_setup_stepper_jmap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
     )
 );
 
diff --git a/modules/core/site.css b/modules/core/site.css
index ba8a057dec..875d9f2948 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -320,3 +320,36 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .mobile #list_controls_menu.show { display: flex; }
 .mobile .imap_sort { width: 100%; }
 .snoozed_date { color: teal !important; }
+
+.srv_setup_stepper_btn {width: 120px;height: 32px;padding: 0px 10px 0px 10px;background: #EBEBEB;color: #232323;border-color: #232323; border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: center;}
+.step_config-title {display: flex;align-items: center;gap: 10px;}
+.step_config-title > span {font-size: small;}
+.step_config-title > h2 {color: #777}
+.stepper_input {width: 350px;height: 20px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+
+.step_config-form_item {margin: 10px 0px;}
+.step_config-form_item.nested {margin-left: 20px !important;}
+.step_config-form_item-checkbox {}
+.step_config-form_item > label {color: #232323;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.step_config-form_item > textarea {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
+.step_config-form_item > select {height: 32px;}
+.step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
+.srv_setup_stepper_btn:hover {cursor: pointer;}
+.stepper {display: flex;overflow: hidden;padding: 10px 30px 100px 30px;}
+.step_config {width: 100%;transition: transform 0.5s;display: none;}
+.current_config_step {display: block;}
+.step-container {display: flex;width: 400px;}
+
+.step_config-smtp_imap_bloc { padding: 15px; background: #EBEBEB; }
+
+.step_config-smtp_imap_port_bloc {display: flex; font-size: 10px;}
+
+.step_config-smtp_imap_port_bloc > input { width: 100px;}
+.step_config-smtp_bloc {margin-bottom: 10px;}
+.step_config-imap_bloc {margin-bottom: 10px;}
+.server_config_section { display: none; }
+.error-message {color: red; font-size: small;}
+.hide {display: none;}
+.server_type_tag {background-color: teal;border-radius: 5px;padding: 0px 5px;color: white;font-size: x-small;width: max-content;font-weight: 900;}
+input[type="submit"], button {cursor: pointer; min-width: 70px;}
+input[type="submit"]:hover, button:hover {background-color: rgba(139, 137, 137, 0.16);}
diff --git a/modules/core/site.js b/modules/core/site.js
index 7e1d1edba6..0537ab1e83 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1861,3 +1861,300 @@ function listControlsMenu() {
     $('#list_controls_menu').toggleClass('show')
     $('.list_sources').hide();
 }
+
+
+function submitSmtpImapServer() {
+    $('#srv_setup_stepper_form_loader').removeClass('hide');
+    $('.step_config-actions').addClass('hide');
+
+    var requestData = [
+        { name: 'hm_ajax_hook', value: 'ajax_quick_servers_setup' },
+        { name: 'srv_setup_stepper_profile_name', value: $('#srv_setup_stepper_profile_name').val() },
+        { name: 'srv_setup_stepper_email', value: $('#srv_setup_stepper_email').val() },
+        { name: 'srv_setup_stepper_password', value: $('#srv_setup_stepper_password').val() },
+        { name: 'srv_setup_stepper_provider', value: $('#srv_setup_stepper_provider').val() },
+        { name: 'srv_setup_stepper_is_sender', value: $('#srv_setup_stepper_is_sender').prop('checked') },
+        { name: 'srv_setup_stepper_is_receiver', value: $('#srv_setup_stepper_is_receiver').prop('checked') },
+        { name: 'srv_setup_stepper_smtp_address', value: $('#srv_setup_stepper_smtp_address').val() },
+        { name: 'srv_setup_stepper_smtp_port', value: $('#srv_setup_stepper_smtp_port').val() },
+        { name: 'srv_setup_stepper_smtp_tls', value: $('input[name="srv_setup_stepper_smtp_tls"]:checked').val() },
+        { name: 'srv_setup_stepper_imap_address', value: $('#srv_setup_stepper_imap_address').val() },
+        { name: 'srv_setup_stepper_imap_port', value: $('#srv_setup_stepper_imap_port').val() },
+        { name: 'srv_setup_stepper_imap_tls', value: $('input[name="srv_setup_stepper_imap_tls"]:checked').val() },
+        { name: 'srv_setup_stepper_enable_sieve', value: $('#srv_setup_stepper_enable_sieve').prop('checked') },
+        { name: 'srv_setup_stepper_create_profile', value: $('#srv_setup_stepper_create_profile').prop('checked') },
+        { name: 'srv_setup_stepper_profile_is_default', value: $('#srv_setup_stepper_profile_is_default').prop('checked') },
+        { name: 'srv_setup_stepper_profile_signature', value: $('#srv_setup_stepper_profile_signature').val() },
+        { name: 'srv_setup_stepper_profile_reply_to', value: $('#srv_setup_stepper_profile_reply_to').val() },
+        { name: 'srv_setup_stepper_imap_sieve_host', value: $('#srv_setup_stepper_imap_sieve_host').val() },
+        { name: 'srv_setup_stepper_only_jmap', value: $('input[name="srv_setup_stepper_only_jmap"]:checked').val() },
+        { name: 'srv_setup_stepper_jmap_hide_from_c_page', value: $('input[name="srv_setup_stepper_jmap_hide_from_c_page"]:checked').val() },
+        { name: 'srv_setup_stepper_jmap_address', value: $('#srv_setup_stepper_jmap_address').val() },
+    ];
+
+    console.log("HERE")
+
+    Hm_Ajax.request(requestData, function(res) {
+        $('#srv_setup_stepper_form_loader').addClass('hide');
+        $('.step_config-actions').removeClass('hide');
+
+        if (res.just_saved_credentials) {
+            $('#srv_setup_stepper_stepper').find('form').trigger('reset');
+            display_config_step(0);
+
+            //Initialize the form
+            $("#srv_setup_stepper_profile_reply_to").val('');
+            $("#srv_setup_stepper_profile_signature").val('');
+            $("#srv_setup_stepper_profile_name").val('');
+            $("#srv_setup_stepper_email").val('');
+            $("#srv_setup_stepper_password").val('');
+            $("#srv_setup_stepper_profile_is_default").prop('checked', true);
+            $("#srv_setup_stepper_is_sender").prop('checked', true);
+            $("#srv_setup_stepper_is_receiver").prop('checked', true);
+            $("#srv_setup_stepper_enable_sieve").prop('checked', false);
+            $("#srv_setup_stepper_only_jmap").prop('checked', false);
+            $('#step_config-imap_bloc').show();
+            $('#step_config-smtp_bloc').show();
+            $('#srv_setup_stepper_profile_bloc').show();
+
+            Hm_Utils.set_unsaved_changes(1);
+            Hm_Folders.reload_folders(true);
+            location.reload();
+        }
+    });
+}
+
+function handleCreateProfileCheckboxChange(checkbox) {
+    if(checkbox.checked) {
+        $('#srv_setup_stepper_profile_bloc').show();
+    }else{
+        $('#srv_setup_stepper_profile_bloc').hide();
+    }
+}
+
+function handleSieveStatusChange (checkbox) {
+    if(checkbox.checked) {
+        $('#srv_setup_stepper_imap_sieve_host_bloc').show();
+    }else{
+        $('#srv_setup_stepper_imap_sieve_host_bloc').hide();
+    }
+}
+function handleSmtpImapCheckboxChange(checkbox) {
+    $(".step_config-smtp_imap_bloc").show();
+
+    if (checkbox.id === 'srv_setup_stepper_is_receiver') {
+        if(checkbox.checked) $('#step_config-imap_bloc').show();
+        else $('#step_config-imap_bloc').hide();
+    }
+
+    if (checkbox.id === 'srv_setup_stepper_is_sender') {
+        if(checkbox.checked) $('#step_config-smtp_bloc').show();
+        else $('#step_config-smtp_bloc').hide();
+    }
+
+    if($('#srv_setup_stepper_is_sender').prop('checked') &&
+        $('#srv_setup_stepper_is_receiver').prop('checked')){
+        $('#srv_setup_stepper_profile_bloc').show();
+        $('#srv_setup_stepper_profile_checkbox_bloc').show();
+        $('#srv_setup_stepper_jmap_select_box').show();
+        $("#srv_setup_stepper_only_jmap").show();
+    }else{
+        $("#srv_setup_stepper_only_jmap").prop('checked', false);
+
+        $('#srv_setup_stepper_profile_bloc').hide();
+        $('#srv_setup_stepper_profile_checkbox_bloc').hide();
+        $('#srv_setup_stepper_jmap_select_box').hide();
+        $("#srv_setup_stepper_only_jmap").hide();
+
+        if(!$('#srv_setup_stepper_is_sender').prop('checked') &&
+            !$('#srv_setup_stepper_is_receiver').prop('checked')){
+            $(".step_config-smtp_imap_bloc").hide();
+        }
+    }
+}
+
+function handleJmapCheckboxChange(checkbox) {
+    if(checkbox.checked){
+        $('#step_config-jmap_bloc').show();
+        $('#step_config-smtp_bloc').hide();
+        $('#step_config-imap_bloc').hide();
+        $('#srv_setup_stepper_profile_bloc').hide();
+        $('#srv_setup_stepper_profile_checkbox_bloc').hide();
+    }else {
+        $('#step_config-jmap_bloc').hide();
+        $('#step_config-smtp_bloc').show();
+        $('#step_config-imap_bloc').show();
+        $('#srv_setup_stepper_profile_bloc').show();
+        $('#srv_setup_stepper_profile_checkbox_bloc').show();
+    }
+}
+
+function handleProviderChange(select) {
+    let providerKey = select.value;
+    if(providerKey) {
+        getServiceDetails(providerKey);
+    }else{
+        $("#srv_setup_stepper_smtp_address").val('');
+        $("#srv_setup_stepper_smtp_port").val(465);
+        $("#srv_setup_stepper_imap_address").val('');
+        $("#srv_setup_stepper_imap_port").val(993);
+    }
+}
+function display_config_step(stepNumber) {
+    if(stepNumber == 2) {
+
+        var isValid = true;
+
+        [   {key: 'srv_setup_stepper_profile_name', value: $('#srv_setup_stepper_profile_name').val()},
+            {key: 'srv_setup_stepper_email', value: $('#srv_setup_stepper_email').val()},
+            {key: 'srv_setup_stepper_password', value: $('#srv_setup_stepper_password').val()}].forEach((item) => {
+            if(!item.value) {
+                $(`#${item.key}-error`).text('Required');
+                isValid = false;
+            }
+            else $(`#${item.key}-error`).text('');
+        })
+
+        if (!isValid) {
+            return
+        }
+
+        let providerKey = getEmailProviderKey($('#srv_setup_stepper_email').val());
+        getServiceDetails(providerKey);
+    }
+
+    if(stepNumber == 3) {
+        var requiredFields = [];
+        var isValid = true;
+
+        if(!$('#srv_setup_stepper_is_sender').is(':checked') && !$('#srv_setup_stepper_is_receiver').is(':checked')){
+            $('#srv_setup_stepper_serve_type-error').text('Required');
+            return;
+        }
+
+        if($('#srv_setup_stepper_is_sender').is(':checked') &&
+            $('#srv_setup_stepper_is_receiver').is(':checked') &&
+            $('#srv_setup_stepper_only_jmap').is(':checked')){
+            requiredFields.push(
+                {key: 'srv_setup_stepper_jmap_address', value: $('#srv_setup_stepper_jmap_address').val()},
+            )
+        }else {
+            if($('#srv_setup_stepper_is_sender').is(':checked')){
+                requiredFields.push(
+                    {key: 'srv_setup_stepper_smtp_address', value: $('#srv_setup_stepper_smtp_address').val()},
+                    {key: 'srv_setup_stepper_smtp_port', value: $('#srv_setup_stepper_smtp_port').val()},
+                )
+            }
+
+            if($('#srv_setup_stepper_is_receiver').is(':checked')) {
+                requiredFields.push(
+                    {key: 'srv_setup_stepper_imap_address', value: $('#srv_setup_stepper_imap_address').val()},
+                    {key: 'srv_setup_stepper_imap_port', value: $('#srv_setup_stepper_imap_port').val()},
+                )
+            }
+        }
+
+        if($('#srv_setup_stepper_enable_sieve').is(':checked')) {
+            requiredFields.push(
+                {key: 'srv_setup_stepper_imap_sieve_host', value: $('#srv_setup_stepper_imap_sieve_host').val()},
+            )
+        }
+
+        requiredFields.forEach((item) => {
+            if(!item.value) {
+                $(`#${item.key}-error`).text('Required');
+                isValid = false;
+            }
+            else $(`#${item.key}-error`).text('');
+        })
+
+
+        if(!isValid) return
+
+        submitSmtpImapServer();
+        return
+    }
+    // Hide all step elements
+    var steps = document.querySelectorAll('.step_config');
+    for (var i = 0; i < steps.length; i++) {
+        steps[i].style.display = 'none';
+    }
+
+    // Show the selected step
+    var selectedStep = document.getElementById('step_config_' + stepNumber);
+
+    if (selectedStep) {
+        selectedStep.style.display = 'block';
+        if(stepNumber == 0) $('.srv_setup_stepper_btn').show();
+    }
+}
+
+function getServiceDetails(providerKey){
+    if(providerKey) {
+        $("#srv_setup_stepper_provider").val(providerKey);
+
+        Hm_Ajax.request(
+            [
+                {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
+                {'name': 'nux_service', 'value': providerKey},],
+            function(res) {
+                if(res.service_details){
+                    let serverConfig = JSON.parse(res.service_details)
+
+                    $("#srv_setup_stepper_smtp_address").val(serverConfig.smtp.server);
+                    $("#srv_setup_stepper_smtp_port").val(serverConfig.smtp.port);
+
+                    if(serverConfig.smtp.tls)$("input[name='srv_setup_stepper_smtp_tls'][value='true']").prop("checked", true);
+                    else $("input[name='srv_setup_stepper_smtp_tls'][value='false']").prop("checked", true);
+
+                    $("#srv_setup_stepper_imap_address").val(serverConfig.server);
+                    $("#srv_setup_stepper_imap_port").val(serverConfig.port);
+
+                    if(serverConfig.tls)$("input[name='srv_setup_stepper_imap_tls'][value='true']").prop("checked", true);
+                    else $("input[name='srv_setup_stepper_imap_tls'][value='false']").prop("checked", true);
+                }
+            },
+            [],
+            false
+        );
+    }
+}
+
+function getEmailProviderKey(email) {
+    const emailProviderMap = {
+        "all-inkl": ["all-inkl.de", "all-inkl.com"],
+        "aol": ["aol.com"],
+        "fastmail": ["fastmail.com"],
+        "gandi": ["gandi.net"],
+        "gmail": ["gmail.com"],
+        "gmx": ["gmx.com", "gmx.de"],
+        "icloud": ["icloud.com"],
+        "inbox": ["inbox.com"],
+        "kolabnow": ["kolabnow.com"],
+        "mailcom": ["mail.com"],
+        "mailbox": ["mailbox.org"],
+        "migadu": ["migadu.com"],
+        "office365": ["office365.com"],
+        "outlook": ["outlook.com", "outlook.fr"],
+        "postale": ["postale.io"],
+        "yahoo": ["yahoo.com", "yahoo.fr"],
+        "yandex": ["yandex.com", "yandex.ru"],
+        "zoho": ["zoho.com"]
+    };
+
+    const emailParts = email.split("@");
+
+    if(emailParts.length !== 2) return "";
+
+    const provider = emailParts[1].toLowerCase();
+
+    for (const providerKey in emailProviderMap) {
+        if (emailProviderMap[providerKey].some(p => p.includes(provider))) {
+            return providerKey;
+        }
+    }
+
+    return "";
+}
+
+
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index a99c3244c7..5053efd886 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1492,61 +1492,3 @@ function authenticate_to_imap_server($user, $pass, $imap_server_id, $context) {
         }
     }
 }
-
-if (!hm_exists('test_function')) {
-    function connectToIMAP($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve = false, $errno = null, $errstr = null) {
-            if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
-                  $imap_list = array(
-                      'name' => $name,
-                      'server' => $address,
-                      'hide' => false,
-                      'port' => $port,
-                      'user' => $user,
-                      'pass' => $pass,
-                      'tls' => $tls);
-    
-                  if ($this->module_is_supported('sievefilters') && $this->user_config->get('enable_sieve_filter_setting', true) && $enableSieve) {
-                      $imap_list['sieve_config_host'] = $imap_sieve_host;
-    
-                       require_once VENDOR_PATH . 'autoload.php';
-                       try {
-                           list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
-                           $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
-                           $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
-                       } catch (Exception $e) {
-                           Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
-                           return;
-                       }
-                  }
-    
-    
-                  Hm_IMAP_List::add($imap_list);
-                  $servers = Hm_IMAP_List::dump(false, true);
-                  $ids = array_keys($servers);
-                  $this->imap_server_id = array_pop($ids);
-    
-                  if (in_server_list('Hm_IMAP_List', $this->imap_server_id, $user)) {
-                      Hm_Msgs::add('ERRThis server and username are already configured');
-                      return;
-                  }
-    
-                  Hm_IMAP_List::clean_up();
-                  $cache = Hm_IMAP_List::get_cache($this->cache, $this->imap_server_id);
-                  $imap = Hm_IMAP_List::connect($this->imap_server_id, $cache, $user, $pass, true);
-                  if (imap_authed($imap)) {
-                      $this->user_config->set('imap_servers', $servers);
-                      $this->just_saved_credentials = true;
-                      $this->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
-                      return true;
-                  }
-                  else {
-                      Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                      Hm_IMAP_List::forget_credentials($this->imap_server_id);
-                      return;
-                  }
-              }else {
-                  Hm_Msgs::add(sprintf('ERRCan not add connect to the IMAP server: %s', $errstr));
-                  return;
-             }
-        }
-}
diff --git a/modules/nux/modules.php b/modules/nux/modules.php
index 680840620d..d658c37b9d 100644
--- a/modules/nux/modules.php
+++ b/modules/nux/modules.php
@@ -245,119 +245,6 @@ public function process() {
     }
 }
 
-/**
- * @subpackage nux/handler
- */
-class Hm_Handler_quick_server_setup_nux extends Hm_Handler_Module {
-    public $smtp_server_id = null;
-    public $imap_server_id = null;
-    public $jmap_server_id = null;
-    public $just_saved_credentials = false;
-
-    public function process() {
-        list($success, $form) = $this->process_form(array(
-           'nux_config_profile_name',
-           'nux_config_email',
-           'nux_config_password',
-           'nux_config_provider',
-           'nux_config_is_sender',
-           'nux_config_is_receiver',
-           'nux_config_smtp_address',
-           'nux_config_smtp_port',
-           'nux_config_smtp_tls',
-           'nux_config_imap_address',
-           'nux_config_imap_port',
-           'nux_config_imap_tls',
-           'nux_enable_sieve',
-           'nux_create_profile',
-           'nux_profile_is_default',
-           'nux_profile_signature',
-           'nux_profile_reply_to',
-           'nux_imap_sieve_host',
-           'nux_config_only_jmap',
-           'nux_config_jmap_hide_from_c_page',
-           'nux_config_jmap_address',
-           ));
-
-        if ($success) {
-            // Destructure form array into variables
-            [
-                'nux_config_profile_name' => $profileName,
-                'nux_config_email' => $email,
-                'nux_config_password' => $password,
-                'nux_config_provider' => $provider,
-                'nux_config_is_sender' => $isSender,
-                'nux_config_is_receiver' => $isReceiver,
-                'nux_config_smtp_address' => $smtpAddress,
-                'nux_config_smtp_port' => $smtpPort,
-                'nux_config_smtp_tls' => $smtpTls,
-                'nux_config_imap_address' => $imapAddress,
-                'nux_config_imap_port' => $imapPort,
-                'nux_config_imap_tls' => $imapTls,
-                'nux_enable_sieve' => $enableSieve,
-                'nux_create_profile' => $createProfile,
-                'nux_profile_is_default' => $profileIsDefault,
-                'nux_profile_signature' => $profileSignature,
-                'nux_profile_reply_to' => $profileReplyTo,
-                'nux_imap_sieve_host' => $imapSieveHost,
-                'nux_config_only_jmap' => $onlyJmap,
-                'nux_config_jmap_hide_from_c_page' => $jmapHideFromCPage,
-                'nux_config_jmap_address' => $jmapAddress,
-            ] = $form;
-                
-            /*
-            * When JMAP selected only configure JMAP
-            */
-             if($form['nux_config_only_jmap']) {
-                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password);
-                $is_jmap_server_authenticated = authenticate_to_imap_server($email, $password, $this->jmap_server_id, $this);
-                
-                Hm_Msgs::add("JMAP Server saved");
-                $this->out('just_saved_credentials', $this->just_saved_credentials);
-                          
-             } else {
-                 /*
-                 *  Connect to SMTP server if user wants to send emails
-                 */
-                 if($isSender){
-                    $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this, $errno = null, $errstr = null);
-                    $is_smtp_server_authenticated = authenticate_to_smtp_server($email, $password, $this->smtp_server_id, $this);
-                    
-                    Hm_Msgs::add("is_smtp_server_authenticated => ".!$is_smtp_server_authenticated);
-                    Hm_Msgs::add("$this->smtp_server_id => ".!$this->smtp_server_id);
-                        
-                    if(!isset($this->smtp_server_id) || !$is_smtp_server_authenticated) return;
-                 }
-    
-                 /*
-                  *  Connect to IMAP server if user wants to receive emails
-                  */
-                 if($isReceiver){
-                      $this->imap_server_id = connect_to_imap_server($imapAddress, $profileName, $imapPort, $email, $password, $imapTls, $imapSieveHost, $enableSieve, $this, $errno = null, $errstr = null);
-                      $is_imap_server_authenticated = authenticate_to_imap_server($email, $password, $this->imap_server_id, $this);
-                      
-                      
-                      if(!isset($this->imap_server_id) || !$is_imap_server_authenticated) {
-                          if($isSender && isset($this->smtp_server_id)){
-                                delete_smtp_server($this->smtp_server_id, $this);
-                          }
-                          return;
-                      };
-                 }
-                 
-                 
-    
-                 if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
-                     add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $context);
-                 }
-    
-                 Hm_Msgs::add("Server saved");
-                 $this->out('just_saved_credentials', $this->just_saved_credentials);
-            }
-        }
-    }
-}
-
 /**
  * @subpackage nux/handler
  */
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 7edb3ad1fb..9eb5f6d4a2 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -26,17 +26,6 @@
 add_handler('ajax_get_nux_service_details', 'http_headers', true, 'core');
 add_output('ajax_get_nux_service_details', 'service_details', true);
 
-add_handler('ajax_quick_server_setup_nux', 'login', false, 'core');
-add_handler('ajax_quick_server_setup_nux', 'load_user_data', true, 'core');
-add_handler('ajax_quick_server_setup_nux', 'setup_nux', true);
-add_handler('ajax_quick_server_setup_nux', 'load_smtp_servers_from_config',  true, 'smtp');
-add_handler('ajax_quick_server_setup_nux', 'load_imap_servers_from_config',  true, 'imap');
-add_handler('ajax_quick_server_setup_nux', 'quick_server_setup_nux', true);
-add_handler('ajax_quick_server_setup_nux', 'save_user_data',  true, 'core');
-add_handler('ajax_quick_server_setup_nux', 'language',  true, 'core');
-add_handler('ajax_quick_server_setup_nux', 'date', true, 'core');
-add_handler('ajax_quick_server_setup_nux', 'http_headers', true, 'core');
-
 add_handler('ajax_nux_add_service', 'login', false, 'core');
 add_handler('ajax_nux_add_service', 'load_user_data', true, 'core');
 add_handler('ajax_nux_add_service', 'setup_nux', true);
@@ -65,8 +54,7 @@
     'allowed_pages' => array(
         'ajax_nux_service_select',
         'ajax_get_nux_service_details',
-        'ajax_nux_add_service',
-        'ajax_quick_server_setup_nux',
+        'ajax_nux_add_service'
     ),
     'allowed_get' => array(
         'code' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
@@ -87,28 +75,7 @@
         'nux_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'nux_pass' => FILTER_UNSAFE_RAW,
         'nux_account_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_all_inkl_login' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_profile_name'  => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_email' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_password' => FILTER_UNSAFE_RAW,
-        'nux_config_provider' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_is_sender' => FILTER_VALIDATE_BOOLEAN,
-        'nux_config_is_receiver' => FILTER_VALIDATE_BOOLEAN,
-        'nux_config_smtp_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_smtp_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_smtp_tls' => FILTER_VALIDATE_BOOLEAN,
-        'nux_config_imap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_imap_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_imap_tls' => FILTER_VALIDATE_BOOLEAN,
-        'nux_enable_sieve' => FILTER_VALIDATE_BOOLEAN,
-        'nux_create_profile' => FILTER_VALIDATE_BOOLEAN,
-        'nux_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
-        'nux_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_imap_sieve_host' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'nux_config_only_jmap' => FILTER_VALIDATE_BOOLEAN,
-        'nux_config_jmap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN,
-        'nux_config_jmap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'nux_all_inkl_login' => FILTER_SANITIZE_FULL_SPECIAL_CHARS
     )
 );
 
diff --git a/modules/nux/site.css b/modules/nux/site.css
index dd3afa0fe1..728ee9fde6 100644
--- a/modules/nux/site.css
+++ b/modules/nux/site.css
@@ -25,36 +25,3 @@
 .mobile .nux_dev_news, .mobile .nux_help, .mobile .nux_welcome { max-width: 90%; width: 90%; margin: 10px  auto; padding-left: 10px; padding-right: 5px; float: none; min-height: 200px; }
 .mobile .nux_dev_news { width: 90%; overflow: hidden; }
 .mobile .nux_welcome ul { padding-left: 10px; }
-
-.nux_stepper_btn {width: 120px;height: 32px;padding: 0px 10px 0px 10px;background: #EBEBEB;color: #232323;border-color: #232323; border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: center;}
-.step_config-title {display: flex;align-items: center;gap: 10px;}
-.step_config-title > span {font-size: small;}
-.step_config-title > h2 {color: #777}
-.stepper_input {width: 350px;height: 20px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
-
-.step_config-form_item {margin: 10px 0px;}
-.step_config-form_item.nested {margin-left: 20px !important;}
-.step_config-form_item-checkbox {}
-.step_config-form_item > label {color: #232323;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
-.step_config-form_item > textarea {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
-.step_config-form_item > select {height: 32px;}
-.step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
-.nux_stepper_btn:hover {cursor: pointer;}
-.stepper {display: flex;overflow: hidden;padding: 10px 30px 100px 30px;}
-.step_config {width: 100%;transition: transform 0.5s;display: none;}
-.current_config_step {display: block;}
-.step-container {display: flex;width: 400px;}
-
-.step_config-smtp_imap_bloc { padding: 15px; background: #EBEBEB; }
-
-.step_config-smtp_imap_port_bloc {display: flex; font-size: 10px;}
-
-.step_config-smtp_imap_port_bloc > input { width: 100px;}
-.step_config-smtp_bloc {margin-bottom: 10px;}
-.step_config-imap_bloc {margin-bottom: 10px;}
-.server_config_section { display: none; }
-.error-message {color: red; font-size: small;}
-.hide {display: none;}
-.server_type_tag {background-color: teal;border-radius: 5px;padding: 0px 5px;color: white;font-size: x-small;width: max-content;font-weight: 900;}
-input[type="submit"], button {cursor: pointer; min-width: 70px;}
-input[type="submit"]:hover, button:hover {background-color: rgba(139, 137, 137, 0.16);}
diff --git a/modules/nux/site.js b/modules/nux/site.js
index 04f37df127..db9e4a8cb3 100644
--- a/modules/nux/site.js
+++ b/modules/nux/site.js
@@ -1,319 +1,5 @@
 'use strict';
 
-
-function submitSmtpImapServer() {
-    $('#nux_config_form_loader').removeClass('hide');
-    $('.step_config-actions').addClass('hide');
-
-    var requestData = [
-        { name: 'hm_ajax_hook', value: 'ajax_quick_server_setup_nux' },
-        { name: 'nux_config_profile_name', value: $('#nux_config_profile_name').val() },
-        { name: 'nux_config_email', value: $('#nux_config_email').val() },
-        { name: 'nux_config_password', value: $('#nux_config_password').val() },
-        { name: 'nux_config_provider', value: $('#nux_config_provider').val() },
-        { name: 'nux_config_is_sender', value: $('#nux_config_is_sender').prop('checked') },
-        { name: 'nux_config_is_receiver', value: $('#nux_config_is_receiver').prop('checked') },
-        { name: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val() },
-        { name: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val() },
-        { name: 'nux_config_smtp_tls', value: $('input[name="nux_config_smtp_tls"]:checked').val() },
-        { name: 'nux_config_imap_address', value: $('#nux_config_imap_address').val() },
-        { name: 'nux_config_imap_port', value: $('#nux_config_imap_port').val() },
-        { name: 'nux_config_imap_tls', value: $('input[name="nux_config_imap_tls"]:checked').val() },
-        { name: 'nux_enable_sieve', value: $('#nux_enable_sieve').prop('checked') },
-        { name: 'nux_create_profile', value: $('#nux_create_profile').prop('checked') },
-        { name: 'nux_profile_is_default', value: $('#nux_profile_is_default').prop('checked') },
-        { name: 'nux_profile_signature', value: $('#nux_profile_signature').val() },
-        { name: 'nux_profile_reply_to', value: $('#nux_profile_reply_to').val() },
-        { name: 'nux_imap_sieve_host', value: $('#nux_imap_sieve_host').val() },
-        { name: 'nux_config_only_jmap', value: $('input[name="nux_config_only_jmap"]:checked').val() },
-        { name: 'nux_config_jmap_hide_from_c_page', value: $('input[name="nux_config_jmap_hide_from_c_page"]:checked').val() },
-        { name: 'nux_config_jmap_address', value: $('#nux_config_jmap_address').val() },
-    ];
-
-    Hm_Ajax.request(requestData, function(res) {
-        $('#nux_config_form_loader').addClass('hide');
-        $('.step_config-actions').removeClass('hide');
-
-        if (res.just_saved_credentials) {
-            $('#nux_config_stepper').find('form').trigger('reset');
-            display_config_step(0);
-
-            //Initialize the form
-            $("#nux_profile_reply_to").val('');
-            $("#nux_profile_signature").val('');
-            $("#nux_config_profile_name").val('');
-            $("#nux_config_email").val('');
-            $("#nux_config_password").val('');
-            $("#nux_profile_is_default").prop('checked', true);
-            $("#nux_config_is_sender").prop('checked', true);
-            $("#nux_config_is_receiver").prop('checked', true);
-            $("#nux_enable_sieve").prop('checked', false);
-            $("#nux_config_only_jmap").prop('checked', false);
-            $('#step_config-imap_bloc').show();
-            $('#step_config-smtp_bloc').show();
-            $('#nux_profile_bloc').show();
-
-            Hm_Utils.set_unsaved_changes(1);
-            Hm_Folders.reload_folders(true);
-            location.reload();
-        }
-    });
-}
-
-function handleCreateProfileCheckboxChange(checkbox) {
-    if(checkbox.checked) {
-        $('#nux_profile_bloc').show();
-    }else{
-        $('#nux_profile_bloc').hide();
-    }
-}
-
-function handleSieveStatusChange (checkbox) {
-    if(checkbox.checked) {
-        $('#nux_imap_sieve_host_bloc').show();
-    }else{
-        $('#nux_imap_sieve_host_bloc').hide();
-    }
-}
-function handleSmtpImapCheckboxChange(checkbox) {
-    $(".step_config-smtp_imap_bloc").show();
-    
-    if (checkbox.id === 'nux_config_is_receiver') {
-        if(checkbox.checked) $('#step_config-imap_bloc').show();
-        else $('#step_config-imap_bloc').hide();
-    }
-
-    if (checkbox.id === 'nux_config_is_sender') {
-        if(checkbox.checked) $('#step_config-smtp_bloc').show();
-        else $('#step_config-smtp_bloc').hide();
-    }
-
-    if($('#nux_config_is_sender').prop('checked') &&
-        $('#nux_config_is_receiver').prop('checked')){
-        $('#nux_profile_bloc').show();
-        $('#nux_profile_checkbox_bloc').show();
-        $('#nux_config_jmap_select_box').show();
-        $("#nux_config_only_jmap").show();
-    }else{
-        $("#nux_config_only_jmap").prop('checked', false);
-        
-        $('#nux_profile_bloc').hide();
-        $('#nux_profile_checkbox_bloc').hide();
-        $('#nux_config_jmap_select_box').hide();
-        $("#nux_config_only_jmap").hide();
-
-        if(!$('#nux_config_is_sender').prop('checked') &&
-            !$('#nux_config_is_receiver').prop('checked')){
-            $(".step_config-smtp_imap_bloc").hide();
-        }
-    }
-}
-
-function handleJmapCheckboxChange(checkbox) {
-    if(checkbox.checked){
-        $('#step_config-jmap_bloc').show();
-        $('#step_config-smtp_bloc').hide();
-        $('#step_config-imap_bloc').hide();
-        $('#nux_profile_bloc').hide();
-        $('#nux_profile_checkbox_bloc').hide();
-    }else {
-        $('#step_config-jmap_bloc').hide();
-        $('#step_config-smtp_bloc').show();
-        $('#step_config-imap_bloc').show();
-        $('#nux_profile_bloc').show();
-        $('#nux_profile_checkbox_bloc').show();
-    }
-}
-
-function handleProviderChange(select) {
-    let providerKey = select.value;
-    if(providerKey) {
-        Hm_Ajax.request(
-            [
-                {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
-                {'name': 'nux_service', 'value': providerKey},],
-            function(res) {
-                if(res.service_details){
-                    let serverConfig = JSON.parse(res.service_details)
-
-                    $("#nux_config_smtp_address").val(serverConfig.smtp.server);
-                    $("#nux_config_smtp_port").val(serverConfig.smtp.port);
-
-                    if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_tls'][value='true']").prop("checked", true);
-                    else $("input[name='nux_config_smtp_tls'][value='false']").prop("checked", true);
-
-                    $("#nux_config_imap_address").val(serverConfig.server);
-                    $("#nux_config_imap_port").val(serverConfig.port);
-
-                    if(serverConfig.tls)$("input[name='nux_config_imap_tls'][value='true']").prop("checked", true);
-                    else $("input[name='nux_config_imap_tls'][value='false']").prop("checked", true);
-                }
-            },
-            [],
-            false
-        );
-    }else{
-        $("#nux_config_smtp_address").val('');
-        $("#nux_config_smtp_port").val(465);
-        $("#nux_config_imap_address").val('');
-        $("#nux_config_imap_port").val(993);
-    }
-}
-function display_config_step(stepNumber) {
-    if(stepNumber == 2) {
-
-        var isValid = true;
-
-        [   {key: 'nux_config_profile_name', value: $('#nux_config_profile_name').val()},
-            {key: 'nux_config_email', value: $('#nux_config_email').val()},
-            {key: 'nux_config_password', value: $('#nux_config_password').val()}].forEach((item) => {
-                if(!item.value) {
-                    $(`#${item.key}-error`).text('Required');
-                    isValid = false;
-                }
-                else $(`#${item.key}-error`).text('');
-        })
-
-        if (!isValid) {
-            return
-        }
-
-        let providerKey = getEmailProviderKey($('#nux_config_email').val());
-        if(providerKey) {
-            $("#nux_config_provider").val(providerKey);
-
-            Hm_Ajax.request(
-                [
-                    {'name': 'hm_ajax_hook', 'value': 'ajax_get_nux_service_details'},
-                    {'name': 'nux_service', 'value': providerKey},],
-                function(res) {
-                    if(res.service_details){
-                        let serverConfig = JSON.parse(res.service_details)
-
-                        $("#nux_config_smtp_address").val(serverConfig.smtp.server);
-                        $("#nux_config_smtp_port").val(serverConfig.smtp.port);
-
-                        if(serverConfig.smtp.tls)$("input[name='nux_config_smtp_tls'][value='true']").prop("checked", true);
-                        else $("input[name='nux_config_smtp_tls'][value='false']").prop("checked", true);
-
-                        $("#nux_config_imap_address").val(serverConfig.server);
-                        $("#nux_config_imap_port").val(serverConfig.port);
-
-                        if(serverConfig.tls)$("input[name='nux_config_imap_tls'][value='true']").prop("checked", true);
-                        else $("input[name='nux_config_imap_tls'][value='false']").prop("checked", true);
-                    }
-                },
-                [],
-                false
-            );
-        }
-    }
-
-    if(stepNumber == 3) {
-        var requiredFields = [];
-        var isValid = true;
-
-        if(!$('#nux_config_is_sender').is(':checked') && !$('#nux_config_is_receiver').is(':checked')){
-            $('#nux_config_serve_type-error').text('Required');
-            return;
-        }
-        
-        if($('#nux_config_is_sender').is(':checked') && 
-            $('#nux_config_is_receiver').is(':checked') && 
-            $('#nux_config_only_jmap').is(':checked')){
-            requiredFields.push(
-                {key: 'nux_config_jmap_address', value: $('#nux_config_jmap_address').val()},
-            )
-        }else {
-            if($('#nux_config_is_sender').is(':checked')){
-                requiredFields.push(
-                    {key: 'nux_config_smtp_address', value: $('#nux_config_smtp_address').val()},
-                    {key: 'nux_config_smtp_port', value: $('#nux_config_smtp_port').val()},
-                )
-            }
-
-            if($('#nux_config_is_receiver').is(':checked')) {
-                requiredFields.push(
-                    {key: 'nux_config_imap_address', value: $('#nux_config_imap_address').val()},
-                    {key: 'nux_config_imap_port', value: $('#nux_config_imap_port').val()},
-                )
-            }
-        }
-
-        if($('#nux_enable_sieve').is(':checked')) {
-            requiredFields.push(
-                {key: 'nux_imap_sieve_host', value: $('#nux_imap_sieve_host').val()},
-            )
-        }
-
-        requiredFields.forEach((item) => {
-            if(!item.value) {
-                $(`#${item.key}-error`).text('Required');
-                isValid = false;
-            }
-            else $(`#${item.key}-error`).text('');
-        })
-
-
-
-        if(!isValid) return
-
-        submitSmtpImapServer();
-        return
-    }
-    // Hide all step elements
-    var steps = document.querySelectorAll('.step_config');
-    for (var i = 0; i < steps.length; i++) {
-        steps[i].style.display = 'none';
-    }
-
-    // Show the selected step
-    var selectedStep = document.getElementById('step_config_' + stepNumber);
-
-    if (selectedStep) {
-        selectedStep.style.display = 'block';
-        if(stepNumber == 0) $('.nux_stepper_btn').show();
-    }
-}
-
-function getEmailProviderKey(email) {
-    const emailProviderMap = {
-        "all-inkl": ["all-inkl.de", "all-inkl.com"],
-        "aol": ["aol.com"],
-        "fastmail": ["fastmail.com"],
-        "gandi": ["gandi.net"],
-        "gmail": ["gmail.com"],
-        "gmx": ["gmx.com", "gmx.de"],
-        "icloud": ["icloud.com"],
-        "inbox": ["inbox.com"],
-        "kolabnow": ["kolabnow.com"],
-        "mailcom": ["mail.com"],
-        "mailbox": ["mailbox.org"],
-        "migadu": ["migadu.com"],
-        "office365": ["office365.com"],
-        "outlook": ["outlook.com", "outlook.fr"],
-        "postale": ["postale.io"],
-        "yahoo": ["yahoo.com", "yahoo.fr"],
-        "yandex": ["yandex.com", "yandex.ru"],
-        "zoho": ["zoho.com"]
-    };
-
-    const emailParts = email.split("@");
-
-    if(emailParts.length !== 2) return "";
-
-    const provider = emailParts[1].toLowerCase();
-
-    for (const providerKey in emailProviderMap) {
-        if (emailProviderMap[providerKey].some(p => p.includes(provider))) {
-            return providerKey;
-        }
-    }
-
-    return "";
-}
-
-
 var display_next_nux_step = function(res) {
     $('.nux_step_two').html(res.nux_service_step_two);
     $('.nux_step_one').hide();

From f3fe7eef77068ce4ae906405c450f65474448336 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 23 Jan 2024 17:11:10 +0100
Subject: [PATCH 24/55] Ref: split output in to modules

---
 modules/core/output_modules.php | 211 +++++++++++++++-----------------
 modules/core/setup.php          |   3 +-
 modules/imap/output_modules.php |  71 +++++++++++
 modules/imap/setup.php          |   2 +
 modules/smtp/modules.php        |  29 +++++
 modules/smtp/setup.php          |   3 +-
 6 files changed, 204 insertions(+), 115 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index ebe9a2a88e..6b8af0ed21 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2005,15 +2005,54 @@ protected function output() {
 
 class Hm_Output_server_config_stepper extends Hm_Output_Module {
     protected function output() {
-    $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
-    $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
-    $smtp_servers_count = count($this->get('smtp_servers', array()));
-
+    $accordionTitle = '';
+    $configuredText = $this->trans('Configured') .' ';
+    $hasEssentialModuleActivated = false;
+    
+    $hasImapActivated = in_array('imap', $this->get('router_module_list'), true);
+    $hasSmtpActivated = in_array('smtp', $this->get('router_module_list'), true);
+    $hasJmapActivated = in_array('jmap', $this->get('router_module_list'), true);
+    
+    if($hasImapActivated){
+        $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
+        $accordionTitle .= 'IMAP';
+        $configuredText .= $imap_servers_count .' IMAP';
+        $hasEssentialModuleActivated = true;
+    }
+    
+    if($hasJmapActivated){
+        $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
+        if($accordionTitle != ''){
+            $accordionTitle .= ' - ';
+            $configuredText .= ' / ';
+        }
+        $accordionTitle .= 'JMAP';
+        $configuredText .= $jmap_servers_count .' JMAP';
+        $hasEssentialModuleActivated = true;
+    }
+    
+    if($hasSmtpActivated){        
+        $smtp_servers_count = count($this->get('smtp_servers', array()));
+        if($accordionTitle != ''){
+            $accordionTitle .= ' - ';
+            $configuredText .= ' / ';
+        }
+        $accordionTitle .= 'SMTP';
+        $configuredText .= $smtp_servers_count .' SMTP';
+        $hasEssentialModuleActivated = true;
+    }
+    
+    $accordionTitle .= ' Servers';
+    
+    // When essential module is not activated, we don't display the accordion
+    if(!$hasEssentialModuleActivated) return '';
+    
+    
     $res = '<div class="smtp_imap_server_setup">
-         <div data-target=".server_config_section" class="server_section">'.
-                '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $this->trans('IMAP - SMTP - JMAP Servers').'
-                 <div class="server_count">'. $this->trans('Configured') .' '. $imap_servers_count .' IMAP / '. $smtp_servers_count .' SMTP/ '. $jmap_servers_count .' JMAP</div>
-         </div>
+              <div data-target=".server_config_section" class="server_section">'.
+                     '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $accordionTitle.'
+                      <div class="server_count">'. $configuredText .' </div>
+              </div>
          <div class="server_config_section">
             <div class="stepper" id="srv_setup_stepper_stepper">
                 <div class="step-container">
@@ -2060,111 +2099,58 @@ protected function output() {
                                     <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
                                     <br />
                                     <select id="srv_setup_stepper_provider" class="stepper_input" name="srv_setup_stepper_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked />
-                                    <label for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked />
-                                    <label for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
-                               </div>
-                               <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
-
-                               <div class="step_config-smtp_imap_bloc">
-                                    <div class="step_config-form_item" id="srv_setup_stepper_jmap_select_box">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="srv_setup_stepper_only_jmap" id="srv_setup_stepper_only_jmap"/>
-                                        <label for="srv_setup_stepper_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
-                                    </div>
-                                    <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
-                                      <label><strong>JMAP</strong></label>
-                                      <div class="step_config-form_item">
-                                          <label for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
-                                          <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_jmap_address" placeholder="'.$this->trans('Address').'" />
-                                          <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
-                                      </div>
-                                      <div class="step_config-form_item">
-                                        <input type="checkbox"  class="step_config-form_item-checkbox" name="srv_setup_stepper_jmap_hide_from_c_page" />
-                                        <label for="srv_setup_stepper_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
-                                      </div>
-                                    </div>
-                                    <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
-                                       <label><strong>SMTP</strong></label>
-                                       <div class="step_config-form_item">
-                                           <label for="srv_setup_stepper_smtp_address">'.$this->trans('Address').'</label>
-                                           <br />
-                                           <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_smtp_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="srv_setup_stepper_smtp_address-error" class="error-message"></span>
-                                       </div>
-                                       <div class="step_config-smtp_imap_port_bloc">
-                                           <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_smtp_port"/>
-                                           <div>
-                                               <input type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls" value="true">
-                                               <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
-                                               <input type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" value="false">
-                                               <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
-                                           </div>
-                                           <span id="srv_setup_stepper_smtp_port-error" class="error-message"></span>
-                                       </div>
-                                   </div>
-                                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
-                                      <label><strong>IMAP</strong></label>
-                                      <div class="step_config-form_item">
-                                          <label for="srv_setup_stepper_imap_address">'.$this->trans('Address').'</label>
-                                          <br />
-                                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_imap_address" placeholder="'.$this->trans('Address').'" />
-                                           <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
-                                      </div>
-                                      <div class="step_config-smtp_imap_port_bloc">
-                                         <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_imap_port"/>
-                                         <div>
-                                             <input type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls" value="true">
-                                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
-                                             <input type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" value="false">
-                                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
-                                         </div>
-                                         <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
-                                      </div>
-
-                                   ';
-
-         if ($this->get('sieve_filters_enabled')) {
-             $default_value = '';
-                 $res .=  '
-                            <div class="step_config-form_item">
-                                <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_enable_sieve" onchange="handleSieveStatusChange(this)"/>
-                                <label for="srv_setup_stepper_enable_sieve">'.$this->trans('Enable Sieve').'</label>
-                            </div>
-                           <div class="step_config-form_item nested hide" id="srv_setup_stepper_imap_sieve_host_bloc">
-                               <label class="screen_reader" for="srv_setup_stepper_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                               <input id="srv_setup_stepper_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
-                                <span id="srv_setup_stepper_imap_sieve_host-error" class="error-message"></span>
-                           </div>';
-         }
-
-         $res .= '      </div>
+                               </div>';
+                               
+   if($hasSmtpActivated && $hasImapActivated) {
+        $res .= '
+             <div class="step_config-form_item">
+                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked />
+                    <label for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
+               </div>
+               <div class="step_config-form_item">
+                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked />
+                    <label for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
+               </div>
+               <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
+        ';
+   }
+                               
+   $res .= '<div class="step_config-smtp_imap_bloc">';
+
+         return $res;
+
+    }
+}
+
+class Hm_Output_server_config_stepper_end_part extends Hm_Output_Module {
+    protected function output() {
+        $res = '</div></div>';
+        
+        if(in_array('profiles', $this->get('router_module_list'), true)) {
+            $res .= '
+                 <div class="step_config-form_item" id="srv_setup_stepper_profile_checkbox_bloc">
+                      <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked />
+                      <label for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
+                 </div>
+                 <div class="nested" id="srv_setup_stepper_profile_bloc">
+                     <div class="step_config-form_item nested">
+                         <label for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
+                         <br />
+                          <input type="email"  class="stepper_input"  style="height: 20px;" id="srv_setup_stepper_profile_reply_to" />
                     </div>
-                             <div class="step_config-form_item" id="srv_setup_stepper_profile_checkbox_bloc">
-                                  <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked />
-                                  <label for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
-                             </div>
-                             <div class="nested" id="srv_setup_stepper_profile_bloc">
-                                 <div class="step_config-form_item nested">
-                                     <label for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
-                                     <br />
-                                      <input type="email"  class="stepper_input"  style="height: 20px;" id="srv_setup_stepper_profile_reply_to" />
-                                </div>
-                                 <div class="step_config-form_item nested">
-                                     <label for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
-                                     <textarea id="srv_setup_stepper_profile_signature" name="srv_setup_stepper_profile_signature" checked ></textarea>
-                                 </div>
-                                 <div class="step_config-form_item nested">
-                                     <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_profile_is_default" checked />
-                                     <label for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
-                                 </div>
-                             </div>
-                          </form>
+                     <div class="step_config-form_item nested">
+                         <label for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
+                         <textarea id="srv_setup_stepper_profile_signature" name="srv_setup_stepper_profile_signature" checked ></textarea>
+                     </div>
+                     <div class="step_config-form_item nested">
+                         <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_profile_is_default" checked />
+                         <label for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
+                     </div>
+                 </div>
+            ';
+        }
+        
+        $res .= '</form>
                       </div>
                       <div class="srv_setup_stepper_form_loader hide" id="srv_setup_stepper_form_loader">
                           <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
@@ -2182,6 +2168,5 @@ protected function output() {
          </div>';
 
          return $res;
-
     }
 }
diff --git a/modules/core/setup.php b/modules/core/setup.php
index a205d5dc9f..87b986c2ea 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -15,13 +15,14 @@
 setup_base_page('home');
 add_handler('home', 'check_missing_passwords', true, 'core', 'load_user_data', 'after');
 add_output('home', 'home_heading', true, 'core', 'content_section_start', 'after');
-add_output('servers', 'server_config_stepper', true, 'core', 'server_content_start', 'after');
 add_output('home', 'home_password_dialogs', true, 'core', 'home_heading', 'after');
 
 /* servers page */
 setup_base_page('servers');
 add_handler('servers', 'reload_folder_cookie', true, 'core', 'save_user_data', 'after');
 add_output('servers', 'server_content_start', true, 'core', 'content_section_start', 'after');
+add_output('servers', 'server_config_stepper', true, 'core', 'server_content_start', 'after');
+add_output('servers', 'server_config_stepper_end_part', true, 'core', 'stepper_setup_server_smtp', 'after');
 add_output('servers', 'server_content_end', true, 'core', 'content_section_end', 'before');
 
 /* compose */
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index fd273facbf..fd461186f3 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1200,3 +1200,74 @@ protected function output() {
         $this->concat('msg_controls_extra', $res);
     }
 }
+
+/**
+ * @subpackage jmap/output
+ */
+class Hm_Output_stepper_setup_server_jmap extends Hm_Output_Module {
+    protected function output() {
+        if(!in_array('jmap', $this->get('router_module_list'), true)) return '';
+        return '
+            <div class="step_config-form_item" id="srv_setup_stepper_jmap_select_box">
+                <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="srv_setup_stepper_only_jmap" id="srv_setup_stepper_only_jmap"/>
+                <label for="srv_setup_stepper_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
+            </div>
+            <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
+              <label><strong>JMAP</strong></label>
+              <div class="step_config-form_item">
+                  <label for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
+                  <br />
+                  <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_jmap_address" placeholder="'.$this->trans('Address').'" />
+                  <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
+              </div>
+              <div class="step_config-form_item">
+                <input type="checkbox"  class="step_config-form_item-checkbox" name="srv_setup_stepper_jmap_hide_from_c_page" />
+                <label for="srv_setup_stepper_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
+              </div>
+            </div>
+        ';
+    }
+}
+
+/**
+ * @subpackage imap/output
+ */
+class Hm_Output_stepper_setup_server_imap extends Hm_Output_Module {
+    protected function output() {
+       $res .= '
+                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
+                      <label><strong>IMAP</strong></label>
+                      <div class="step_config-form_item">
+                          <label for="srv_setup_stepper_imap_address">'.$this->trans('Address').'</label>
+                          <br />
+                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_imap_address" placeholder="'.$this->trans('Address').'" />
+                           <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
+                      </div>
+                      <div class="step_config-smtp_imap_port_bloc">
+                         <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_imap_port"/>
+                         <div>
+                             <input type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls" value="true">
+                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
+                             <input type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" value="false">
+                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
+                         </div>
+                         <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
+                      </div>
+                   ';
+            
+                     if ($this->get('sieve_filters_enabled')) {
+                         $default_value = '';
+                             $res .=  '
+                                        <div class="step_config-form_item">
+                                            <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_enable_sieve" onchange="handleSieveStatusChange(this)"/>
+                                            <label for="srv_setup_stepper_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                                        </div>
+                                       <div class="step_config-form_item nested hide" id="srv_setup_stepper_imap_sieve_host_bloc">
+                                           <label class="screen_reader" for="srv_setup_stepper_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
+                                           <input id="srv_setup_stepper_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
+                                            <span id="srv_setup_stepper_imap_sieve_host-error" class="error-message"></span>
+                                       </div>';
+                     }
+       return $res;
+    }
+}
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index c2ab56e88e..d2440796aa 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -23,6 +23,8 @@
 add_handler('servers', 'save_imap_servers',  true, 'imap', 'process_add_jmap_server', 'after');
 add_output('servers', 'display_configured_imap_servers', true, 'imap', 'display_configured_smtp_servers', 'after');
 add_output('servers', 'imap_server_ids', true, 'imap', 'page_js', 'before');
+add_output('servers', 'stepper_setup_server_jmap', true, 'imap', 'server_config_stepper', 'after');
+add_output('servers', 'stepper_setup_server_imap', true, 'imap', 'stepper_setup_server_smtp', 'before');
 
 /* settings page data */
 add_handler('settings', 'process_sent_since_setting', true, 'imap', 'date', 'after');
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 0e04d6ae6a..67b4244d60 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1343,6 +1343,35 @@ protected function output() {
     }
 }
 
+/**
+ * @subpackage
+ */
+class Hm_Output_stepper_setup_server_smtp extends Hm_Output_Module {
+    protected function output() {
+        return '
+            <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+               <label><strong>SMTP</strong></label>
+               <div class="step_config-form_item">
+                   <label for="srv_setup_stepper_smtp_address">'.$this->trans('Address').'</label>
+                   <br />
+                   <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_smtp_address" placeholder="'.$this->trans('Address').'" />
+                   <span id="srv_setup_stepper_smtp_address-error" class="error-message"></span>
+               </div>
+               <div class="step_config-smtp_imap_port_bloc">
+                   <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_smtp_port"/>
+                   <div>
+                       <input type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls" value="true">
+                       <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
+                       <input type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" value="false">
+                       <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
+                   </div>
+                   <span id="srv_setup_stepper_smtp_port-error" class="error-message"></span>
+               </div>
+           </div>
+        ';
+    }
+}
+
 /**
  * @subpackage smtp/functions
  */
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index f4d2591dec..8d42f2e755 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -30,7 +30,8 @@
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
 add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
-add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper', 'after');
+add_output('servers', 'stepper_setup_server_smtp', true, 'smtp', 'stepper_setup_server_jmap', 'after');
+add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper_end_part', 'after');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');
 add_handler('settings', 'process_auto_bcc', true, 'smtp', 'save_user_settings', 'before');

From cd1645219eea655c171c4c0f568bb4229d2e3cee Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 23 Jan 2024 17:38:48 +0100
Subject: [PATCH 25/55] Ref: core module check for active module

---
 modules/core/handler_modules.php | 20 ++++++++++++++++++++
 modules/imap/output_modules.php  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index e7adcc9590..1fe326d2c8 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -1027,6 +1027,11 @@ public function process() {
             * When JMAP selected only configure JMAP
             */
              if(isset($onlyJmap) && $onlyJmap) {
+                if (!$this->module_is_supported('jmap')) {
+                    Hm_Msgs::add("ERRJMAP module is not enabled");
+                    return;
+                }
+                
                 $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password);
                 $is_jmap_server_authenticated = authenticate_to_imap_server($email, $password, $this->jmap_server_id, $this);
                 
@@ -1038,6 +1043,11 @@ public function process() {
                  *  Connect to SMTP server if user wants to send emails
                  */
                  if($isSender){
+                    if (!$this->module_is_supported('smtp')) {
+                        Hm_Msgs::add("ERRSMTP module is not enabled");
+                        return;
+                    }
+                    
                     $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this, $errno = null, $errstr = null);
                     $is_smtp_server_authenticated = authenticate_to_smtp_server($email, $password, $this->smtp_server_id, $this);
                     
@@ -1048,6 +1058,11 @@ public function process() {
                   *  Connect to IMAP server if user wants to receive emails
                   */
                  if($isReceiver){
+                     if (!$this->module_is_supported('imap')) {
+                        Hm_Msgs::add("ERRIMAP module is not enabled");
+                        return;
+                     }
+                    
                       $this->imap_server_id = connect_to_imap_server($imapAddress, $profileName, $imapPort, $email, $password, $imapTls, $imapSieveHost, $enableSieve, $this, $errno = null, $errstr = null);
                       $is_imap_server_authenticated = authenticate_to_imap_server($email, $password, $this->imap_server_id, $this);
                       
@@ -1061,6 +1076,11 @@ public function process() {
                  }
     
                  if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                      if (!$this->module_is_supported('profiles')) {
+                         Hm_Msgs::add("ERRProfiles module is not enabled");
+                         return;
+                      }
+                                          
                      add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $this);
                  }
     
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index fd461186f3..28a9e3624c 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1234,7 +1234,7 @@ protected function output() {
  */
 class Hm_Output_stepper_setup_server_imap extends Hm_Output_Module {
     protected function output() {
-       $res .= '
+       $res = '
                    <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
                       <label><strong>IMAP</strong></label>
                       <div class="step_config-form_item">

From b02ec156ff0cd3247dbab14767386a154985b3e6 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 23 Jan 2024 17:42:56 +0100
Subject: [PATCH 26/55] Fix: bug on contact page

---
 modules/ldap_contacts/modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ldap_contacts/modules.php b/modules/ldap_contacts/modules.php
index 7ca14aa7b1..0eebd8c18e 100644
--- a/modules/ldap_contacts/modules.php
+++ b/modules/ldap_contacts/modules.php
@@ -317,7 +317,7 @@ class Hm_Handler_load_ldap_settings extends Hm_Handler_Module {
     public function process() {
         $connections = array();
         foreach (ldap_config($this->config) as $name => $vals) {
-            if (array_key_exists('auth', $vals) && $vals['auth']) {
+            if (is_array($vals) && array_key_exists('auth', $vals) && $vals['auth']) {
                 if ((!array_key_exists('user', $vals) || !$vals['user']) &&
                     (!array_key_exists('pass', $vals) || !$vals['pass'])) {
                     $connections[$name] = $vals;

From fb11ab15c467ffb956934212181db59aae52df2f Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Fri, 16 Feb 2024 13:51:26 +0100
Subject: [PATCH 27/55] Ref: use bootstrap 5 classes

---
 config/app.php                  |   2 +-
 modules/core/output_modules.php | 121 ++++++++++++++++----------------
 modules/imap/output_modules.php |  60 ++++++++++------
 modules/smtp/modules.php        |  43 ++++++++----
 4 files changed, 127 insertions(+), 99 deletions(-)

diff --git a/config/app.php b/config/app.php
index 7eda3d5978..f9f407c142 100644
--- a/config/app.php
+++ b/config/app.php
@@ -678,7 +678,7 @@
     | Handles page layout, login/logout, and the default settings pages. This set
     | is required.
     */
-    'modules' => explode(',', env('CYPHT_MODULES','core,contacts,local_contacts,feeds,imap,smtp,account,idle_timer,calendar,themes,nux,developer,history,saved_searches,advanced_search,highlights,profiles,inline_message,imap_folders,keyboard_shortcuts')),
+    'modules' => explode(',', env('CYPHT_MODULES','core,contacts,local_contacts,feeds,imap,smtp,jmap,account,idle_timer,calendar,themes,nux,developer,history,saved_searches,advanced_search,highlights,profiles,inline_message,imap_folders,keyboard_shortcuts')),
     // 'modules' => [
     //     /*
     //     |  ----
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index c1503767f0..002ed6952e 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2120,9 +2120,12 @@ protected function output() {
     
     
     $res = '<div class="smtp_imap_server_setup">
-              <div data-target=".server_config_section" class="server_section">'.
-                     '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'. $accordionTitle.'
-                      <div class="server_count">'. $configuredText .' </div>
+              <div data-target=".server_config_section" class="server_section border-bottom cursor-pointer px-1 py-3 pe-auto">
+                  <a href="#" class="pe-auto">
+                      <i class="bi bi-envelope-fill me-3"></i>
+                      <b> '.$accordionTitle.'</b>
+                  </a> 
+                  <div class="server_count">'.$configuredText.'</div>
               </div>
          <div class="server_config_section">
             <div class="stepper" id="srv_setup_stepper_stepper">
@@ -2133,30 +2136,28 @@ protected function output() {
                             <span>('.$this->trans('Authentication').')</span>
                         </div>
                         <div>
-                            <form>
-                               <div class="step_config-form_item">
-                                    <label for="srv_setup_stepper_profile_name">'.$this->trans('Name').'</label>
-                                    <br />
-                                    <input type="text" class="stepper_input" id="srv_setup_stepper_profile_name" placeholder="'.$this->trans('Name').'" />
-                                    <span id="srv_setup_stepper_profile_name-error" class="error-message"></span>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <label for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
-                                    <br />
-                                    <input type="text"  class="stepper_input" id="srv_setup_stepper_email" placeholder="email" />
-                                    <span id="srv_setup_stepper_email-error" class="error-message"></span>
-                               </div>
-                               <div class="step_config-form_item">
-                                    <label for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
-                                    <br />
-                                    <input type="password"  class="stepper_input" id="srv_setup_stepper_password" placeholder="'.$this->trans('Password').'" />
-                                    <span id="srv_setup_stepper_password-error" class="error-message"></span>
-                               </div>
+                            <form class=" me-0" method="POST">
+                                    <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
+                                    <div class="form-floating mb-3">
+                                        <input required type="text" id="srv_setup_stepper_profile_name" name="srv_setup_stepper_profile_name" class="txt_fld form-control" value="" placeholder="'.$this->trans('Name').'">
+                                        <label class="" for="srv_setup_stepper_profile_name">'.$this->trans('Name').'</label>
+                                        <span id="srv_setup_stepper_profile_name-error" class="error-message"></span>
+                                    </div>
+                                    <div class="form-floating mb-3">
+                                        <input required type="text" id="srv_setup_stepper_email" name="srv_setup_stepper_email" class="txt_fld form-control" value="" placeholder="'.$this->trans('Email or Username').'">
+                                        <label class="" for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
+                                        <span id="srv_setup_stepper_email-error" class="error-message"></span>
+                                    </div>
+                                    <div class="form-floating mb-3">
+                                        <input required type="password" id="srv_setup_stepper_password" name="srv_setup_stepper_password" class="txt_fld form-control" value="" placeholder="'.$this->trans('Password').'">
+                                        <label class="" for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
+                                        <span id="srv_setup_stepper_password-error" class="error-message"></span>
+                                    </div>
                             </form>
                         </div>
                         <div class="step_config-actions">
-                            <button class="srv_setup_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                            <button class="srv_setup_stepper_btn" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
+                            <button class="btn btn-success px-5" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                            <button class="btn btn-success px-5" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
                         </div>
                     </div>
                     <div id="step_config_2" class="step step_config">
@@ -2166,31 +2167,32 @@ protected function output() {
                         </div>
                         <div>
                             <form>
-                               <div class="step_config-form_item">
-                                    <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
-                                    <br />
-                                    <select id="srv_setup_stepper_provider" class="stepper_input" name="srv_setup_stepper_provider" onchange="handleProviderChange(this)"><option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'</select>
-                               </div>';
+                                <div class="form-floating mb-3">
+                                  <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) aria-label="'.$this->trans('Provider').'">
+                                    <option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'
+                                  </select>
+                                  <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
+                                </div>';
                                
    if($hasSmtpActivated && $hasImapActivated) {
         $res .= '
-             <div class="step_config-form_item">
-                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked />
-                    <label for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
-               </div>
-               <div class="step_config-form_item">
-                    <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked />
-                    <label for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
-               </div>
-               <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
+             <div class="form-check form-switch">
+               <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked>
+               <label class="form-check-label" for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
+             </div>
+             <div class="form-check form-switch">
+               <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked>
+               <label class="form-check-label" for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
+             </div>
+              <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
         ';
    }
                                
    $res .= '<div class="step_config-smtp_imap_bloc">';
 
-         return $res;
+   return $res;
 
-    }
+   }
 }
 
 class Hm_Output_server_config_stepper_end_part extends Hm_Output_Module {
@@ -2199,24 +2201,23 @@ protected function output() {
         
         if(in_array('profiles', $this->get('router_module_list'), true)) {
             $res .= '
-                 <div class="step_config-form_item" id="srv_setup_stepper_profile_checkbox_bloc">
-                      <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked />
-                      <label for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
+                 <div class="form-check form-switch mt-3" id="srv_setup_stepper_profile_checkbox_bloc">
+                   <input class="form-check-input" type="checkbox" role="switch" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked>
+                   <label class="form-check-label" for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
                  </div>
-                 <div class="nested" id="srv_setup_stepper_profile_bloc">
-                     <div class="step_config-form_item nested">
-                         <label for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
-                         <br />
-                          <input type="email"  class="stepper_input"  style="height: 20px;" id="srv_setup_stepper_profile_reply_to" />
+                 <div class="ms-3" id="srv_setup_stepper_profile_bloc">
+                    <div class="form-floating mb-2">
+                        <input required type="text" id="srv_setup_stepper_profile_reply_to" name="srv_setup_stepper_profile_reply_to" class="txt_fld form-control" value="" placeholder="'.$this->trans('Reply to').'">
+                        <label class="" for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
+                    </div>
+                    <div class="form-floating mb-2">
+                        <input required type="text" id="srv_setup_stepper_profile_signature" name="srv_setup_stepper_profile_signature" class="txt_fld form-control" value="" placeholder="'.$this->trans('Signature').'">
+                        <label class="" for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
+                    </div>
+                    <div class="form-check" id="srv_setup_stepper_profile_checkbox_bloc">
+                       <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_profile_is_default" checked>
+                       <label class="form-check-label" for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
                     </div>
-                     <div class="step_config-form_item nested">
-                         <label for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
-                         <textarea id="srv_setup_stepper_profile_signature" name="srv_setup_stepper_profile_signature" checked ></textarea>
-                     </div>
-                     <div class="step_config-form_item nested">
-                         <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_profile_is_default" checked />
-                         <label for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
-                     </div>
                  </div>
             ';
         }
@@ -2227,13 +2228,13 @@ protected function output() {
                           <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
                       </div>
                       <div class="step_config-actions">
-                          <button class="srv_setup_stepper_btn" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
-                          <button class="srv_setup_stepper_btn" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                          <button class="srv_setup_stepper_btn" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
+                          <button class="btn btn-danger px-3" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                          <button class="btn btn-success px-3" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
+                          <button class="btn btn-success px-3" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
                       </div>
                   </div>
                   <div id="step_config_0">
-                      <button class="srv_setup_stepper_btn step_config current_config_step" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+                      <button class="step_config current_config_step btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
                   </div>
                 </div>
          </div>';
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index ff9e3d18a1..55ce5bd4ba 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1280,38 +1280,52 @@ protected function output() {
 class Hm_Output_stepper_setup_server_imap extends Hm_Output_Module {
     protected function output() {
        $res = '
-                   <div class="step_config-smtp_bloc" id="step_config-imap_bloc">
+                   <div class="step_config-smtp_bloc mb-6" id="step_config-imap_bloc">
                       <label><strong>IMAP</strong></label>
-                      <div class="step_config-form_item">
-                          <label for="srv_setup_stepper_imap_address">'.$this->trans('Address').'</label>
-                          <br />
-                          <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_imap_address" placeholder="'.$this->trans('Address').'" />
-                           <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
+                      <div class="form-floating">
+                        <input required type="text" id="srv_setup_stepper_imap_address" name="srv_setup_stepper_imap_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
+                        <label class="" for="srv_setup_stepper_imap_address">'.$this->trans('Address').'</label>
+                        <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
                       </div>
-                      <div class="step_config-smtp_imap_port_bloc">
-                         <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_imap_port"/>
-                         <div>
-                             <input type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls" value="true">
-                             <label for="imap_tls">'.$this->trans('Use TLS').'</label><br>
-                             <input type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" value="false">
-                             <label for="imap_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
-                         </div>
-                         <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
+                      <div class="d-flex">
+                        <div class="flex-fill">
+                              <div class="form-floating">
+                                <input required type="number" id="srv_setup_stepper_imap_address" name="srv_setup_stepper_imap_port" class="txt_fld form-control" value="" placeholder="'.$this->trans('Port').'">
+                                <label class="" for="srv_setup_stepper_imap_address">'.$this->trans('Port').'</label>
+                                <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
+                              </div>
+                              <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
+                        </div>
+                        <div class="p-2 flex-fill">
+                            <div class="form-check">
+                                <input class="form-check-input" type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls">
+                                <label class="form-check-label" style="font-size: 12px;" for="imap_tls">
+                                  '.$this->trans('Use TLS').'
+                                </label>
+                            </div>
+                            <div class="form-check">
+                                <input class="form-check-input" type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" checked>
+                                <label class="form-check-label" style="font-size: 12px;" for="imap_start_tls">
+                                  '.$this->trans('STARTTLS or unencrypted').'
+                                </label>
+                            </div>
+                        </div>
                       </div>
                    ';
             
-                     if ($this->get('sieve_filters_enabled')) {
+                     if (!$this->get('sieve_filters_enabled')) {
                          $default_value = '';
                              $res .=  '
-                                        <div class="step_config-form_item">
-                                            <input type="checkbox"  class="step_config-form_item-checkbox" id="srv_setup_stepper_enable_sieve" onchange="handleSieveStatusChange(this)"/>
-                                            <label for="srv_setup_stepper_enable_sieve">'.$this->trans('Enable Sieve').'</label>
+                                        
+                                        <div class="form-check">
+                                           <input class="form-check-input" type="checkbox" id="srv_setup_stepper_enable_sieve"  onchange="handleSieveStatusChange(this)">
+                                           <label class="form-check-label" for="srv_setup_stepper_enable_sieve">'.$this->trans('Enable Sieve').'</label>
                                         </div>
-                                       <div class="step_config-form_item nested hide" id="srv_setup_stepper_imap_sieve_host_bloc">
-                                           <label class="screen_reader" for="srv_setup_stepper_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
-                                           <input id="srv_setup_stepper_imap_sieve_host" class="credentials stepper_input" style="height: 20px; width: 200px;" placeholder="localhost:4190" type="text" name="imap_sieve_host">
+                                        <div class="form-floating hide" id="srv_setup_stepper_imap_sieve_host_bloc">
+                                            <input required type="text" id="srv_setup_stepper_imap_sieve_host" name="srv_setup_stepper_imap_sieve_host" class="txt_fld form-control" value="" placeholder="'.$this->trans('Sieve Host').'">
+                                            <label class="" for="srv_setup_stepper_imap_sieve_host">'.$this->trans('Sieve Host').'</label>
                                             <span id="srv_setup_stepper_imap_sieve_host-error" class="error-message"></span>
-                                       </div>';
+                                        </div>';
                      }
        return $res;
     }
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 5456d3e58e..cae596d46b 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1447,24 +1447,37 @@ protected function output() {
 class Hm_Output_stepper_setup_server_smtp extends Hm_Output_Module {
     protected function output() {
         return '
-            <div class="step_config-smtp_bloc" id="step_config-smtp_bloc">
+            <div class="step_config-smtp_bloc mb-3" id="step_config-smtp_bloc">
                <label><strong>SMTP</strong></label>
-               <div class="step_config-form_item">
-                   <label for="srv_setup_stepper_smtp_address">'.$this->trans('Address').'</label>
-                   <br />
-                   <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_smtp_address" placeholder="'.$this->trans('Address').'" />
+                 <div class="form-floating">
+                   <input required type="text" id="srv_setup_stepper_smtp_address" name="srv_setup_stepper_smtp_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
+                   <label class="" for="srv_setup_stepper_smtp_address">'.$this->trans('Address').'</label>
                    <span id="srv_setup_stepper_smtp_address-error" class="error-message"></span>
-               </div>
-               <div class="step_config-smtp_imap_port_bloc">
-                   <input type="number" style="height: 20px;" class="stepper_input" id="srv_setup_stepper_smtp_port"/>
-                   <div>
-                       <input type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls" value="true">
-                       <label for="smtp_tls">'.$this->trans('Use TLS').'</label><br>
-                       <input type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" value="false">
-                       <label for="smtp_start_tls">'.$this->trans('STARTTLS or unencrypted').'</label><br>
+                 </div>
+                 <div class="d-flex">
+                   <div class="flex-fill">
+                         <div class="form-floating">
+                           <input required type="number" id="srv_setup_stepper_smtp_port" name="srv_setup_stepper_smtp_port" class="txt_fld form-control" value="" placeholder="'.$this->trans('Port').'">
+                           <label class="" for="srv_setup_stepper_smtp_port">'.$this->trans('Port').'</label>
+                           <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
+                         </div>
+                         <span id="srv_setup_stepper_smtp_port-error" class="error-message"></span>
                    </div>
-                   <span id="srv_setup_stepper_smtp_port-error" class="error-message"></span>
-               </div>
+                   <div class="p-2 flex-fill">
+                       <div class="form-check">
+                           <input class="form-check-input" type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls">
+                           <label class="form-check-label" style="font-size: 12px;" for="smtp_tls">
+                             '.$this->trans('Use TLS').'
+                           </label>
+                       </div>
+                       <div class="form-check">
+                           <input class="form-check-input" type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" checked>
+                           <label class="form-check-label" style="font-size: 12px;" for="smtp_start_tls">
+                             '.$this->trans('STARTTLS or unencrypted').'
+                           </label>
+                       </div>
+                   </div>
+                 </div>
            </div>
         ';
     }

From 55a74e0f00d14d215a38396b3fb3d67f4513240b Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 18 Feb 2024 20:14:41 +0100
Subject: [PATCH 28/55] Ref: use bootstrap 5 classes

---
 modules/imap/output_modules.php | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 55ce5bd4ba..669ae61596 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1253,22 +1253,25 @@ class Hm_Output_stepper_setup_server_jmap extends Hm_Output_Module {
     protected function output() {
         if(!in_array('jmap', $this->get('router_module_list'), true)) return '';
         return '
-            <div class="step_config-form_item" id="srv_setup_stepper_jmap_select_box">
-                <input type="checkbox"  class="step_config-form_item-checkbox" onchange="handleJmapCheckboxChange(this)" name="srv_setup_stepper_only_jmap" id="srv_setup_stepper_only_jmap"/>
-                <label for="srv_setup_stepper_only_jmap">'.$this->trans('Setup JMAP Server').'</label>
+            <div class="form-check"  id="srv_setup_stepper_jmap_select_box">
+                <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_only_jmap" name="srv_setup_stepper_only_jmap" onchange="handleJmapCheckboxChange(this)">
+                <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_only_jmap">
+                  '.$this->trans('Setup JMAP Server').'
+                </label>
             </div>
             <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
               <label><strong>JMAP</strong></label>
-              <div class="step_config-form_item">
-                  <label for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
-                  <br />
-                  <input type="text" style="height: 20px;"  class="stepper_input" id="srv_setup_stepper_jmap_address" placeholder="'.$this->trans('Address').'" />
+              <div class="form-floating">
+                  <input required type="text" id="srv_setup_stepper_jmap_address" name="srv_setup_stepper_jmap_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
+                  <label class="" for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
                   <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
               </div>
-              <div class="step_config-form_item">
-                <input type="checkbox"  class="step_config-form_item-checkbox" name="srv_setup_stepper_jmap_hide_from_c_page" />
-                <label for="srv_setup_stepper_jmap_hide_from_c_page">'.$this->trans('Hide From Combined Pages').'</label>
-              </div>
+            <div class="form-check">
+                <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_jmap_hide_from_c_page" name="srv_setup_stepper_jmap_hide_from_c_page">
+                <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_jmap_hide_from_c_page">
+                  '.$this->trans('Hide From Combined Pages').'
+                </label>
+            </div>
             </div>
         ';
     }
@@ -1290,9 +1293,9 @@ protected function output() {
                       <div class="d-flex">
                         <div class="flex-fill">
                               <div class="form-floating">
-                                <input required type="number" id="srv_setup_stepper_imap_address" name="srv_setup_stepper_imap_port" class="txt_fld form-control" value="" placeholder="'.$this->trans('Port').'">
-                                <label class="" for="srv_setup_stepper_imap_address">'.$this->trans('Port').'</label>
-                                <span id="srv_setup_stepper_imap_address-error" class="error-message"></span>
+                                <input required type="number" id="srv_setup_stepper_imap_port" name="srv_setup_stepper_imap_port" class="txt_fld form-control" value="" placeholder="'.$this->trans('Port').'">
+                                <label class="" for="srv_setup_stepper_imap_port">'.$this->trans('Port').'</label>
+                                <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
                               </div>
                               <span id="srv_setup_stepper_imap_port-error" class="error-message"></span>
                         </div>

From 7697b7e7509f94aab5e233ee71484bf83be83577 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 18 Feb 2024 21:51:34 +0100
Subject: [PATCH 29/55] Ref: use bootstrap 5 classes

---
 modules/core/output_modules.php |  2 +-
 modules/core/site.js            |  3 +-
 modules/imap/output_modules.php | 59 ++++++++++++++++++---------------
 modules/smtp/modules.php        | 22 ++++++++----
 4 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 002ed6952e..72fe8b2644 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2197,7 +2197,7 @@ protected function output() {
 
 class Hm_Output_server_config_stepper_end_part extends Hm_Output_Module {
     protected function output() {
-        $res = '</div></div>';
+        $res = '</div>';
         
         if(in_array('profiles', $this->get('router_module_list'), true)) {
             $res .= '
diff --git a/modules/core/site.js b/modules/core/site.js
index 15106c920f..e01a008fbd 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -2111,8 +2111,6 @@ function submitSmtpImapServer() {
         { name: 'srv_setup_stepper_jmap_address', value: $('#srv_setup_stepper_jmap_address').val() },
     ];
 
-    console.log("HERE")
-
     Hm_Ajax.request(requestData, function(res) {
         $('#srv_setup_stepper_form_loader').addClass('hide');
         $('.step_config-actions').removeClass('hide');
@@ -2167,6 +2165,7 @@ function handleSmtpImapCheckboxChange(checkbox) {
     }
 
     if (checkbox.id === 'srv_setup_stepper_is_sender') {
+        console.log("checkbox.checked", checkbox.checked)
         if(checkbox.checked) $('#step_config-smtp_bloc').show();
         else $('#step_config-smtp_bloc').hide();
     }
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 669ae61596..48763c5549 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -453,38 +453,40 @@ protected function output() {
                 $disabled = '';
                 $pass_value = '';
             }
-            $res .= '<div class="configured_server">';
+            $res .= '<div class="d-flex justify-content-between align-content-center p-3 border-top border-bottom border-success">';
             $res .= sprintf('
                     <div>
-                        <div class="server_type_tag">'.$type.'</div>
+                        <div><span class="badge text-bg-success">'.$type.'</span></div>
                         <div class="server_title">%s</div>
                         <div class="server_subtitle">%s/%d %s</div>
                     </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']),
                 $vals['tls'] ? 'TLS' : '' );
 
-            $res .= '<form class="imap_connect" method="POST">';
+            $res .= '<form class="imap_connect d-flex gap-3" method="POST">';
             $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
             $res .= '<input type="hidden" name="imap_server_id" class="imap_server_id" value="'.$this->html_safe($index).'" />';
             
             // IMAP Username
-            $res .= '<div class="form-floating mb-3">';
+            $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' id="imap_user_'.$index.'" class="form-control credentials" type="text" name="imap_user" value="'.$this->html_safe($user_pc).'" placeholder="'.$this->trans('Username').'">';
             $res .= '<label for="imap_user_'.$index.'">'.$this->trans('IMAP username').'</label></div>';
             
             // IMAP Password
-            $res .= '<div class="form-floating mb-3">';
+            $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' id="imap_pass_'.$index.'" class="form-control credentials imap_password" type="password" name="imap_pass" value="'.$pass_value.'" placeholder="'.$pass_pc.'">';
             $res .= '<label for="imap_pass_'.$index.'">'.$this->trans('IMAP password').'</label></div>';
             
             // Sieve Host (Conditional)
             if ($this->get('sieve_filters_enabled') && isset($vals['sieve_config_host'])) {
                 $default_value = $vals['sieve_config_host'];
-                $res .= '<div class="form-floating mb-3">';
+                $res .= '<div class="form-floating">';
                 $res .= '<input '.$disabled.' id="imap_sieve_host_'.$index.'" class="form-control credentials imap_sieve_host_input" type="text" name="imap_sieve_host" value="'.$default_value.'" placeholder="Sieve Host">';
                 $res .= '<label for="imap_sieve_host_'.$index.'">'.$this->trans('Sieve Host').'</label></div>';
             }
             
+            $res .= '<div class="d-flex align-item-center p-4">';
+            
             // Buttons
             if (!isset($vals['user']) || !$vals['user']) {
                 $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="imap_delete btn btn-outline-danger btn-sm me-2" />';
@@ -500,6 +502,8 @@ protected function output() {
             $res .= '<input type="submit" '.($hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Hide').'" class="hide_imap_connection btn btn-outline-secondary btn-sm me-2" />';
             $res .= '<input type="submit" '.(!$hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Unhide').'" class="unhide_imap_connection btn btn-outline-secondary btn-sm me-2" />';
             
+            
+            $res .= '</div>';
             $res .= '<input type="hidden" value="ajax_imap_debug" name="hm_ajax_hook" />';
             $res .= '</form>';
                 
@@ -1253,26 +1257,26 @@ class Hm_Output_stepper_setup_server_jmap extends Hm_Output_Module {
     protected function output() {
         if(!in_array('jmap', $this->get('router_module_list'), true)) return '';
         return '
-            <div class="form-check"  id="srv_setup_stepper_jmap_select_box">
-                <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_only_jmap" name="srv_setup_stepper_only_jmap" onchange="handleJmapCheckboxChange(this)">
-                <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_only_jmap">
-                  '.$this->trans('Setup JMAP Server').'
-                </label>
-            </div>
-            <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
-              <label><strong>JMAP</strong></label>
-              <div class="form-floating">
-                  <input required type="text" id="srv_setup_stepper_jmap_address" name="srv_setup_stepper_jmap_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
-                  <label class="" for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
-                  <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
-              </div>
-            <div class="form-check">
-                <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_jmap_hide_from_c_page" name="srv_setup_stepper_jmap_hide_from_c_page">
-                <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_jmap_hide_from_c_page">
-                  '.$this->trans('Hide From Combined Pages').'
-                </label>
-            </div>
-            </div>
+                <div class="form-check"  id="srv_setup_stepper_jmap_select_box">
+                    <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_only_jmap" name="srv_setup_stepper_only_jmap" onchange="handleJmapCheckboxChange(this)">
+                    <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_only_jmap">
+                      '.$this->trans('Setup JMAP Server').'
+                    </label>
+                </div>
+                <div class="step_config-jmap_bloc hide" id="step_config-jmap_bloc">
+                      <label><strong>JMAP</strong></label>
+                      <div class="form-floating">
+                          <input required type="text" id="srv_setup_stepper_jmap_address" name="srv_setup_stepper_jmap_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
+                          <label class="" for="srv_setup_stepper_jmap_address">'.$this->trans('Address').'</label>
+                          <span id="srv_setup_stepper_jmap_address-error" class="error-message"></span>
+                      </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_jmap_hide_from_c_page" name="srv_setup_stepper_jmap_hide_from_c_page">
+                        <label class="form-check-label" style="font-size: 12px;" for="srv_setup_stepper_jmap_hide_from_c_page">
+                          '.$this->trans('Hide From Combined Pages').'
+                        </label>
+                    </div>
+                </div>
         ';
     }
 }
@@ -1283,7 +1287,7 @@ protected function output() {
 class Hm_Output_stepper_setup_server_imap extends Hm_Output_Module {
     protected function output() {
        $res = '
-                   <div class="step_config-smtp_bloc mb-6" id="step_config-imap_bloc">
+                   <div class="step_config-imap_bloc mb-6" id="step_config-imap_bloc">
                       <label><strong>IMAP</strong></label>
                       <div class="form-floating">
                         <input required type="text" id="srv_setup_stepper_imap_address" name="srv_setup_stepper_imap_address" class="txt_fld form-control" value="" placeholder="'.$this->trans('Address').'">
@@ -1330,6 +1334,7 @@ protected function output() {
                                             <span id="srv_setup_stepper_imap_sieve_host-error" class="error-message"></span>
                                         </div>';
                      }
+               $res .= '</div>';
        return $res;
     }
 }
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index cae596d46b..89bed8ff58 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1383,24 +1383,30 @@ protected function output() {
                 $disabled = '';
                 $pass_value = '';
             }
-            $res .= '<div class="configured_server">';
-            $res .= sprintf('<div class="server_title">%s</div><div class="server_subtitle">%s/%d %s</div>',
+            $res .= '<div class="d-flex justify-content-between align-content-center p-3 border-top border-bottom border-success">';
+            $res .= sprintf('<div>
+                               <div><span class="badge text-bg-success">SMTP</span></div>
+                               <div class="server_title">%s</div>
+                               <div class="server_subtitle">%s/%d %s</div>
+                            </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']), $vals['tls'] ? 'TLS' : '' );
             
-            $res .= '<form class="smtp_connect" method="POST">';
+            $res .= '<form class="smtp_connect d-flex gap-3" method="POST">';
             $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
             $res .= '<input type="hidden" name="smtp_server_id" value="'.$this->html_safe($index).'" />';
             
             // SMTP Username
-            $res .= '<div class="form-floating mb-3">';
+            $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' class="form-control credentials" id="smtp_user_'.$index.'" type="text" name="smtp_user" value="'.$this->html_safe($user_pc).'" placeholder="'.$this->trans('Username').'">';
             $res .= '<label for="smtp_user_'.$index.'">'.$this->trans('SMTP username').'</label></div>';
             
             // SMTP Password
-            $res .= '<div class="form-floating mb-3">';
+            $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' class="form-control credentials smtp_password" type="password" id="smtp_pass_'.$index.'" name="smtp_pass" value="'.$pass_value.'" placeholder="'.$pass_pc.'">';
             $res .= '<label for="smtp_pass_'.$index.'">'.$this->trans('SMTP password').'</label></div>';
             
+            $res .= '<div class="d-flex align-item-center p-4">';
+            
             // Buttons
             if (!$no_edit) {
                 if (!isset($vals['user']) || !$vals['user']) {
@@ -1414,6 +1420,8 @@ protected function output() {
                 }
                 $res .= '<input type="hidden" value="ajax_smtp_debug" name="hm_ajax_hook" />';
             }
+            
+            $res .= '</div>';
             $res .= '</form>';
 
             $res .= '</div></div>';
@@ -1465,13 +1473,13 @@ protected function output() {
                    </div>
                    <div class="p-2 flex-fill">
                        <div class="form-check">
-                           <input class="form-check-input" type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls">
+                           <input class="form-check-input" type="radio" id="smtp_tls" name="srv_setup_stepper_smtp_tls" value="true" checked>
                            <label class="form-check-label" style="font-size: 12px;" for="smtp_tls">
                              '.$this->trans('Use TLS').'
                            </label>
                        </div>
                        <div class="form-check">
-                           <input class="form-check-input" type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls" checked>
+                           <input class="form-check-input" type="radio" id="smtp_start_tls" name="srv_setup_stepper_smtp_tls"  value="false" >
                            <label class="form-check-label" style="font-size: 12px;" for="smtp_start_tls">
                              '.$this->trans('STARTTLS or unencrypted').'
                            </label>

From 420eb003ea902c33070e449b747eb3cf8af14c0b Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 21 Feb 2024 21:30:24 +0100
Subject: [PATCH 30/55] Ref: Fix module dependences

---
 config/app.php                  | 2 +-
 modules/core/output_modules.php | 9 ++++++++-
 modules/core/setup.php          | 2 +-
 modules/imap/setup.php          | 6 +++---
 modules/smtp/setup.php          | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/config/app.php b/config/app.php
index f9f407c142..7eda3d5978 100644
--- a/config/app.php
+++ b/config/app.php
@@ -678,7 +678,7 @@
     | Handles page layout, login/logout, and the default settings pages. This set
     | is required.
     */
-    'modules' => explode(',', env('CYPHT_MODULES','core,contacts,local_contacts,feeds,imap,smtp,jmap,account,idle_timer,calendar,themes,nux,developer,history,saved_searches,advanced_search,highlights,profiles,inline_message,imap_folders,keyboard_shortcuts')),
+    'modules' => explode(',', env('CYPHT_MODULES','core,contacts,local_contacts,feeds,imap,smtp,account,idle_timer,calendar,themes,nux,developer,history,saved_searches,advanced_search,highlights,profiles,inline_message,imap_folders,keyboard_shortcuts')),
     // 'modules' => [
     //     /*
     //     |  ----
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 72fe8b2644..1cc05b7919 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2117,6 +2117,13 @@ protected function output() {
     
     // When essential module is not activated, we don't display the accordion
     if(!$hasEssentialModuleActivated) return '';
+
+    $serverList = null;
+
+
+    if(class_exists('Nux_Quick_Services')){
+        $serverList = Nux_Quick_Services::option_list(false, $this);
+    }
     
     
     $res = '<div class="smtp_imap_server_setup">
@@ -2169,7 +2176,7 @@ protected function output() {
                             <form>
                                 <div class="form-floating mb-3">
                                   <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) aria-label="'.$this->trans('Provider').'">
-                                    <option value="">'.$this->trans('Other').'</option>'.Nux_Quick_Services::option_list(false, $this).'
+                                    <option value="">'.$this->trans('Other').'</option>'.$serverList.'
                                   </select>
                                   <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
                                 </div>';
diff --git a/modules/core/setup.php b/modules/core/setup.php
index 87b986c2ea..8473a52930 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -22,7 +22,7 @@
 add_handler('servers', 'reload_folder_cookie', true, 'core', 'save_user_data', 'after');
 add_output('servers', 'server_content_start', true, 'core', 'content_section_start', 'after');
 add_output('servers', 'server_config_stepper', true, 'core', 'server_content_start', 'after');
-add_output('servers', 'server_config_stepper_end_part', true, 'core', 'stepper_setup_server_smtp', 'after');
+add_output('servers', 'server_config_stepper_end_part', true, 'core', 'server_config_stepper', 'after');
 add_output('servers', 'server_content_end', true, 'core', 'content_section_end', 'before');
 
 /* compose */
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index d05f8df106..0d2f35e55f 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -21,10 +21,10 @@
 add_handler('servers', 'process_add_imap_server', true, 'imap', 'message_list_type', 'after');
 add_handler('servers', 'process_add_jmap_server', true, 'imap', 'process_add_imap_server', 'after');
 add_handler('servers', 'save_imap_servers',  true, 'imap', 'process_add_jmap_server', 'after');
-add_output('servers', 'display_configured_imap_servers', true, 'imap', 'display_configured_smtp_servers', 'after');
+add_output('servers', 'display_configured_imap_servers', true, 'imap', 'server_config_stepper_end_part', 'after');
 add_output('servers', 'imap_server_ids', true, 'imap', 'page_js', 'before');
-add_output('servers', 'stepper_setup_server_jmap', true, 'imap', 'server_config_stepper', 'after');
-add_output('servers', 'stepper_setup_server_imap', true, 'imap', 'stepper_setup_server_smtp', 'before');
+add_output('servers', 'stepper_setup_server_jmap', true, 'imap', 'server_config_stepper_end_part', 'before');
+add_output('servers', 'stepper_setup_server_imap', true, 'imap', 'server_config_stepper_end_part', 'before');
 
 /* settings page data */
 add_handler('settings', 'process_sent_since_setting', true, 'imap', 'date', 'after');
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index 4d9db33a4b..1aa93b3623 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -30,7 +30,7 @@
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
 add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
-add_output('servers', 'stepper_setup_server_smtp', true, 'smtp', 'stepper_setup_server_jmap', 'after');
+add_output('servers', 'stepper_setup_server_smtp', true, 'smtp', 'server_config_stepper', 'after');
 add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper_end_part', 'after');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');

From 2a2737785d26938723b38859ae827d7135ce4459 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Wed, 21 Feb 2024 21:47:13 +0100
Subject: [PATCH 31/55] Ref: Loader - Replace ImageSource

---
 modules/core/output_modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index bfe60be4ef..910dbc6982 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2227,7 +2227,9 @@ protected function output() {
         $res .= '</form>
                       </div>
                       <div class="srv_setup_stepper_form_loader hide" id="srv_setup_stepper_form_loader">
-                          <img width="24" height="24" src="'.Hm_Image_Sources::$spinner.'" alt="loader" />
+                          <div class="spinner-border text-dark" role="status">
+                              <span class="visually-hidden">Loading...</span>
+                          </div>
                       </div>
                       <div class="step_config-actions">
                           <button class="btn btn-danger px-3" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>

From 854987d34c364829f42f84425bb099ef4d7e6951 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Fri, 23 Feb 2024 20:14:28 +0100
Subject: [PATCH 32/55] Fix: output modules print

---
 modules/core/output_modules.php | 18 ++++++++++++--
 modules/core/setup.php          |  1 +
 modules/imap/output_modules.php | 43 +++++++++++++++++++--------------
 modules/imap/setup.php          |  2 +-
 modules/nux/setup.php           |  2 +-
 modules/smtp/modules.php        | 41 ++++++++++++++++++-------------
 modules/smtp/setup.php          |  2 +-
 7 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 910dbc6982..8a6b2b9212 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2119,9 +2119,16 @@ protected function output() {
     if(class_exists('Nux_Quick_Services')){
         $serverList = Nux_Quick_Services::option_list(false, $this);
     }
+
+    $hideClass = 'd-none';
+
+    // Don't hide this section if at least one of the essential module is activated
+    if($hasImapActivated || $hasSmtpActivated || $hasJmapActivated){
+        $hideClass = '';
+    }
     
     
-    $res = '<div class="smtp_imap_server_setup">
+    $res = '<div class="smtp_imap_server_setup '. $hideClass .'">
               <div data-target=".server_config_section" class="server_section border-bottom cursor-pointer px-1 py-3 pe-auto">
                   <a href="#" class="pe-auto">
                       <i class="bi bi-envelope-fill me-3"></i>
@@ -2241,8 +2248,15 @@ protected function output() {
                       <button class="step_config current_config_step btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
                   </div>
                 </div>
-         </div>';
+         </div>
+         <div class="px-5">';
 
          return $res;
     }
 }
+
+class Hm_Output_server_config_stepper_accordion_end_part extends Hm_Output_Module {
+    protected function output() {
+        return '</div></div></div>';
+    }
+}
diff --git a/modules/core/setup.php b/modules/core/setup.php
index a91c707888..d71fd25b16 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -23,6 +23,7 @@
 add_output('servers', 'server_content_start', true, 'core', 'content_section_start', 'after');
 add_output('servers', 'server_config_stepper', true, 'core', 'server_content_start', 'after');
 add_output('servers', 'server_config_stepper_end_part', true, 'core', 'server_config_stepper', 'after');
+add_output('servers', 'server_config_stepper_accordion_end_part', true, 'core', 'server_config_stepper_end_part', 'after');
 add_output('servers', 'server_content_end', true, 'core', 'content_section_end', 'before');
 
 /* compose */
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 41e5ec9a31..6996cf20c1 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -420,7 +420,7 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
-        $res = '';
+        $res = '<div class="subtitle mt-4">Imap & JMAP Serves</div>';
         foreach ($this->get('imap_servers', array()) as $index => $vals) {
             $server_id = $vals['id'];
             $type = 'IMAP';
@@ -452,39 +452,42 @@ protected function output() {
                 $disabled = '';
                 $pass_value = '';
             }
-            $res .= '<div class="d-flex justify-content-between align-content-center p-3 border-top border-bottom border-success">';
+            $res .= '<div>';
+            $res .= '<form class="imap_connect" method="POST">';
+            $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
+            $res .= '<input type="hidden" name="imap_server_id" class="imap_server_id" value="'.$this->html_safe($server_id).'" />';
+            $res .= '<table class="table">
+                      <tbody>
+                        <tr>
+                          <td style="width: 250px;">';
             $res .= sprintf('
                     <div>
-                        <div><span class="badge text-bg-success">'.$type.'</span></div>
-                        <div class="server_title">%s</div>
+                        <div class="text-muted"><strong>%s</strong></div>
                         <div class="server_subtitle">%s/%d %s</div>
                     </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']),
                 $vals['tls'] ? 'TLS' : '' );
+            $res .= '</td><td>';
 
-            $res .= '<form class="imap_connect d-flex gap-3" method="POST">';
-            $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
-            $res .= '<input type="hidden" name="imap_server_id" class="imap_server_id" value="'.$this->html_safe($server_id).'" />';
-            
             // IMAP Username
             $res .= '<div class="form-floating mb-3">';
             $res .= '<input '.$disabled.' id="imap_user_'.$server_id.'" class="form-control credentials" type="text" name="imap_user" value="'.$this->html_safe($user_pc).'" placeholder="'.$this->trans('Username').'">';
             $res .= '<label for="imap_user_'.$server_id.'">'.$this->trans('IMAP username').'</label></div>';
-            
+            $res .= '</td><td>';
             // IMAP Password
             $res .= '<div class="form-floating mb-3">';
             $res .= '<input '.$disabled.' id="imap_pass_'.$server_id.'" class="form-control credentials imap_password" type="password" name="imap_pass" value="'.$pass_value.'" placeholder="'.$pass_pc.'">';
             $res .= '<label for="imap_pass_'.$server_id.'">'.$this->trans('IMAP password').'</label></div>';
-            
+            $res .= '</td><td>';
+
             // Sieve Host (Conditional)
             if ($this->get('sieve_filters_enabled') && isset($vals['sieve_config_host'])) {
                 $default_value = $vals['sieve_config_host'];
                 $res .= '<div class="form-floating mb-3">';
                 $res .= '<input '.$disabled.' id="imap_sieve_host_'.$server_id.'" class="form-control credentials imap_sieve_host_input" type="text" name="imap_sieve_host" value="'.$default_value.'" placeholder="Sieve Host">';
                 $res .= '<label for="imap_sieve_host_'.$server_id.'">'.$this->trans('Sieve Host').'</label></div>';
+                $res .= '</td><td>';
             }
-            
-            $res .= '<div class="d-flex align-item-center p-4">';
 
             // Buttons
             if (!isset($vals['user']) || !$vals['user']) {
@@ -495,21 +498,25 @@ protected function output() {
                 $res .= '<input type="submit" value="'.$this->trans('Delete').'" class="imap_delete btn btn-outline-danger btn-sm me-2" />';
                 $res .= '<input type="submit" value="'.$this->trans('Forget').'" class="forget_imap_connection btn btn-outline-warning btn-sm me-2" />';
             }
-            
+
             // Hide/Unhide Buttons
             $hidden = array_key_exists('hide', $vals) && $vals['hide'];
             $res .= '<input type="submit" '.($hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Hide').'" class="hide_imap_connection btn btn-outline-secondary btn-sm me-2" />';
             $res .= '<input type="submit" '.(!$hidden ? 'style="display: none;" ' : '').'value="'.$this->trans('Unhide').'" class="unhide_imap_connection btn btn-outline-secondary btn-sm me-2" />';
-            
 
-            $res .= '</div>';
+
+            $res .= '</td>
+                </tr>
+              </tbody>
+            </table>';
+
             $res .= '<input type="hidden" value="ajax_imap_debug" name="hm_ajax_hook" />';
             $res .= '</form>';
-                
 
-            $res .= '</div></div>';
+
+            $res .= '</div>';
         }
-        $res .= '<br class="clear_float" /></div></div></div></div>';
+        $res .= '<br class="clear_float" />';
         return $res;
     }
 }
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index fb9f329d19..650dfcdc6e 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -21,7 +21,7 @@
 add_handler('servers', 'process_add_imap_server', true, 'imap', 'message_list_type', 'after');
 add_handler('servers', 'process_add_jmap_server', true, 'imap', 'process_add_imap_server', 'after');
 add_handler('servers', 'save_imap_servers',  true, 'imap', 'process_add_jmap_server', 'after');
-add_output('servers', 'display_configured_imap_servers', true, 'imap', 'server_config_stepper_end_part', 'after');
+add_output('servers', 'display_configured_imap_servers', true, 'imap', 'server_config_stepper_accordion_end_part', 'before');
 add_output('servers', 'imap_server_ids', true, 'imap', 'page_js', 'before');
 add_output('servers', 'stepper_setup_server_jmap', true, 'imap', 'server_config_stepper_end_part', 'before');
 add_output('servers', 'stepper_setup_server_imap', true, 'imap', 'server_config_stepper_end_part', 'before');
diff --git a/modules/nux/setup.php b/modules/nux/setup.php
index 3a7b7aa6fd..2a3e519cfb 100644
--- a/modules/nux/setup.php
+++ b/modules/nux/setup.php
@@ -6,7 +6,7 @@
 output_source('nux');
 
 /* servers page */
-add_output('servers', 'quick_add_section', true, 'nux', 'display_configured_imap_servers', 'after');
+add_output('servers', 'quick_add_section', true, 'nux', 'server_config_stepper_accordion_end_part', 'after');
 add_output('servers', 'quick_add_dialog', true, 'nux', 'quick_add_section', 'after');
 
 add_handler('ajax_nux_service_select', 'login', false, 'core');
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index c3322ed646..014001f002 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1350,7 +1350,7 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
-        $res = '';
+        $res = '<div class="subtitle mt-4">SMTP Serves</div>';
         foreach ($this->get('smtp_servers', array()) as $index => $vals) {
 
             $no_edit = false;
@@ -1373,30 +1373,34 @@ protected function output() {
                 $disabled = '';
                 $pass_value = '';
             }
-            $res .= '<div class="d-flex justify-content-between align-content-center p-3 border-top border-bottom border-success">';
+            $res .= '<div>';
+
+            $res .= '<form class="smtp_connect" method="POST">';
+            $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
+            $res .= '<input type="hidden" name="smtp_server_id" value="'.$this->html_safe($index).'" />';
+            $res .= '<table class="table">
+                      <tbody>
+                        <tr>
+                          <td style="width: 250px;">';
             $res .= sprintf('<div>
-                               <div><span class="badge text-bg-success">SMTP</span></div>
-                               <div class="server_title">%s</div>
+                               <div class="text-muted"><strong>%s</strong></div>
                                <div class="server_subtitle">%s/%d %s</div>
                             </div>',
                 $this->html_safe($vals['name']), $this->html_safe($vals['server']), $this->html_safe($vals['port']), $vals['tls'] ? 'TLS' : '' );
-            
-            $res .= '<form class="smtp_connect d-flex gap-3" method="POST">';
-            $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
-            $res .= '<input type="hidden" name="smtp_server_id" value="'.$this->html_safe($index).'" />';
-            
+            $res .= '</td><td>';
+
             // SMTP Username
             $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' class="form-control credentials" id="smtp_user_'.$index.'" type="text" name="smtp_user" value="'.$this->html_safe($user_pc).'" placeholder="'.$this->trans('Username').'">';
             $res .= '<label for="smtp_user_'.$index.'">'.$this->trans('SMTP username').'</label></div>';
-            
+            $res .= '</td><td>';
+
             // SMTP Password
             $res .= '<div class="form-floating">';
             $res .= '<input '.$disabled.' class="form-control credentials smtp_password" type="password" id="smtp_pass_'.$index.'" name="smtp_pass" value="'.$pass_value.'" placeholder="'.$pass_pc.'">';
             $res .= '<label for="smtp_pass_'.$index.'">'.$this->trans('SMTP password').'</label></div>';
-            
-            $res .= '<div class="d-flex align-item-center p-4">';
-            
+            $res .= '</td><td>';
+
             // Buttons
             if (!$no_edit) {
                 if (!isset($vals['user']) || !$vals['user']) {
@@ -1410,11 +1414,14 @@ protected function output() {
                 }
                 $res .= '<input type="hidden" value="ajax_smtp_debug" name="hm_ajax_hook" />';
             }
-            
-            $res .= '</div>';
-            $res .= '</form>';
 
-            $res .= '</div></div>';
+            $res .= '</td>
+                    </tr>
+                  </tbody>
+                </table>
+            </form>';
+
+            $res .= '</div>';
         }
         $res .= '<br class="clear_float" />';
         return $res;
diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index daa512ae7b..6e24e0b7d3 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -31,7 +31,7 @@
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
 add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
 add_output('servers', 'stepper_setup_server_smtp', true, 'smtp', 'server_config_stepper', 'after');
-add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper_end_part', 'after');
+add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper_accordion_end_part', 'before');
 
 add_handler('settings', 'process_compose_type', true, 'smtp', 'save_user_settings', 'before');
 add_handler('settings', 'process_auto_bcc', true, 'smtp', 'save_user_settings', 'before');

From 6736e076d4579c147b74d938ebb7a9709cf72dcb Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 24 Feb 2024 22:18:25 +0100
Subject: [PATCH 33/55] Few fixes

---
 hm3.ini | 900 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hm3.rc  |   1 +
 2 files changed, 901 insertions(+)
 create mode 100644 hm3.ini
 create mode 100644 hm3.rc

diff --git a/hm3.ini b/hm3.ini
new file mode 100644
index 0000000000..7f139b24e7
--- /dev/null
+++ b/hm3.ini
@@ -0,0 +1,900 @@
+
+; -----------------------------------------------------------------------------
+; General settings
+; -----------------------------------------------------------------------------
+
+; Session Type
+; ------------
+; Sessions are how the server maintains your logged in state. Cypht supports
+; standard PHP sessions, as well as its own completely independent session
+; system that uses memcached or a database for storage. In order to use
+; database sessions, the database must be correctly configured in the "DB
+; Support" section and the hm_user_session table must be created. In order to
+; use Memcached sessions, the memcached server must be correctly configured
+; in the "Memcached Support" section. In order to use Redis session, the
+; Redis server must be configured in the "Redis Support" section.
+;
+; Valid values for this setting:
+;
+;  PHP     Standard PHP session handlers
+;  DB      Custom database based sessions
+;  MEM     Custom Memcached based sessions
+;  REDIS   Custom Redis based sessions
+;  custom  Create your own session class. See the modules/site/lib.php file for
+;          more info
+;
+session_type=PHP
+
+
+; Authentication Type
+; -------------------
+; This setting defines how Cypht will authenticate your username and password
+; when you login. If you want to use a database it must be correctly configured
+; in the "DB Support" section and the hm_user table must be created. There are
+; 3 PHP cli scripts to help manage database users in the scripts/ directory (
+; create_account.php, delete_account.php, and update_password.php). If you want
+; to authenticate against an IMAP server, you must setup the imap_auth_* settings
+; below. If you want to authenticate against a POP3 server, you must setup the
+; pop3_auth_* settings below. If you want to authenticate against an LDAP server,
+; you must setup the ldap_auth_* settings. Finally, if you want to let users
+; pick from a list of popular mail services or try to auto-discover a mail
+; system, set this to dynamic and make sure the dynamic_login module set is
+; enabled in the "Module Sets" section of this file.
+; 
+; Valid values for this setting:
+;
+;  DB       Authenticate against the database
+;  LDAP     Authenticate against an LDAP server
+;  IMAP     Authenticate using an IMAP server
+;  POP3     Authenticate using a POP3 server
+;  dynamic  Let the user choose from a list, or try to auto discover the mail
+;           services based on the email domain
+;  custom   Create your own auth class. See the modules/site/lib.php file for
+;           more info
+;
+auth_type=DB
+
+
+; LDAP Authentication
+; -------------------
+; If auth_type is set to LDAP, configure the LDAP server to authenticate against
+; with the following settings, otherwise these are ignored.
+;
+
+; The hostname or IP address of the LDAP server to authenticate to
+ldap_auth_server=localhost
+
+; The port the LDAP server is listening on.
+ldap_auth_port=389
+
+; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
+; true to enable TLS connections.
+ldap_auth_tls=
+
+; The "base dn" of the LDAP server
+ldap_auth_base_dn="example,dc=com"
+
+
+; IMAP Authentication
+; -------------------
+; If auth_type is set to IMAP, configure the IMAP server to authenticate against
+; with the following settings, otherwise these are ignored.
+;
+; This is just a label used in the UI. It can be set to anything
+imap_auth_name=localhost
+
+; The hostname or IP address of the IMAP server to authenticate to
+imap_auth_server=localhost
+
+; The port the IMAP server is listening on.
+imap_auth_port=143
+
+; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
+; true to enable TLS connections. If you want to use IMAP STARTTLS, do NOT
+; enable this. This is only for TLS enabled sockets (typically on port 993).
+imap_auth_tls=
+
+
+; POP3 Authentication
+; -------------------
+; if auth_type is set to POP3, configure the POP3 server to authenticate against
+; with the following settings, otherwise these are ignored.
+;
+; This is just a label used in the UI. It can be set to anything
+pop3_auth_name=localhost
+
+; The hostname or IP address of the POP3 server to authenticate to
+pop3_auth_server=localhost
+
+; The port the POP3 server is listening on.
+pop3_auth_port=110
+
+; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
+; true to enable TLS connections.
+pop3_auth_tls=
+
+
+; Default SMTP Server
+; -------------------
+; You can set a default SMTP server for all Cypht users. Authentication will be
+; done with the users login credentials, so this only makes sense if you are
+; using POP3 or IMAP for authentication. Leave these values blank to disable a
+; default SMTP server, otherwise fill in the required values below
+;
+; This is just a label used in the UI. It can be set to anything
+default_smtp_name=
+
+; The hostname or IP address of the SMTP server
+default_smtp_server=
+
+; The port the SMTP server is listening on.
+default_smtp_port=
+
+; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
+; true to enable TLS connections.
+default_smtp_tls=
+
+; If your SMTP service does not require authentication, you can disable it
+; by setting the following to true.
+default_smtp_no_auth=
+
+
+; Settings Storage
+; ----------------
+; Cypht supports 3 methods for saving user settings between logins. File based
+; settings, database table or custom implementation. To store settings in a
+; database, it must be configured in the "DB Support" section and the
+; hm_user_settings table must be created. To store settings on the filesystem,
+; the user_settings_dir must be created and the webserver software must be able
+; to write to it. For custom implementations, see Hm_User_Config_File.
+; 
+; Valid values for this setting:
+;
+;  file    Store user settings in the filesystem
+;  DB      Store user settings in a database
+;  custom  Store user settings via custom implementation. Specify class name
+;          after colon, e.g. custom:Custom_User_Config
+;
+user_config_type=file
+
+
+; Settings Location
+; -----------------
+; If user_config_type is set to file, this must be set to an existing directory
+; that the webserver software can read and write to. If settings storage is set
+; to DB, this is ignored. It should not be inside the webserver document root.
+user_settings_dir=/var/lib/hm3/users
+
+
+; Attachment Location
+; -------------------
+; Cypht needs a temporary place to store attachments that are to be sent with
+; an outgoing message. This folder must exist and be writable by the webserver
+; software. It should not be inside the webserver document root.
+attachment_dir=/var/lib/hm3/attachments
+
+
+; Application Data Location
+; -------------------------
+; Some Cypht module sets have their own ini files that need to be readable by
+; the webserver software, but not writable, and definitely not inside the
+; webserver document root.
+app_data_dir=/var/lib/hm3/app_data
+
+
+; Disable origin check
+; --------------------
+; To help protect against CSRF attacks, Cypht checks origin headers to confirm
+; that the source and target origin domains match. If you are using proxies this
+; could create a problem making it impossible to login. Change this to true to
+; disable the origin check.
+disable_origin_check=false
+
+
+; Admin Users
+; ----------
+; You can define a comma delimited list of admin users that Cypht will grant
+; special rights to. Currently this only enables the "create account" link in
+; the account module set that provides a form to create a new account. This is
+; only used if the auth_type is set to DB. Leave this blank if you don't want
+; to define any admin users, or are using IMAP or POP3 authentication.
+admin_users=
+
+
+; Cookie Domain
+; -------------
+; By default Cypht uses the server name used in the request to determine
+; the domain name to set the cookie for. Configurations that use a reverse
+; proxy might need to define the domain name used for cookies. Leave this
+; blank to let Cypht automatically determine the domain. You can also use
+; the special value of "none" to force Cypht to NOT set the cookie domain
+; property at all. This is not recommended unless you know what you are
+; doing!
+cookie_domain=
+
+
+; Cookie Path
+; -------------
+; By default Cypht uses the request URI to determine the cookie path to set
+; the cookie for. Configurations that use mod_rewrite might need to define
+; the path used for cookies. E.g. /cypht/embedded?page=compose will set path
+; to /cypht/embedded/ which won't send the cookies back to the server. In that
+; case set cookie_path=/cypht/. Leave this blank to let Cypht automatically
+; determine the path. You can also use the special value of "none" to force
+; Cypht to NOT set the cookie path property at all. This is not recommended
+; unless you know what you are doing!
+cookie_path=
+
+
+; Outbound Email Domain
+; ----------------------
+; Default domain used for outbound email addresses when using IMAP auth and
+; users don't login with a full email address. Users can customize this with
+; the profiles module which will override this default
+default_email_domain=
+
+
+; Auto-Create Profile
+; -------------------
+; When a user logs in and they have only 1 IMAP server and 1 SMTP server, and
+; no configured profiles - enabling this option will auto-create a profile for
+; them. Email and reply-to addresses will use the default_email_domain if
+; set, otherwise it will fallback to the domain Cypht is hosted on.
+autocreate_profile=
+
+
+; Redirect After Login
+; --------------------
+; You can login directly to any page in Cypht by going to the correct url before
+; logging in, but that is not very user-friendly. To redirect users to a url
+; after login, add the url arguments below (everything in the url after, but
+; including, the question mark). You must use double quotes around the value
+; otherwise it will cause an ini parsing error. To redirect users after login
+; to the combined unread view you would use:
+;
+; redirect_after_login="?page=message_list&list_path=unread"
+redirect_after_login=
+
+
+; Application Name
+; ----------------
+; This label is used in the UI to reference the program - you can change it to
+; "Your awesome webmail" to replace the Cypht name used in various places.
+app_name=Cypht
+
+
+; Force Mobile UI
+; ---------------
+; Cypht will detect mobile devices and display a mobile optimized UI. If you want
+; to aways use this UI regardless of device, set this to true
+always_mobile_ui=
+
+
+; Default Language
+; ----------------
+; Users can select from available interface languages on the site settings page.
+; This sets the default for a user who has not done so. Valid values are 2 character
+; langauge codes that have matching language definitions in the language/ folder.
+default_language=en
+
+
+; JavaScript Compression
+; ----------------------
+; When the configuration script is run, all JavaScript files are concatenated
+; and optionally compressed. To compress the content, define a command and its
+; options below. Cypht does not come with compresson software, so you must
+; install and configure that separately. Leave blank or set to false to disable
+; external compression. Compression software must be able to handle ES6.
+;
+; Example:
+;   js_compress='uglifyjs.terser -c -m --verbose --warn'
+;
+js_compress=false
+
+
+; CSS Compression
+; ---------------
+; When the configuration script is run, all CSS files are concatenated and
+; optionally compressed. To compress the content, define a command and its
+; options below. Cypht does not come with compresson software, so you must
+; install and configure that separately. Leave blank or set to false to disable
+; external compression.
+;
+; Example:
+;   css_compress='java -jar /usr/local/lib/yuicompressor-2.4.8.jar --type css'
+;
+css_compress=false
+
+
+; Caching Server Support
+; ---------------------
+
+; Cypht can use Redis or Memcache to improve performance, as well as to store
+; user sessions. Configure Redis or Memcached below and Cypht will
+; automatically use them for caching. All data cached for a user in either
+; system is encrypted. Currently, the feeds, POP3, and IMAP modules will use
+; the configured cache. If both Redis and Memcached are configured, Redis will
+; be used for the cache.
+;
+; If you want to use the user session as a cache, uncomment the line below and
+; set to true. THIS IS NOT RECOMMENDED. Cypht uses parallel requests to the
+; server, and using the session as a cache is likely to cause race conditions
+; and integrity issues. If you are running Cypht in an "embedded" mode with
+; only one email source, this option is less likely to be a problem.
+
+; allow_session_cache=false
+
+; Redis Support
+; -------------
+
+; Configure Redis details below to use it for caching
+enable_redis=true
+redis_server=127.0.0.1
+redis_port=6379
+redis_index=1
+redis_pass=
+redis_socket=/var/run/redis/redis-server.sock
+
+
+; Memcached Support
+; -----------------
+; Configure Memcached details below to use it for caching
+enable_memcached=true
+memcached_server=127.0.0.1
+memcached_port=11211
+
+; If you need SASL authentication for memcached, set the following to true
+; and add the username and password to authenticate with
+memcached_auth=false
+memcached_user=
+memcached_pass=
+
+
+; Allow Long Sessions
+; -------------------
+; Cypht logins only last as long as the browser is open. Closing the browser,
+; or moving to a new network, will cause you to be logged out. This setting
+; provides users with a "stay logged in" option during login that will set the
+; sesison lifetime to a default of 30 days, and disable the IP address check.
+;
+; USE WITH CAUTION SINCE THIS DISABLES SOME SESSION PROTECTIONS.
+;
+; Specifically:
+;
+; - Session cookies stay active after a browser restart making them more
+;   susceptible to snooping
+; - The browser "fingerprint" was use to help protect against session hijacking
+;   includes the client's IP. With this option enabled a client IP can change
+;   mid-session and it won't log them out
+allow_long_session=false
+
+; Set the session lifetime in days. Only applies if allow_long_session is set to
+; true, and a user checks the box to "stay logged in" during login.
+long_session_lifetime=30
+
+
+; Browser Encryption Options
+; --------------------------
+; Cypht can use the Forge JavaScript encryption library to encrypt AJAX
+; responses and data stored in browser local storage. Enabling either one of
+; these options causes the Forge JavaScript library to be included. This adds
+; about 70KB to the page size (when gzipped).
+
+; Use AES encryption for AJAX responses. Set to true to enable, leave blank or
+; set to false to disable.
+encrypt_ajax_requests=
+
+; Use AES encryption for data stored in the browser local storage. Set to true
+; to enable, or leave blank or set to false to disable.
+encrypt_local_storage=
+
+
+; Allow client IP changes
+; -----------------------
+; By default Cypht will log you out if your client IP address changes. This is
+; an extra layer of protection against session hijacking, but it's not uncommon
+; for your client IP to change. Change this to true if you want to disable this
+; check
+disable_ip_check=false
+
+
+; Allow remote image sources
+; --------------------------
+;
+; WARNING: Using this feature could leak information to external sources.
+;
+; By default, Cypht will not allow external images to be loaded when viewing an
+; HTML formatted email message. A Content Security Policy header limits images
+; sources to "self" only and the message content is filtered to remove any external
+; resource. If you really want the ability to view external images in an email,
+; you first need to change the following setting to true. When viewing an HTML
+; formatted message, you will now have a link before the message body called "Allow
+; Images" that will reload the message part with external images visible.
+allow_external_image_sources=false
+
+
+;
+; Single server mode
+; ------------------
+; This setting restricts Cypht to only using a single email source (POP3 or
+; IMAP) and the default SMTP server defined in this file. It modifies the UI to
+; remove the ability to add other email sources, and removes the password
+; restriction when saving data between logins. You must use either IMAP or POP3
+; authentication for this setting to be enforced, and auth server will be the
+; single email source users have access to. If you enable this after users
+; have saved any settings, they will be lost (or if you disable it after they
+; have saved any settings). WARNING: USER SETTINGS SAVED TO THE SERVER WILL NOT
+; BE ENCRYPTED WITH THIS ENABLED
+single_server_mode=false
+
+
+; Integration options
+; -------------------
+; Cypht does a few things to make it more secure by default, but these features
+; can make it difficult to integrate Cypht into 3rd party software. Specifically,
+; Cypht disables PHP "super globals", and sets a restrictive PHP "open basedir"
+; setting, tweaks PHP ini settings to increase security, and uses a browser
+; "fingerprint" to improve session security. You can disable each with the
+; following options:
+
+; Don't empty PHP super globals
+disable_empty_superglobals=false
+
+; Don't apply open basedir restrictions
+disable_open_basedir=false
+
+; Don't tweak ini settings
+disable_ini_settings=false
+
+; Don't use a browser fingerprint
+disable_fingerprint=false
+
+; You can create your own custom authentication and session classes using the
+; site module set, however you might want those classes located somewhere else
+; outside of the Cypht code base. By setting session_type and auth_type to custom,
+; you can control what class is used with the following settings
+
+; auth_class=
+; session_class=
+
+
+; -----------------------------------------------------------------------------
+; DB Support
+; -----------------------------------------------------------------------------
+
+; Database Support
+; ----------------
+; Cypht can use a database for 3 different purposes: authentication, sessions,
+; and user settings. Each requires the following settings to be configured and
+; the correct table to be created. CREATE TABLE SQL statements for MySQL and
+; Postgresql are below.
+;
+; Connection type. Can be "host" to connect to a hostname, or "socket" to
+; connect to a unix socket.
+db_connection_type=host
+
+; Database host name or ip address. If db_connection_type is set to "socket",
+; this value is ignored
+db_host=127.0.0.1
+
+; Database port. Only needed if your database is running on a non-standard
+; port
+db_port=3306
+
+; If db_connection_type is set to "socket", this should be the filesystem
+; location of the unix socket file. If db_connection_type is set to "host"
+; this value is ignored.
+db_socket=/var/lib/mysqld/mysqld.sock
+
+; Name of the database with the required tables
+db_name=cypht
+
+; User to connect to the database with
+db_user=root
+
+; Password to connect to the database with
+db_pass=12345678
+
+; Database type. can be any supported PDO driver ; (http://php.net/manual/en/pdo.drivers.php)
+db_driver=mysql
+
+
+; DB Sessions
+; -----------
+; If your session_type is set to DB, the following table must exist in the DB
+; defined above, and the db user must have read-write access to it:
+;
+;  Postgresql:
+;   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, date timestamp);
+;
+;  MySQL or SQLite:
+;   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, date timestamp, primary key (hm_id));
+
+
+; DB Authentication
+; -----------------
+; If your auth_type is set to DB, the following table must exist in the DB
+; defined above, and the db user must have read-write access to it:
+;
+;  Postgresql:
+;   CREATE TABLE hm_user (username varchar(255) primary key not null, hash varchar(255));
+;
+;  MySQL or SQLite:
+;   CREATE TABLE hm_user (username varchar(250), hash varchar(250), primary key (username));
+
+
+; DB Settings
+; -----------
+; If your user_config_type is set to DB, the following table must exist in the
+; DB defined above, and the db user must have read-write access to it:
+;
+;  Postgresql:
+;   CREATE TABLE hm_user_settings (username varchar(250) primary key not null, settings text);
+;
+;  MySQL or SQLite:
+;   CREATE TABLE hm_user_settings(username varchar(250), settings longblob, primary key (username));
+
+
+; -----------------------------------------------------------------------------
+; Modules
+; -----------------------------------------------------------------------------
+
+; Module Sets
+; -----------
+; Cypht uses module sets to separate functionality in the program. Module sets
+; can be enabled and disabled independently by commenting out or uncommenting
+; the assignments below. Add a new assignment to enable your own module sets.
+
+
+; Core
+; ----
+; Handles page layout, login/logout, and the default settings pages. This set
+; is required.
+modules[]=core
+
+; Contacts
+; -------
+; Contact support. This module requires that at least one "backend" contacts
+; module be enabled (ldap_contacts, gmail_contacts, or local_contacts). You
+; can enable all the backends you want to support.
+modules[]=contacts
+
+; Local contact support. Simple, locally stored contacts backend
+modules[]=local_contacts
+
+; LDAP contact support. Use an LDAP server to store contacts. This module
+; uses its own ini file in modules/ldap_contacts/. This file must be edited
+; and moved to your app_data_dir to configure LDAP access.
+; modules[]=ldap_contacts
+
+; Gmail contact support. Read-only support for Gmail contacts. Only available
+; if you have a Gmail account enabled that uses OAuth2 authentication
+; modules[]=gmail_contacts
+
+; Feeds
+; -----
+; RSS/ATOM feed support
+modules[]=feeds
+
+; POP3
+; ----
+; POP3 email account support
+modules[]=pop3
+
+; IMAP
+; ----
+; IMAP email account support. If you want to use OAuth2 over IMAP (currently
+; only supported by Gmail and Outlook.com), you will need to edit the oauth2.ini
+; file in modules/imap/, and move it to your app_data_dir location.
+modules[]=imap
+
+; 2 factor authentication
+; -----------------------
+; This module enables 2 factor authentication using TOTP (compatible with
+; Google Authenticator). You must edit the ini file in modules/2fa/ to
+; configure a shared secret, then move that file to your app_data_dir.
+; modules[]=2fa
+
+; SMTP
+; ----
+; Send outbound email using SMTP servers
+modules[]=smtp
+
+; Account
+; ------
+; UI features for admins to create accounts, and for users to update passwords
+; (when using the built-in DB authentication)
+modules[]=account
+
+; Idle timer
+; ---------
+; Controls idle time and automatic logout
+modules[]=idle_timer
+
+; Desktop notifications
+; ---------------------
+; Enable desktop notifications for new messages
+; modules[]=desktop_notifications
+
+; Calendar
+; -------
+; Basic calendar
+modules[]=calendar
+
+; Themes
+; ------
+; Change the UI using CSS
+modules[]=themes
+
+; NUX
+; ---
+; Friendly new user experience. Quickly add common email services, and view
+; development updates
+modules[]=nux
+
+; Developer
+; ---------
+; For development, provides resources and installation details. Only available
+; in "debug mode"
+modules[]=developer
+
+; Github
+; ------
+; Github repository tracking. This module has its own ini file located in
+; modules/github/. You must edit this file, and move it to your app_data_dir
+; to establish communication with github.
+; modules[]=github
+
+; reCAPTCHA
+; ---------
+; Use the reCAPTCHA server on login. This module has its own ini file in
+; modules/recaptcha/. You must edit this file, and move it to the location
+; defined in app_data_dir to gain access to the WordPress notification API.
+; modules[]=recaptcha
+
+; WordPress
+; ---------
+; WordPress.com notifications. This module has its own ini file in
+; modules/wordpress/. You must edit this file, and move it to the location
+; defined in app_data_dir to gain access to the WordPress notification API.
+; modules[]=wordpress
+
+; History
+; -------
+; Simple list of messages read since login
+modules[]=history
+
+; Saved searches
+; --------------
+; Save and re-run searches easily
+modules[]=saved_searches
+
+; Advanced search
+; ---------------
+; Enable the advanced search form
+modules[]=advanced_search
+
+; Message highlighting
+; --------------------
+; Create custom rules to highlight messages in lists with different colors
+modules[] = highlights
+
+; NASA
+; ----
+; Access the NASA APOD API content
+; modules[]=nasa
+
+; Profiles
+; --------
+; Profiles to set reply-to, name, and signature to associated email accounts
+modules[]=profiles
+
+; Inline message
+; --------------
+; View messages inline in a reading pane instead of on a new page
+modules[]=inline_message
+
+; IMAP folders
+; -----------
+; Support for adding/renaming/deleting folders in IMAP accounts
+modules[]=imap_folders
+
+; Keyboard Shortcuts
+; ------------------
+; Enables configurable keyboard shortcuts for navigations and actions
+modules[]=keyboard_shortcuts
+
+; Site
+; ----
+; Site specific overrides. Used to control other module sets without hacking
+; the code.
+; modules[]=site
+
+; Dynamic login
+; -------------
+; Allows user to authenticate against a list of popular mail services, or to
+; auto-discover the services for the specified email address. The auth_type
+; setting must be set to "dynamic", otherwise this module set does not do
+; anything
+; modules[]=dynamic_login
+
+; API login
+; --------
+; Allows an API based login that returns a JSON response containing the session
+; and hm_id values needed to create a login session. You will need to set the
+; api_login_key value to something unique and include that in the POST request.
+; modules[]=api_login
+; api_login_key=
+
+; Recover settings
+; ----------------
+; When using IMAP or POP3 authentication, if a user's password is changed, we
+; can't decrypt the existing user settings. This module detects that situation
+; and provides a page where a user can enter their old and new passwords to
+; recover their previous settings.
+; modules[]=recover_settings
+
+; Hello World
+; -----------
+; Example module set with lots of comments
+; modules[]=hello_world
+
+
+; -----------------------------------------------------------------------------
+; User Defaults
+; All of these settings can be changed by users, but you can uncomment and set
+; the default behavior using the following options. This will only effect new
+; users or ones that have never saved their settings.
+;
+; Per source time limits have valid values of:
+; -1 day
+; -1 week
+; -2 weeks
+; -4 weeks
+; -6 weeks
+; -6 months
+; -1 year
+; -5 years
+;
+; Per source maximums can be from 1 to 1000
+; -----------------------------------------------------------------------------
+
+; If set to true, passwords for email accounts will never be saved between logins
+; Defaults to false
+; default_setting_no_password_save=false
+
+; Number of messages per page when viewing IMAP folders
+; Defaults to 20
+; default_setting_imap_per_page=20
+
+; Amount of IMAP message structure detail on the message view page
+; Defaults to full structure
+; default_setting_simple_msg_parts=false
+
+; Show icons for each IMAP message part type
+; Defaults to true
+; default_setting_msg_part_icons=true
+
+; Prefer text parts when viewing a message
+; Defaults to false
+; default_setting_text_only=false
+
+; Per source max for the combined sent view
+; Defaults to 20
+; default_setting_sent_per_source=20
+
+; Per source time limit for the combined sent view
+; Defaults to 1 week
+; default_setting_sent_since='-1 week'
+
+; Display source icons in message lists
+; Defaults to true
+; default_setting_show_list_icons=true
+
+; Redirect to this page on login
+; Defaults to none
+; default_setting_start_page=none
+
+; Don't prompt when deleting something
+; Defaults to false
+; default_setting_disable_delete_prompt=false
+
+; Hide icons in the folder list
+; Defaults to false
+; default_setting_no_folder_icons=false
+
+; Source max for the all email combined view
+; Defaults to 20
+; default_setting_all_email_per_source=20
+
+; Per source time limit for the all email combined view
+; Defaults to 1 week
+; default_setting_all_email_since='-1 week'
+
+; Per source time limit for the everything combined view
+; Defaults to 1 week
+; default_setting_all_since='-1 week'
+
+; Per source max for the everything combined view
+; Defaults to 20
+; default_setting_all_per_source=20
+
+; Per source max for the unread combined view
+; Defaults to 20
+; default_setting_unread_per_source=20
+
+; Per source max for the flagged combined view
+; Defaults to 20
+; default_setting_flagged_per_source=20
+
+; Per source time limit for the flagged combined view
+; Defaults to 1 week
+; default_setting_flagged_since='-1 week'
+
+; Per source time limit for the unread combined view
+; Defaults to 1 week
+; default_setting_unread_since='-1 week'
+
+; Timezone for date displays
+; Defaults to UTC
+; default_setting_timezone='UTC'
+
+; Message list format style
+; Defaults to email client style
+; default_setting_list_style='email_style'
+
+; Interface language
+; Defaults to en (English)
+; default_setting_language='en'
+
+; Hide new news feed items from the unread combined view
+; Defaults to false
+; default_setting_unread_exclude_feeds=false
+
+; Per source max for news feeds
+; Defaults to 20
+; default_setting_feed_limit=20
+
+; Per source time limit for news feeds
+; Defaults to 1 week
+; default_setting_feed_since='-1 week'
+
+; Toggle between plain text or HTML formatted mail on the compose page
+; Defaults to 0 (plain text)
+; default_setting_smtp_compose_type=0
+
+; BCC a copy of outbound mail to the sender
+; Defaults to false
+; default_setting_smtp_auto_bcc=false
+
+; UI theme
+; Defaults to the default white one ("White Bread")
+; default_setting_theme='default'
+
+; Hide WordPress notifications from the unread combined view
+; Defaults to false
+; default_setting_unread_exclude_wordpress=false
+
+; Time limit for WordPress notifications
+; Defaults to 1 week
+; default_setting_wordpress_since='-1 week'
+
+; Hide Github notifications from the unread combined view
+; Defaults to false
+; default_setting_unread_exclude_github=false
+
+; Max per source for Github notifications
+; Defaults to 20
+; default_setting_github_limit=20
+
+; Per source time limit for Github notifications
+; Defaults to 1 week
+; default_setting_github_since='-1 weeks'
+
+; Display message details inline from the message list
+; Defaults to false
+; default_setting_inline_message=false
+
+; Enable keyboard shortcuts
+; Defaults to false
+; default_setting_enable_keyboard_shortcuts=1
diff --git a/hm3.rc b/hm3.rc
new file mode 100644
index 0000000000..c21c4fee36
--- /dev/null
+++ b/hm3.rc
@@ -0,0 +1 @@
+{"session_type":"PHP","auth_type":"DB","ldap_auth_server":"localhost","ldap_auth_port":"389","ldap_auth_tls":"","ldap_auth_base_dn":"example,dc=com","imap_auth_name":"localhost","imap_auth_server":"localhost","imap_auth_port":"143","imap_auth_tls":"","pop3_auth_name":"localhost","pop3_auth_server":"localhost","pop3_auth_port":"110","pop3_auth_tls":"","default_smtp_name":"","default_smtp_server":"","default_smtp_port":"","default_smtp_tls":"","default_smtp_no_auth":"","user_config_type":"file","user_settings_dir":"\/var\/lib\/hm3\/users","attachment_dir":"\/var\/lib\/hm3\/attachments","app_data_dir":"\/var\/lib\/hm3\/app_data","disable_origin_check":"","admin_users":"","cookie_domain":"","cookie_path":"","default_email_domain":"","autocreate_profile":"","redirect_after_login":"","app_name":"Cypht","always_mobile_ui":"","default_language":"en","js_compress":"","css_compress":"","enable_redis":"1","redis_server":"127.0.0.1","redis_port":"6379","redis_index":"1","redis_pass":"","redis_socket":"\/var\/run\/redis\/redis-server.sock","enable_memcached":"1","memcached_server":"127.0.0.1","memcached_port":"11211","memcached_auth":"","memcached_user":"","memcached_pass":"","allow_long_session":"","long_session_lifetime":"30","encrypt_ajax_requests":"","encrypt_local_storage":"","disable_ip_check":"","allow_external_image_sources":"","single_server_mode":"","disable_empty_superglobals":"","disable_open_basedir":"","disable_ini_settings":"","disable_fingerprint":"","db_connection_type":"host","db_host":"127.0.0.1","db_port":"3306","db_socket":"\/var\/lib\/mysqld\/mysqld.sock","db_name":"cypht","db_user":"root","db_pass":"12345678","db_driver":"mysql","modules":["core","contacts","local_contacts","feeds","pop3","imap","smtp","account","idle_timer","calendar","themes","nux","developer","history","saved_searches","advanced_search","highlights","profiles","inline_message","imap_folders","keyboard_shortcuts"],"version":0.1,"oauth2.ini":{"gmail":{"client_id":"904001166467-4at4cfbvg4u0vneab9evkid5jmv1aqap.apps.googleusercontent.com","client_secret":"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","client_uri":"http:\/\/localhost:8888\/AvanTech\/cypht\/","auth_uri":"https:\/\/accounts.google.com\/o\/oauth2\/auth","token_uri":"https:\/\/www.googleapis.com\/oauth2\/v3\/token","refresh_uri":"https:\/\/www.googleapis.com\/oauth2\/v3\/token"},"outlook":{"client_id":"","client_secret":"","client_uri":"","auth_uri":"https:\/\/login.live.com\/oauth20_authorize.srf","token_uri":"https:\/\/login.live.com\/oauth20_token.srf","refresh_uri":"https:\/\/login.live.com\/oauth20_token.srf"}},"handler_modules":{"home":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"load_smtp_servers_from_config":["smtp",true],"check_missing_passwords":["core",true],"message_list_type":["core",true],"process_oauth2_authorization":["nux",true],"nux_homepage_data":["nux",true],"nux_dev_news":["nux",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"servers":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"process_add_pop3_server":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"save_pop3_servers":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"process_add_feed":["feeds",true],"add_feeds_to_page_data":["feeds",true],"save_feeds":["feeds",true],"message_list_type":["core",true],"process_add_imap_server":["imap",true],"process_add_jmap_server":["imap",true],"save_imap_servers":["imap",true],"language":["core",true],"load_smtp_servers_from_config":["smtp",true],"process_add_smtp_server":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"save_smtp_servers":["smtp",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"reload_folder_cookie":["core",true],"logout":["core",true],"http_headers":["core",true]},"compose":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"imap_forward_attachments":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"special_folders":["imap_folders",true],"load_smtp_is_imap_forward":["smtp",true],"smtp_from_replace":["smtp",true],"load_smtp_is_imap_draft":["smtp",true],"load_smtp_reply_to_details":["smtp",true],"load_smtp_servers_from_config":["smtp",true],"compose_profile_data":["profiles",true],"process_compose_form_submit":["smtp",true],"imap_mark_as_answered":["imap",true],"imap_save_sent":["imap",true],"imap_unflag_on_send":["imap",true],"add_smtp_servers_to_page_data":["smtp",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"process_send_to_contact":["contacts",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"save":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"process_save_form":["core",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"settings":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"process_idle_time_setting":["idle_timer",true],"process_imap_per_page_setting":["imap",true],"process_unread_on_open":["imap",true],"process_enable_simple_download_options":["imap",true],"process_pagination_links":["imap",true],"process_simple_msg_parts":["imap",true],"process_msg_part_icons":["imap",true],"process_text_only_setting":["imap",true],"process_original_folder_setting":["imap",true],"process_sent_source_max_setting":["imap",true],"process_sent_since_setting":["imap",true],"process_show_list_icons":["core",true],"process_mailto_handler_setting":["core",true],"process_default_sort_order_setting":["core",true],"process_start_page_setting":["core",true],"process_no_password_setting":["core",true],"process_delete_prompt_setting":["core",true],"process_hide_folder_icons":["core",true],"process_all_email_source_max_setting":["core",true],"process_all_email_since_setting":["core",true],"process_all_since_setting":["core",true],"process_all_source_max_setting":["core",true],"process_unread_source_max_setting":["core",true],"process_flagged_source_max_setting":["core",true],"process_flagged_since_setting":["core",true],"process_unread_since_setting":["core",true],"process_timezone_setting":["core",true],"process_list_style_setting":["core",true],"process_language_setting":["core",true],"reset_factory":["core",true],"process_unread_feeds_setting":["feeds",true],"process_feed_limit_setting":["feeds",true],"process_feed_since_setting":["feeds",true],"process_compose_type":["smtp",true],"process_auto_bcc":["smtp",true],"process_theme_setting":["themes",true],"process_inline_message_setting":["inline_message",true],"process_inline_message_style":["inline_message",true],"process_enable_shortcut_setting":["keyboard_shortcuts",true],"save_user_settings":["core",true],"attachment_dir":["smtp",true],"reload_folder_cookie":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"message_list":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"highlight_list_data":["highlights",true],"load_feeds_from_config":["feeds",true],"load_feeds_for_message_list":["feeds",true],"default_sort_order_setting":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"search":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_search":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"save_searches_data":["saved_searches",true],"load_feeds_from_config":["feeds",true],"load_feeds_for_search":["feeds",true],"default_sort_order_setting":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_for_search":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"advanced_search":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"default_sort_order_setting":["core",true],"message_list_type":["advanced_search",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"advanced_search_prepare":["advanced_search",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_reset_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"reset_search":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"message":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"add_feeds_to_page_data":["feeds",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"imap_show_message":["imap",true],"imap_download_message":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"notfound":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_message_action":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_message_action":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"imap_oauth2_token_check":["imap",true],"load_pop3_servers_from_config":["pop3",true],"pop3_message_action":["pop3",true],"save_pop3_servers":["pop3",true],"load_feeds_from_config":["feeds",true],"feed_message_action":["feeds",true],"save_feeds":["feeds",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_server_pw":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["imap",true],"load_pop3_servers_from_config":["pop3",true],"check_missing_passwords":["core",true],"process_pw_update":["core",true],"save_imap_servers":["imap",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_hm_folders":{"login":["core",false],"check_internal_users":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"get_shortcut_setting":["keyboard_shortcuts",true],"imap_folder_check":["imap_folders",true],"saved_search_folder_data":["saved_searches",true],"load_theme":["themes",true],"load_imap_servers_from_config":["imap",true],"smtp_auto_bcc_check":["smtp",true],"add_imap_servers_to_page_data":["imap",true],"load_imap_folders":["imap",true],"imap_oauth2_token_check":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_folders":["pop3",true],"load_feeds_from_config":["feeds",true],"add_feeds_to_page_data":["feeds",true],"load_feed_folders":["feeds",true],"check_folder_icon_setting":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_test":{"login":["core",false],"load_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"contacts":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"process_edit_contact":["local_contacts",true],"load_edit_contact":["local_contacts",true],"process_add_contact":["local_contacts",true],"message_list_type":["contacts",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_imap_message_content":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_bust_cache":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_message_content":["imap",true],"find_message_contacts":["contacts",true],"history_record_imap_message":["history",true],"vcalendar_check":["calendar",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"close_session_early":["core",true]},"ajax_add_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"language":["core",true],"process_add_contact_from_message":["local_contacts",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_autocomplete_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"autocomplete_contact":["contacts",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_delete_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"language":["core",true],"process_delete_contact":["local_contacts",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"info":[],"ajax_feed_combined":{"login":["core",false],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"message_list_type":["core",true],"feed_list_type":["feeds",true],"load_feeds_from_config":["feeds",true],"close_session_early":["core",true],"feed_list_content":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_item_content":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"feed_item_content":["feeds",true],"history_record_feed_message":["history",true],"save_feeds":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_debug":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"delete_feed":["feeds",true],"feed_connect":["feeds",true],"save_feeds":["feeds",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_status":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"close_session_early":["core",true],"feed_status":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_folder_display":{"login":["core",false],"load_user_data":["core",true],"load_theme":["themes",true],"load_pop3_servers_from_config":["pop3",true],"language":["core",true],"message_list_type":["core",true],"pop3_message_list_type":["pop3",true],"close_session_early":["core",true],"pop3_folder_page":["pop3",true],"save_pop3_cache":["pop3",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_message_display":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"pop3_message_content":["pop3",true],"history_record_pop3_message":["history",true],"save_pop3_servers":["pop3",true],"save_pop3_cache":["pop3",true],"close_session_early":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_status":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"close_session_early":["core",true],"pop3_status":["pop3",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_debug":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"pop3_connect":["pop3",true],"pop3_delete":["pop3",true],"pop3_forget":["pop3",true],"pop3_save":["pop3",true],"save_pop3_servers":["pop3",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_mark_as_read":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_mark_as_read":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_debug":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_hide":["imap",true],"imap_connect":["imap",true],"imap_delete":["imap",true],"imap_forget":["imap",true],"imap_save":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"save_user_data":["core",true]},"ajax_imap_flag_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"flag_imap_message":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true]},"ajax_imap_sent":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_sent":["imap",true],"save_imap_cache":["imap",true]},"ajax_imap_folder_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_folder_status":["imap",true]},"ajax_imap_unread":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_unread":["imap",true],"save_imap_cache":["imap",true]},"ajax_imap_update_combined_source":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"process_imap_source_update":["imap",true],"close_session_early":["core",true]},"ajax_imap_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_status":["imap",true]},"ajax_imap_move_copy_action":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_process_move":["imap",true],"save_imap_cache":["imap",true],"close_session_early":["core",true]},"ajax_imap_flagged":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_flagged":["imap",true]},"ajax_imap_delete_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_delete_message":["imap",true]},"ajax_imap_archive_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_archive_message":["imap",true]},"ajax_imap_folder_expand":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_folder_expand":["imap",true],"add_folder_manage_link":["imap_folders",true],"save_imap_cache":["imap",true]},"ajax_imap_folder_display":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_folder_page":["imap",true],"save_imap_cache":["imap",true],"close_session_early":["core",true]},"ajax_imap_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"default_sort_order_setting":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_search":["imap",true]},"ajax_adv_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"process_adv_search_request":["advanced_search",true],"default_sort_order_setting":["core",true],"language":["core",true],"date":["core",true],"advanced_search_prepare":["advanced_search",true],"http_headers":["core",true]},"ajax_imap_combined_inbox":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_combined_inbox":["imap",true]},"ajax_imap_all_email":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_combined_inbox":["imap",true]},"functional_api":{"default_smtp_server":["smtp",true]},"profiles":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_smtp_servers_from_config":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"profile_data":["profiles",true],"process_profile_delete":["profiles",true],"process_profile_update":["profiles",true],"profile_edit_data":["profiles",true],"message_list_type":["profiles",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_smtp_debug":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"smtp_connect":["smtp",true],"smtp_delete":["smtp",true],"smtp_forget":["smtp",true],"smtp_save":["smtp",true],"save_smtp_servers":["smtp",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_smtp_save_draft":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["imap",true],"compose_profile_data":["profiles",true],"load_imap_servers_from_config":["imap",true],"smtp_save_draft":["smtp",true],"date":["core",true],"http_headers":["core",true]},"ajax_get_test_chunk":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["imap",true],"load_imap_servers_from_config":["imap",true],"get_test_chunk":["smtp",true]},"ajax_upload_chunk":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["smtp",true],"compose_profile_data":["profiles",true],"upload_chunk":["smtp",true]},"ajax_smtp_delete_draft":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"process_delete_draft":["smtp",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_profiles_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"profile_status":["smtp",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_clear_attachment_chunks":{"login":["core",false],"load_user_data":["core",true],"clear_attachment_chunks":["smtp",true]},"accounts":{"stay_logged_in":["core",false],"login":["core",false],"check_internal_users":["account",true],"account_list":["account",true],"process_create_account":["account",true],"process_delete_account":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["account",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"change_password":{"stay_logged_in":["core",false],"login":["core",false],"check_internal_users":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"process_change_password":["account",true],"message_list_type":["account",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_no_op":{"login":["core",false],"load_user_data":["core",true],"process_idle_time":["idle_timer",true],"date":["core",true],"http_headers":["core",true]},"calendar":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_calendar_date":["calendar",true],"process_delete_event":["calendar",true],"process_add_event":["calendar",true],"message_list_type":["calendar",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_wordpess_notifications":[],"ajax_github_data":[],"ajax_nux_service_select":{"login":["core",false],"load_user_data":["core",true],"setup_nux":["nux",true],"process_nux_service":["nux",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_nux_add_service":{"login":["core",false],"load_user_data":["core",true],"setup_nux":["nux",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["imap",true],"process_nux_add_service":["nux",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"history":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"message_list_type":["history",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"load_message_history":["history",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_github_event_detail":[],"ajax_wp_notice_display":[],"ajax_save_search":{"login":["core",false],"load_user_data":["core",true],"save_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_search":{"login":["core",false],"load_user_data":["core",true],"update_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_delete_search":{"login":["core",false],"load_user_data":["core",true],"delete_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_save_search_label":{"login":["core",false],"load_user_data":["core",true],"update_save_search_label":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"highlights":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"message_list_type":["highlights",true],"language":["core",true],"highlight_process_form":["highlights",true],"highlight_page_data":["highlights",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_smtp_attach_file":[],"folders":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"folders_server_id":["imap_folders",true],"special_folders":["imap_folders",true],"message_list_type":["imap_folders",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_imap_folders_delete":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_delete":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_folders_rename":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_rename":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_folders_create":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_create":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_clear_special_folder":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_clear_special_folder":["imap_folders",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_special_folder":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_special_folder":["imap_folders",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_accept_special_folders":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_accept_special_folders":["imap_folders",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"shortcuts":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_edit_id":["keyboard_shortcuts",true],"process_edit_shortcut":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["keyboard_shortcuts",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]}},"output_modules":{"home":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"home_heading":["core",true],"home_password_dialogs":["core",true],"welcome_dialog":["nux",true],"nux_help":["nux",true],"nux_dev_news":["nux",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"servers":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"server_content_start":["core",true],"quick_add_section":["nux",true],"quick_add_dialog":["nux",true],"add_smtp_server_dialog":["smtp",true],"display_configured_smtp_servers":["smtp",true],"add_imap_server_dialog":["imap",true],"display_configured_imap_servers":["imap",true],"add_jmap_server_dialog":["imap",true],"display_configured_jmap_servers":["imap",true],"add_pop3_server_dialog":["pop3",true],"display_configured_pop3_servers":["pop3",true],"add_feed_dialog":["feeds",true],"display_configured_feeds":["feeds",true],"server_content_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"feed_ids":["feeds",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"compose":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"compose_form_draft_list":["smtp",true],"compose_signature_values":["profiles",true],"compose_form_start":["smtp",true],"compose_form_content":["smtp",true],"compose_signature_button":["profiles",true],"imap_unflag_on_send_controls":["imap",true],"compose_form_end":["smtp",true],"compose_form_attach":["smtp",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"save":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"save_form":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"settings":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"start_settings_form":["core",true],"start_general_settings":["core",true],"enable_shortcut_setting":["keyboard_shortcuts",true],"inline_message_setting":["inline_message",true],"inline_message_style":["inline_message",true],"compose_type_setting":["smtp",true],"attachment_setting":["smtp",true],"auto_bcc_setting":["smtp",true],"language_setting":["core",true],"theme_setting":["feeds",true],"timezone_setting":["core",true],"no_folder_icon_setting":["core",true],"mailto_handler_setting":["core",true],"msg_list_icons_setting":["core",true],"imap_msg_icons_setting":["imap",true],"original_folder_setting":["imap",true],"imap_unread_on_open":["imap",true],"imap_pagination_links":["imap",true],"imap_per_page_setting":["imap",true],"enable_simple_download_options":["imap",true],"imap_simple_msg_parts":["imap",true],"list_style_setting":["core",true],"idle_time_setting":["idle_timer",true],"text_only_setting":["imap",true],"delete_prompt_setting":["core",true],"no_password_setting":["core",true],"start_page_setting":["core",true],"default_sort_order_setting":["core",true],"start_unread_settings":["core",true],"unread_since_setting":["core",true],"unread_source_max_setting":["core",true],"unread_feeds_included":["feeds",true],"start_flagged_settings":["core",true],"flagged_since_setting":["core",true],"flagged_source_max_setting":["core",true],"start_everything_settings":["core",true],"all_since_setting":["core",true],"all_source_max_setting":["core",true],"start_all_email_settings":["core",true],"all_email_since_setting":["core",true],"all_email_source_max_setting":["core",true],"start_feed_settings":["feeds",true],"feed_since_setting":["feeds",true],"feed_limit_setting":["feeds",true],"start_sent_settings":["imap",true],"sent_since_setting":["imap",true],"sent_source_max_setting":["imap",true],"end_settings_form":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"message_list":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"highlight_css":["highlights",true],"content_section_start":["core",true],"imap_custom_controls":["imap",true],"move_copy_controls":["imap",true],"message_list_heading":["core",true],"nux_message_list_notice":["nux",true],"message_list_start":["core",true],"message_list_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"search":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"search_move_copy_controls":["core",true],"search_content_start":["core",true],"search_form_start":["core",true],"search_form_content":["core",true],"search_name_fld":["saved_searches",true],"advanced_search_link":["advanced_search",true],"search_form_end":["core",true],"update_search_icon":["saved_searches",true],"delete_search_icon":["saved_searches",true],"message_list_start":["core",true],"search_results_table_end":["core",true],"update_search_label_icon":["saved_searches",true],"save_search_icon":["saved_searches",true],"search_content_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"advanced_search":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"search_move_copy_controls":["core",true],"advanced_search_content_start":["advanced_search",true],"advanced_search_form_start":["advanced_search",true],"advanced_search_form_content":["advanced_search",true],"advanced_search_form_end":["advanced_search",true],"message_list_start":["advanced_search",true],"advanced_search_results_table_end":["advanced_search",true],"advanced_search_content_end":["advanced_search",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"message":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"message_start":["core",true],"message_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"notfound":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"notfound_content":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_hm_folders":{"filter_feed_folders":["feeds",true],"filter_pop3_folders":["pop3",true],"filter_imap_folders":["imap",true],"search_folders":["saved_searches",true],"folder_list_content_start":["core",true],"main_menu_start":["core",true],"search_from_folder_list":["core",true],"main_menu_content":["core",true],"contacts_page_link":["contacts",true],"compose_page_link":["smtp",true],"sent_folder_link":["smtp",true],"calendar_page_link":["calendar",true],"history_page_link":["history",true],"logout_menu_item":["core",true],"main_menu_end":["core",true],"email_menu_content":["core",true],"settings_menu_start":["core",true],"settings_servers_link":["core",true],"settings_site_link":["core",true],"settings_save_link":["core",true],"highlight_link":["highlights",true],"change_password_link":["account",true],"create_account_link":["account",true],"profile_page_link":["profiles",true],"folders_page_link":["imap_folders",true],"shortcuts_page_link":["keyboard_shortcuts",true],"settings_menu_end":["core",true],"folder_list_content_end":["core",true]},"contacts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"contacts_content_start":["contacts",true],"contacts_form":["contacts",true],"contacts_list":["contacts",true],"contacts_content_end":["contacts",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_imap_message_content":{"filter_message_headers":["imap",true],"add_message_contacts":["contacts",true],"filter_message_body":["imap",true],"filter_message_struct":["imap",true]},"ajax_autocomplete_contact":{"filter_autocomplete_list":["contacts",true]},"info":[],"ajax_feed_combined":{"filter_feed_list_data":["feeds",true]},"ajax_feed_item_content":{"filter_feed_item_content":["feeds",true]},"ajax_feed_status":{"filter_feed_status_data":["feeds",true]},"ajax_pop3_folder_display":{"filter_pop3_message_list":["pop3",true]},"ajax_pop3_message_display":{"filter_pop3_message_content":["pop3",true]},"ajax_pop3_status":{"filter_pop3_status_data":["pop3",true]},"ajax_imap_sent":{"filter_sent_data":["imap",true]},"ajax_imap_unread":{"filter_unread_data":["imap",true]},"ajax_imap_status":{"filter_imap_status_data":["imap",true]},"ajax_imap_flagged":{"filter_flagged_data":["imap",true]},"ajax_imap_folder_expand":{"filter_expanded_folder_data":["imap",true]},"ajax_imap_folder_display":{"filter_folder_page":["imap",true]},"ajax_imap_search":{"filter_imap_search":["imap",true]},"ajax_imap_combined_inbox":{"filter_combined_inbox":["imap",true]},"ajax_imap_all_email":{"filter_all_email":["imap",true]},"accounts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"create_form":["account",true],"user_list":["account",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"change_password":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"change_password":["account",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"calendar":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"add_cal_event_form":["calendar",true],"calendar_content":["calendar",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_nux_service_select":{"filter_service_select":["nux",true]},"history":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"history_heading":["history",true],"history_content":["history",true],"history_footer":["history",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_save_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_update_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_delete_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_update_save_search_label":{"filter_saved_search_result":["saved_searches",true]},"ajax_adv_search":{"filter_imap_advanced_search":["advanced_search",true]},"highlights":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"highlight_config_page":["highlights",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"profiles":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"profile_edit_form":["profiles",true],"profile_content":["profiles",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"folders":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"folders_content_start":["imap_folders",true],"folders_server_select":["imap_folders",true],"folders_create_dialog":["imap_folders",true],"folders_rename_dialog":["imap_folders",true],"folders_delete_dialog":["imap_folders",true],"folders_trash_dialog":["imap_folders",true],"folders_sent_dialog":["imap_folders",true],"folders_draft_dialog":["imap_folders",true],"folders_archive_dialog":["imap_folders",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"shortcuts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"start_shortcuts_page":["keyboard_shortcuts",true],"shortcut_edit_form":["keyboard_shortcuts",true],"shortcuts_content":["keyboard_shortcuts",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]}},"input_filters":{"allowed_output":{"date":[522,false],"formatted_folder_list":[516,false],"router_user_msgs":[522,16777216],"router_login_state":[258,false],"formatted_message_list":[516,16777216],"just_saved_credentials":[258,false],"just_forgot_credentials":[258,false],"deleted_server_id":[257,false],"msg_headers":[516,false],"msg_text":[516,false],"msg_parts":[516,false],"page_links":[516,false],"folder_status":[522,16777216],"contact_deleted":[257,false],"contact_suggestions":[522,16777216],"feed_connect_status":[522,false],"feed_connect_time":[522,false],"feed_detail_display":[516,false],"feed_status_display":[516,false],"feed_status_server_id":[257,false],"feed_server_ids":[522,false],"feed_msg_headers":[516,false],"feed_msg_text":[516,false],"pop3_connect_status":[522,false],"pop3_connect_time":[522,false],"pop3_detail_display":[522,false],"pop3_status_display":[516,false],"pop3_status_server_id":[257,false],"pop3_server_id":[257,false],"imap_connect_status":[522,false],"connect_status":[522,false],"auto_sent_folder":[522,false],"imap_connect_time":[522,false],"imap_detail_display":[516,false],"imap_status_display":[516,false],"imap_status_server_id":[257,false],"imap_expanded_folder_path":[522,false],"imap_expanded_folder_formatted":[516,false],"imap_server_ids":[522,false],"imap_server_id":[257,false],"combined_inbox_server_ids":[522,false],"imap_delete_error":[258,false],"move_count":[522,16777216],"show_pagination_links":[258,false],"file_details":[516,false],"draft_subject":[522,false],"draft_id":[257,false],"profile_value":[522,false],"msg_sent_and_archived":[258,false],"nux_service_step_two":[516,false],"nux_account_added":[258,false],"nux_server_id":[257,false],"nux_service_name":[522,false],"saved_search_result":[257,false],"new_saved_search_label":[522,false],"imap_folders_success":[257,false],"imap_special_name":[522,false]},"allowed_get":{"page":522,"msgs":522,"list_path":522,"list_parent":522,"list_page":257,"uid":522,"search_terms":516,"search_since":522,"search_fld":522,"filter":522,"sort":522,"keyword":522,"contact_id":257,"contact_page":257,"contact_type":522,"contact_source":522,"imap_server_id":257,"imap_download_message":258,"imap_show_message":258,"imap_msg_part":522,"imap_draft":257,"reply":257,"reply_all":257,"forward":257,"draft_id":257,"hm_ajax_hook":522,"compose_to":522,"mailto_uri":522,"compose_from":522,"resumableChunkNumber":257,"resumableTotalChunks":257,"resumableChunkSize":257,"resumableCurrentChunkSize":257,"resumableTotalSize":257,"resumableType":522,"resumableIdentifier":522,"resumableFilename":522,"resumableRelativePath":522,"draft_smtp":522,"date":522,"view":522,"action":522,"code":522,"state":522,"error":522,"security_token":522,"search_name":522,"profile_id":257,"edit_id":257},"allowed_cookie":{"CYPHTID":522,"hm_id":522,"hm_session":522,"hm_msgs":522,"hm_reload_folders":257},"allowed_post":{"payload":522,"reset_factory":522,"hm_page_key":522,"logout":258,"save_and_logout":258,"limit":257,"username":522,"show_list_icons":258,"password":516,"hm_ajax_hook":522,"save_settings":522,"save_settings_permanently":522,"save_settings_permanently_then_logout":522,"language":522,"flagged_per_source":257,"flagged_since":522,"unread_per_source":257,"unread_since":522,"all_email_per_source":257,"all_email_since":522,"all_per_source":257,"all_since":522,"no_folder_icons":258,"mailto_handler":258,"list_style":522,"timezone":522,"disable_delete_prompt":257,"section_state":522,"section_class":522,"message_ids":522,"action_type":522,"server_pw_id":522,"message_list_since":522,"no_password_save":258,"start_page":522,"default_sort_order":522,"stay_logged_in":258,"contact_email":522,"contact_name":522,"contact_phone":522,"contact_id":257,"contact_value":522,"edit_contact":522,"add_contact":522,"contact_source":522,"contact_type":522,"feed_id":257,"delete_feed":257,"feed_connect":257,"feed_server_ids":522,"submit_feed":522,"new_feed_name":522,"feed_delete":257,"new_feed_address":522,"unread_exclude_feeds":257,"feed_list_path":522,"feed_uid":522,"feed_since":522,"feed_limit":257,"feed_search":257,"new_pop3_name":522,"new_pop3_address":522,"new_pop3_port":522,"pop3_connect":257,"pop3_forget":257,"pop3_save":257,"pop3_delete":257,"submit_pop3_server":522,"pop3_server_id":257,"pop3_server_ids":522,"pop3_user":522,"pop3_pass":516,"pop3_list_path":522,"pop3_uid":257,"pop3_limit":257,"pop3_since":522,"pop3_unread_only":258,"pop3_search":257,"server_port":257,"server":522,"imap_server_id":257,"imap_server_ids":522,"imap_user":522,"imap_pass":516,"text_only":258,"msg_part_icons":258,"simple_msg_parts":258,"pagination_links":258,"imap_per_page_setting":258,"unread_on_open":258,"imap_allow_images":258,"imap_delete":522,"imap_connect":522,"imap_remember":257,"imap_folder_ids":522,"imap_forget":522,"imap_save":522,"submit_imap_server":522,"submit_jmap_server":522,"new_jmap_address":518,"new_jmap_name":522,"new_imap_address":522,"new_imap_hidden":258,"new_imap_port":257,"new_imap_name":522,"sieve_config_host":522,"imap_sieve_host":522,"tls":258,"folder":522,"force_update":258,"imap_folder_state":516,"imap_msg_uid":522,"imap_msg_part":522,"imap_prefetch":258,"hide_imap_server":258,"imap_flag_state":522,"combined_source_state":257,"list_path":522,"imap_move_ids":522,"imap_move_to":522,"imap_move_action":522,"sent_since":522,"sent_per_source":522,"imap_move_page":522,"compose_unflag_send":258,"imap_per_page":257,"original_folder":258,"post_archive":257,"attachment_id":522,"smtp_compose_type":257,"new_smtp_name":522,"new_smtp_address":522,"new_smtp_port":522,"smtp_connect":257,"smtp_forget":257,"smtp_save":257,"smtp_delete":257,"smtp_send":257,"submit_smtp_server":522,"smtp_server_id":257,"smtp_user":522,"smtp_pass":516,"delete_uploaded_files":258,"compose_to":516,"compose_msg_path":522,"compose_msg_uid":257,"compose_body":516,"compose_subject":516,"compose_in_reply_to":516,"compose_cc":516,"compose_bcc":516,"compose_smtp_id":522,"draft_id":257,"draft_body":516,"draft_subject":516,"draft_to":516,"draft_smtp":522,"draft_cc":516,"draft_bcc":516,"draft_in_reply_to":516,"draft_notice":258,"smtp_auto_bcc":257,"profile_value":522,"uploaded_files":522,"send_uploaded_files":522,"next_email_post":522,"create_username":522,"create_password":516,"create_password_again":516,"delete_username":522,"new_pass1":516,"new_pass2":516,"old_pass":516,"change_password":522,"idle_time":257,"event_title":522,"event_detail":522,"event_date":522,"event_time":522,"event_repeat":522,"delete_id":522,"theme_setting":522,"nux_service":522,"nux_email":522,"nux_name":522,"nux_pass":516,"nux_account_name":522,"search_name":522,"search_terms":522,"search_fld":522,"search_since":522,"search_terms_label":522,"old_search_terms_label":522,"adv_source":522,"adv_start":522,"adv_source_limit":257,"adv_end":522,"adv_charset":522,"adv_flags":{"filter":522,"flags":16777216},"adv_terms":{"filter":522,"flags":16777216},"adv_targets":{"filter":522,"flags":16777216},"rule_del_id":257,"hl_target":522,"hl_color":522,"hl_source_type":522,"hl_important":258,"hl_feeds_unseen":258,"hl_github_unseen":258,"hl_imap_flags":{"filter":522,"flags":16777216},"hl_imap_sources":{"filter":522,"flags":16777216},"hl_github_sources":{"filter":522,"flags":16777216},"hl_feeds_sources":{"filter":522,"flags":16777216},"profile_name":522,"profile_id":257,"profile_replyto":522,"profile_smtp":522,"profile_imap":522,"profile_default":257,"profile_address":522,"profile_sig":516,"profile_delete":522,"inline_message":257,"inline_message_style":522,"parent":522,"new_folder":522,"special_folder_type":522,"imap_service_name":522,"enable_keyboard_shortcuts":257,"shortcut_meta":{"filter":522,"flags":67108864},"shortcut_key":257,"shortcut_id":257},"allowed_server":{"REQUEST_URI":522,"REQUEST_METHOD":522,"SERVER_ADDR":275,"REMOTE_ADDR":275,"SERVER_PORT":257,"SERVER_PROTOCOL":522,"PHP_SELF":522,"REQUEST_SCHEME":522,"HTTP_HOST":522,"HTTP_ORIGIN":273,"HTTP_REFERER":273,"HTTP_ACCEPT_LANGUAGE":522,"HTTP_ACCEPT_ENCODING":522,"HTTP_ACCEPT_CHARSET":522,"HTTP_ACCEPT":522,"HTTP_USER_AGENT":522,"HTTPS":522,"SERVER_NAME":522,"HTTP_X_REQUESTED_WITH":522,"HTTP_X_FORWARDED_HOST":522},"allowed_pages":["save","home","compose","message_list","message","settings","servers","ajax_test","ajax_hm_folders","ajax_message_action","ajax_reset_search","ajax_update_server_pw","ajax_no_op","notfound","search","contacts","ajax_add_contact","ajax_delete_contact","ajax_autocomplete_contact","ajax_feed_combined_inbox","ajax_feed_list_display","ajax_feed_item_content","ajax_feed_combined","ajax_feed_debug","ajax_feed_status","ajax_pop3_debug","ajax_pop3_message_display","ajax_pop3_folder_display","ajax_pop3_unread","ajax_pop3_status","ajax_imap_debug","ajax_imap_status","ajax_imap_unread","ajax_imap_sent","ajax_imap_flagged","ajax_imap_folder_expand","ajax_imap_folder_display","ajax_imap_combined_inbox","ajax_imap_search","ajax_unread_count","ajax_imap_message_content","ajax_imap_save_folder_state","ajax_imap_message_action","ajax_imap_delete_message","ajax_imap_archive_message","ajax_imap_flag_message","ajax_imap_update_combined_source","ajax_imap_mark_as_read","ajax_imap_move_copy_action","ajax_imap_folder_status","ajax_clear_attachment_chunks","ajax_smtp_debug","ajax_smtp_save_draft","ajax_smtp_delete_draft","ajax_profiles_status","ajax_get_test_chunk","ajax_upload_chunk","accounts","change_password","ajax_no_op","calendar","ajax_nux_service_select","ajax_nux_add_service","history","ajax_save_search","ajax_update_search","ajax_delete_search","ajax_update_save_search_label","advanced_search","ajax_adv_search","highlights","profiles","folders","ajax_imap_folders_delete","ajax_imap_folders_create","ajax_imap_folders_rename","ajax_imap_special_folder","ajax_imap_clear_special_folder","ajax_imap_accept_special_folders","shortcuts"]}}
\ No newline at end of file

From 55f92026a89769d6d562539e56680457c7783bd1 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 27 Feb 2024 22:08:35 +0100
Subject: [PATCH 34/55] Fix: replace FILTER_SANITIZE_FULL_SPECIAL_CHARS by
 FILTER_DEFAULT

---
 modules/core/setup.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/core/setup.php b/modules/core/setup.php
index d71fd25b16..fe05b628e0 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -209,7 +209,7 @@
         'formatted_message_list' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY),
         'just_saved_credentials' => array(FILTER_VALIDATE_BOOLEAN, false),
         'just_forgot_credentials' => array(FILTER_VALIDATE_BOOLEAN, false),
-        'deleted_server_id' => array(FILTER_SANITIZE_FULL_SPECIAL_CHARS, false),
+        'deleted_server_id' => array(FILTER_DEFAULT, false),
         'msg_headers' => array(FILTER_UNSAFE_RAW, false),
         'msg_text' => array(FILTER_UNSAFE_RAW, false),
         'msg_parts' => array(FILTER_UNSAFE_RAW, false),
@@ -304,29 +304,29 @@
         'trash_per_source' => FILTER_VALIDATE_INT,
         'trash_since' => FILTER_DEFAULT,
         'drafts_per_source' => FILTER_DEFAULT,
-        'drafts_since' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'drafts_since' => FILTER_DEFAULT,
         'warn_for_unsaved_changes' => FILTER_VALIDATE_BOOLEAN,
-        'srv_setup_stepper_profile_name'  => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'srv_setup_stepper_email' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_profile_name'  => FILTER_DEFAULT,
+        'srv_setup_stepper_email' => FILTER_DEFAULT,
         'srv_setup_stepper_password' => FILTER_UNSAFE_RAW,
-        'srv_setup_stepper_provider' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_provider' => FILTER_DEFAULT,
         'srv_setup_stepper_is_sender' => FILTER_VALIDATE_BOOLEAN,
         'srv_setup_stepper_is_receiver' => FILTER_VALIDATE_BOOLEAN,
-        'srv_setup_stepper_smtp_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'srv_setup_stepper_smtp_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_smtp_address' => FILTER_DEFAULT,
+        'srv_setup_stepper_smtp_port' => FILTER_DEFAULT,
         'srv_setup_stepper_smtp_tls' => FILTER_VALIDATE_BOOLEAN,
-        'srv_setup_stepper_imap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'srv_setup_stepper_imap_port' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_imap_address' => FILTER_DEFAULT,
+        'srv_setup_stepper_imap_port' => FILTER_DEFAULT,
         'srv_setup_stepper_imap_tls' => FILTER_VALIDATE_BOOLEAN,
         'srv_setup_stepper_enable_sieve' => FILTER_VALIDATE_BOOLEAN,
         'srv_setup_stepper_create_profile' => FILTER_VALIDATE_BOOLEAN,
         'srv_setup_stepper_profile_is_default' => FILTER_VALIDATE_BOOLEAN,
-        'srv_setup_stepper_profile_signature' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'srv_setup_stepper_profile_reply_to' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
-        'srv_setup_stepper_imap_sieve_host' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'srv_setup_stepper_profile_signature' => FILTER_DEFAULT,
+        'srv_setup_stepper_profile_reply_to' => FILTER_DEFAULT,
+        'srv_setup_stepper_imap_sieve_host' => FILTER_DEFAULT,
         'srv_setup_stepper_only_jmap' => FILTER_VALIDATE_BOOLEAN,
         'srv_setup_stepper_jmap_hide_from_c_page' => FILTER_VALIDATE_BOOLEAN,
-        'srv_setup_stepper_jmap_address' => FILTER_SANITIZE_FULL_SPECIAL_CHARS
+        'srv_setup_stepper_jmap_address' => FILTER_DEFAULT
     )
 );
 

From 6e4c9dd7632f14e455e0c10a261a95f8ffe2fd6a Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 27 Feb 2024 22:11:56 +0100
Subject: [PATCH 35/55] Fix: remove srv_setup_stepper_btn css class

---
 modules/core/site.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/core/site.css b/modules/core/site.css
index 453c94d6f3..52cf720354 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -327,7 +327,6 @@ div.unseen, .unseen .subject { font-weight: 700; }
     background-color: #888 !important;
 }
 
-.srv_setup_stepper_btn {width: 120px;height: 32px;padding: 0px 10px 0px 10px;background: #EBEBEB;color: #232323;border-color: #232323; border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: center;}
 .step_config-title {display: flex;align-items: center;gap: 10px;}
 .step_config-title > span {font-size: small;}
 .step_config-title > h2 {color: #777}
@@ -340,7 +339,6 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .step_config-form_item > textarea {width: 350px;height: 32px;padding: 4px 8px 4px 8px;background: #FFFFFF; border-color: #232323;border-width: 1px;border-style: solid;border-radius: 3px 3px 3px 3px;font-family: "Helvetica";font-weight: 400;font-size: 14px;text-align: left;}
 .step_config-form_item > select {height: 32px;}
 .step_config-actions {display: flex;justify-content: space-between;margin-top: 15px;}
-.srv_setup_stepper_btn:hover {cursor: pointer;}
 .stepper {display: flex;overflow: hidden;padding: 10px 30px 100px 30px;}
 .step_config {width: 100%;transition: transform 0.5s;display: none;}
 .current_config_step {display: block;}

From bcd89227d149a47651fb8a70c44b5b979d3e536f Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 27 Feb 2024 22:58:05 +0100
Subject: [PATCH 36/55] Fix: hide imap & smtp title if empty list

---
 modules/imap/output_modules.php |  8 +++++++-
 modules/smtp/modules.php        | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 6996cf20c1..27c23c151c 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -420,8 +420,14 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
+        $list = $this->get('imap_servers', array());
+
+        if (empty($list)) {
+            return '';
+        }
+
         $res = '<div class="subtitle mt-4">Imap & JMAP Serves</div>';
-        foreach ($this->get('imap_servers', array()) as $index => $vals) {
+        foreach ($list as $index => $vals) {
             $server_id = $vals['id'];
             $type = 'IMAP';
 
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 014001f002..4c2a756de9 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -1350,8 +1350,15 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
-        $res = '<div class="subtitle mt-4">SMTP Serves</div>';
-        foreach ($this->get('smtp_servers', array()) as $index => $vals) {
+
+        $list = $this->get('smtp_servers', array());
+
+        if (empty($list)) {
+            return '';
+        }
+
+        $res = '<div class="subtitle mt-4">SMTP Servers</div>';
+        foreach ($list as $index => $vals) {
 
             $no_edit = false;
 

From 66ee8b5e5bb87e3ad309c2de4f4be376c89ca5c9 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 29 Feb 2024 21:46:09 +0100
Subject: [PATCH 37/55] Fix: use hm-* functions

---
 modules/core/handler_modules.php | 28 +++++++-----
 modules/imap/functions.php       | 74 +++++++++++---------------------
 modules/profiles/functions.php   |  9 +---
 modules/profiles/modules.php     |  4 +-
 modules/smtp/functions.php       | 62 ++++++++++----------------
 5 files changed, 68 insertions(+), 109 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index fbaa1d634b..b0b9b756ce 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -1031,8 +1031,7 @@ public function process() {
                     return;
                 }
                 
-                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password);
-                $is_jmap_server_authenticated = authenticate_to_imap_server($email, $password, $this->jmap_server_id, $this);
+                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password, $this);
                 
                 Hm_Msgs::add("JMAP Server saved");
                 $this->out('just_saved_credentials', $this->just_saved_credentials);
@@ -1047,10 +1046,10 @@ public function process() {
                         return;
                     }
                     
-                    $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this, $errno = null, $errstr = null);
-                    $is_smtp_server_authenticated = authenticate_to_smtp_server($email, $password, $this->smtp_server_id, $this);
-                    
-                     if(!isset($this->smtp_server_id) || !$is_smtp_server_authenticated) return;
+                    $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this);
+                    if(!isset($this->smtp_server_id)){
+                        return;
+                    }
                  }
     
                  /*
@@ -1061,12 +1060,19 @@ public function process() {
                         Hm_Msgs::add("ERRIMAP module is not enabled");
                         return;
                      }
-                    
-                      $this->imap_server_id = connect_to_imap_server($imapAddress, $profileName, $imapPort, $email, $password, $imapTls, $imapSieveHost, $enableSieve, $this, $errno = null, $errstr = null);
-                      $is_imap_server_authenticated = authenticate_to_imap_server($email, $password, $this->imap_server_id, $this);
-                      
+
+                     $this->imap_server_id = connect_to_imap_server(
+                          $imapAddress,
+                          $profileName,
+                          $imapPort,
+                          $email,
+                          $password,
+                          $email,
+                          $imapSieveHost,
+                          $enableSieve,
+                          $this);
                       
-                      if(!isset($this->imap_server_id) || !$is_imap_server_authenticated) {
+                      if(!isset($this->imap_server_id)) {
                           if($isSender && isset($this->smtp_server_id)){
                                 delete_smtp_server($this->smtp_server_id, $this);
                           }
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index a6d4dce440..c6546b9bbb 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1418,31 +1418,31 @@ function parse_sieve_config_host($host) {
     return [$host, $port, $tls];
 }}
 
-if (!hm_exists('connect_to_imap_serve')) {
-    function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $context, $errno = null, $errstr = null) {
-        if ($con = fsockopen($address, $port, $errno, $errstr, 5)) {
-              $imap_list = array(
-                  'name' => $name,
-                  'server' => $address,
-                  'hide' => false,
-                  'port' => $port,
-                  'user' => $user,
-                  'pass' => $pass,
-                  'tls' => $tls);
-                  
-              Hm_IMAP_List::add($imap_list);
-              $servers = Hm_IMAP_List::dump(false, true);
-              $ids = array_keys($servers);
-              $imap_server_id = array_pop($ids);
-              
-             return $imap_server_id;
-        }
+if (!hm_exists('connect_to_imap_server')) {
+    function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $context) {
+        Hm_IMAP_List::init($context->user_config, $context->session);
+        $imap_list = array(
+            'name' => $name,
+            'server' => $address,
+            'hide' => false,
+            'port' => $port,
+            'user' => $user,
+            'pass' => $pass,
+            'tls' => $tls);
+
+        Hm_IMAP_List::add($imap_list);
+        $servers = Hm_IMAP_List::dump(false, true);
+        $ids = array_keys($servers);
+        $imap_server_id = array_pop($ids);
+        $server = Hm_IMAP_List::get($imap_server_id, false);
+
+        return Hm_IMAP_List::service_connect($imap_server_id, $server, $user, $pass, false);
     }
 }
 
 
-if (!hm_exists('connect_to_jmap_serve')) {
-    function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user, $pass) {
+if (!hm_exists('connect_to_jmap_server')) {
+    function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user, $pass, $context) {
        $hidden = false;
                        
        if($hide_from_c_page) {
@@ -1452,6 +1452,7 @@ function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user,
        $parsed = parse_url($jmap_address);
        
        if (array_key_exists('host', $parsed) && @get_headers($jmap_address)) {
+           Hm_IMAP_List::init($context->user_config, $context->session);
            Hm_IMAP_List::add(array(
                'name' => $name,
                'server' => $jmap_address,
@@ -1462,34 +1463,9 @@ function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user,
            $servers = Hm_IMAP_List::dump(false, true);
            $ids = array_keys($servers);
            $jmap_server_id = array_pop($ids);
-           
-           return $jmap_server_id;
-       }
-    }
-}
+           $server = Hm_IMAP_List::get($jmap_server_id, false);
 
-if (!hm_exists('authenticate_to_imap_server')) {
-    function authenticate_to_imap_server($user, $pass, $imap_server_id, $context) {
-        if (in_server_list('Hm_IMAP_List', $imap_server_id, $user)) {
-              Hm_Msgs::add('ERRThis server and username are already configured');
-              return;
-        } else{
-            Hm_IMAP_List::clean_up();
-            $cache = Hm_IMAP_List::get_cache($context->cache, $imap_server_id);
-            $imap = Hm_IMAP_List::connect($imap_server_id, $cache, $user, $pass, true);
-            
-            if (imap_authed($imap)) {
-                  $servers = Hm_IMAP_List::dump(false, true);
-                  $context->user_config->set('imap_servers', $servers);
-                  $context->just_saved_credentials = true;
-                  $context->session->record_unsaved(sprintf('%s server saved', $imap->server_type));
-                  return true;
-            }
-            else {
-                  Hm_Msgs::add("ERRUnable to save this server, are the username and password correct? ");
-                  Hm_IMAP_List::forget_credentials($context->imap_server_id);
-                  return;
-            }
-        }
+           return Hm_IMAP_List::service_connect($jmap_server_id, $server, $user, $pass, false);
+       }
     }
 }
diff --git a/modules/profiles/functions.php b/modules/profiles/functions.php
index b079b826a1..446341c2fa 100644
--- a/modules/profiles/functions.php
+++ b/modules/profiles/functions.php
@@ -15,13 +15,8 @@ function add_profile($name, $signature, $reply_to, $is_default, $email, $server_
             'user' => $email,
             'type' => 'imap'
         );
-       
-         $profiles = new Hm_Profiles($context);
-         $profiles->add($profile);
-         $context->session->record_unsaved('Profile added');
 
-         $profiles->save($context->user_config);
-         $user_data = $context->user_config->dump();
-         $context->session->set('user_data', $user_data);
+        Hm_Profiles::init($context);
+        Hm_Profiles::add($profile);
     }
 }
\ No newline at end of file
diff --git a/modules/profiles/modules.php b/modules/profiles/modules.php
index c6c4d00deb..ae87ddddde 100644
--- a/modules/profiles/modules.php
+++ b/modules/profiles/modules.php
@@ -257,9 +257,9 @@ protected function output() {
 
             foreach ($profiles as $id => $profile) {
                 $smtp = '';
-                    if ($profile['smtp_id'] !== false && array_key_exists($profile['smtp_id'], $smtp_servers)) {
+                   if (isset($profile['smtp_id']) && is_scalar($profile['smtp_id']) && array_key_exists($profile['smtp_id'], $smtp_servers)) {
                         $smtp = $smtp_servers[$profile['smtp_id']]['name'];
-                    }
+                   }
                 $res .= '<tr>'.
                     '<td>'.$this->html_safe($profile['name']).'</td>'.
                     '<td class="d-none d-sm-table-cell">'.$this->html_safe($profile['server']).'</td>'.
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index fc97299092..79463c208c 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -3,48 +3,30 @@
 
 if (!defined('DEBUG_MODE')) { die(); }
 
-if (!hm_exists('connect_to_smtp_serve')) {
-    function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $context, $errno = null, $errstr = null) {
-        if ($con = @fsockopen($address, $port, $errno, $errstr, 2)) {
-              Hm_SMTP_List::add( array(
-                  'name' => $name,
-                  'server' => $address,
-                  'port' => $port,
-                  'user' => $user,
-                  'pass' => $pass,
-                  'tls' => $tls));
-
-              $smtp_servers = Hm_SMTP_List::dump(false, true);
-              $ids = array_keys($smtp_servers);
-              $smtp_server_id = array_pop($ids);
-              
-              return $smtp_server_id;
-        }
-        
-        return null;
-    }
-}
+if (!hm_exists('add_and_connect_to_smtp_server')) {
+    function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $context) {
+        Hm_SMTP_List::init($context->user_config, $context->session);
+        $smtp_list = array(
+            'name' => $name,
+            'server' => $address,
+            'hide' => false,
+            'port' => $port,
+            'user' => $user,
+            'pass' => $pass,
+            'tls' => $tls);
 
-if (!hm_exists('authenticate_to_smtp_server')) {
-    function authenticate_to_smtp_server($user, $pass, $smtp_server_id, $context) {
-        if (in_server_list('Hm_SMTP_List', $smtp_server_id, $user)) {
-          Hm_Msgs::add('ERRThis SMTP server and username are already configured');
-          return false;
-       }
+        Hm_SMTP_List::add($smtp_list);
+        $servers = Hm_SMTP_List::dump(false, true);
+        $ids = array_keys($servers);
+        $smtp_server_id = array_pop($ids);
+        $server = Hm_SMTP_List::get($smtp_server_id, false);
 
-       $smtp = Hm_SMTP_List::connect($smtp_server_id, false, $user, $pass, true);
-       if (is_object($smtp) && $smtp->state == 'authed') {
-           $smtp_servers = Hm_SMTP_List::dump(false, true);
-           $context->user_config->set('smtp_servers', $smtp_servers);
-           $context->just_saved_credentials = true;
-           $context->session->record_unsaved('SMTP server saved');
-           return true;
-       }
-       else {
-           Hm_Msgs::add("ERRUnable to save this server, are the username and password correct?");
-           Hm_SMTP_List::forget_credentials($smtp_server_id);
-           return false;
-       }
+        $result = Hm_SMTP_List::service_connect($smtp_server_id, $server, $user, $pass, false);
+
+        $smtp_servers = Hm_SMTP_List::dump(false, true);
+        $context->user_config->set('smtp_servers', $smtp_servers);
+
+        return $result;
     }
 }
 

From 88a424f3cc1dcf55f91ff8cd9d7ab7fa12a88744 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Thu, 29 Feb 2024 21:46:36 +0100
Subject: [PATCH 38/55] Fix: hide smtp server accordions

---
 modules/smtp/setup.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
index 6e24e0b7d3..df0086c50b 100644
--- a/modules/smtp/setup.php
+++ b/modules/smtp/setup.php
@@ -29,7 +29,6 @@
 add_handler('servers', 'process_add_smtp_server', true, 'smtp', 'load_smtp_servers_from_config', 'after');
 add_handler('servers', 'add_smtp_servers_to_page_data', true, 'smtp', 'process_add_smtp_server', 'after');
 add_handler('servers', 'save_smtp_servers', true, 'smtp', 'add_smtp_servers_to_page_data', 'after');
-add_output('servers', 'add_smtp_server_dialog', true, 'smtp', 'quick_add_dialog', 'after');
 add_output('servers', 'stepper_setup_server_smtp', true, 'smtp', 'server_config_stepper', 'after');
 add_output('servers', 'display_configured_smtp_servers', true, 'smtp', 'server_config_stepper_accordion_end_part', 'before');
 

From f09ce209abf2349beec2e2405279103f6b3ae4e3 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 3 Mar 2024 12:38:15 +0100
Subject: [PATCH 39/55] Ref: add sieve check

---
 modules/imap/functions.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index befa94a33f..5f5b233744 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1438,12 +1438,30 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
             'pass' => $pass,
             'tls' => $tls);
 
+        if (isset($imap_sieve_host) && $imap_sieve_host) {
+            $imap_list['sieve_config_host'] = $imap_sieve_host;
+        }
+
         Hm_IMAP_List::add($imap_list);
         $servers = Hm_IMAP_List::dump(false, true);
         $ids = array_keys($servers);
         $imap_server_id = array_pop($ids);
         $server = Hm_IMAP_List::get($imap_server_id, false);
 
+        if ($enableSieve &&
+            isset($imap_sieve_host) &&
+            $context->module_is_supported('sievefilters') &&
+            $context->user_config->get('enable_sieve_filter_setting', true)) {
+            try {
+                list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
+                $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
+                $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
+            } catch (Exception $e) {
+                Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
+                return;
+            }
+        }
+
         return Hm_IMAP_List::service_connect($imap_server_id, $server, $user, $pass, false);
     }
 }

From fe772902bf57c66b71b36dc78e0d0dcf52858b77 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 10 Mar 2024 19:50:00 +0100
Subject: [PATCH 40/55] Ref: Change notification component

---
 modules/core/handler_modules.php |  5 ++---
 modules/core/output_modules.php  |  6 +++---
 modules/core/site.js             | 18 +++++++++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index b0b9b756ce..38880fc879 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -969,7 +969,6 @@ class Hm_Handler_quick_servers_setup extends Hm_Handler_Module {
     public $smtp_server_id = null;
     public $imap_server_id = null;
     public $jmap_server_id = null;
-    public $just_saved_credentials = false;
 
     public function process() {
         list($success, $form) = $this->process_form(array(
@@ -1034,7 +1033,7 @@ public function process() {
                 $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password, $this);
                 
                 Hm_Msgs::add("JMAP Server saved");
-                $this->out('just_saved_credentials', $this->just_saved_credentials);
+                $this->out('just_saved_credentials', true);
                           
              } else {
                  /*
@@ -1090,7 +1089,7 @@ public function process() {
                  }
     
                  Hm_Msgs::add("Server saved");
-                 $this->out('just_saved_credentials', $this->just_saved_credentials);
+                 $this->out('just_saved_credentials', true);
             }
         }
     }
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 8a6b2b9212..6712c4a324 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2177,7 +2177,7 @@ protected function output() {
                         <div>
                             <form>
                                 <div class="form-floating mb-3">
-                                  <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) aria-label="'.$this->trans('Provider').'">
+                                  <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) label="'.$this->trans('Provider').'">
                                     <option value="">'.$this->trans('Other').'</option>'.$serverList.'
                                   </select>
                                   <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
@@ -2244,8 +2244,8 @@ protected function output() {
                           <button class="btn btn-success px-3" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
                       </div>
                   </div>
-                  <div id="step_config_0">
-                      <button class="step_config current_config_step btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+                  <div id="step_config_0" class="step_config current_config_step">
+                      <button class="btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
                   </div>
                 </div>
          </div>
diff --git a/modules/core/site.js b/modules/core/site.js
index 07ec43d04e..785d60b89e 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -389,24 +389,30 @@ var Hm_Notices = {
 
     show: function(msgs, keep) {
         var msg_list = [];
+        var alertType = 'success';
+
         for (var i in msgs) {
             if (msgs[i].match(/^ERR/)) {
                 msg_list.push(msgs[i].substring(3));
+                alertType = 'danger';
             }
             else {
                 msg_list.push(msgs[i]);
             }
         }
+        var msg_html = msg_list.join(', ');
+        $('.sys_messages').html('<div class="alert alert-' + alertType + ' alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span></span></div>');
+
         if (!keep) {
-            $('.err').html(msg_list.join(', '));
+            $('.sys_messages span').html(msg_html);
         }
         else {
-            var existing = $('.err').html();
+            var existing = $('.sys_messages span').html();
             if (existing) {
-                $('.err').append('<br />'+msg_list.join(', '));
+                $('.sys_messages span').append('<br />'+msg_html);
             }
             else {
-                $('.err').html(msg_list.join(', '));
+                $('.sys_messages span').html(msg_html);
             }
         }
         $('.sys_messages').show();
@@ -2155,6 +2161,8 @@ function submitSmtpImapServer() {
     Hm_Ajax.request(requestData, function(res) {
         $('#srv_setup_stepper_form_loader').addClass('hide');
         $('.step_config-actions').removeClass('hide');
+        Hm_Notices.show(res.router_user_msgs);
+        console.log("res", res);
 
         if (res.just_saved_credentials) {
             $('#srv_setup_stepper_stepper').find('form').trigger('reset');
@@ -2344,7 +2352,7 @@ function display_config_step(stepNumber) {
 
     if (selectedStep) {
         selectedStep.style.display = 'block';
-        if(stepNumber == 0) $('.srv_setup_stepper_btn').show();
+        if(stepNumber === 0) $('.srv_setup_stepper_btn').show();
     }
 }
 

From f586ac3fef1901f475a1c1d50ac7b5186e60f4d7 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 10 Mar 2024 19:56:29 +0100
Subject: [PATCH 41/55] Ref: remove store the results on delete smtp

---
 modules/smtp/functions.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index 79463c208c..1717f00de6 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -31,12 +31,7 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $con
 }
 
 if (!hm_exists('delete_smtp_server')) {
-    function delete_smtp_server($smtp_server_id, $context) {
-       $res = Hm_SMTP_List::del($smtp_server_id);
-       if ($res) {
-           Hm_SMTP_List::forget_credentials($smtp_server_id);
-           $smtp_servers = Hm_SMTP_List::dump(false, true);
-           $context->user_config->set('smtp_servers', $smtp_servers);
-       }
+    function delete_smtp_server($smtp_server_id) {
+       Hm_SMTP_List::del($smtp_server_id);
     }
 }
\ No newline at end of file

From 0c40483220c9c141ee6327a82d811c4c138074f1 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sun, 10 Mar 2024 20:15:28 +0100
Subject: [PATCH 42/55] Ref: include jmap to imap connect function

---
 modules/core/handler_modules.php | 17 ++++++++++++--
 modules/imap/functions.php       | 39 +++++++-------------------------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index 38880fc879..83bc128049 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -1030,7 +1030,19 @@ public function process() {
                     return;
                 }
                 
-                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password, $this);
+                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password, 'imap', $this);
+                 connect_to_imap_server(
+                     $jmapAddress,
+                     $profileName,
+                     $imapPort,
+                     $email,
+                     $password,
+                     $imapTls,
+                     null,
+                     false,
+                     'imap',
+                     $this,
+                     $jmapHideFromCPage);
                 
                 Hm_Msgs::add("JMAP Server saved");
                 $this->out('just_saved_credentials', true);
@@ -1066,9 +1078,10 @@ public function process() {
                           $imapPort,
                           $email,
                           $password,
-                          $email,
+                          $imapTls,
                           $imapSieveHost,
                           $enableSieve,
+                          'imap',
                           $this);
                       
                       if(!isset($this->imap_server_id)) {
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 5f5b233744..85452dbe5e 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1427,7 +1427,7 @@ function parse_sieve_config_host($host) {
 }}
 
 if (!hm_exists('connect_to_imap_server')) {
-    function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $context) {
+    function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $type, $context, $hidden = false) {
         Hm_IMAP_List::init($context->user_config, $context->session);
         $imap_list = array(
             'name' => $name,
@@ -1438,6 +1438,13 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
             'pass' => $pass,
             'tls' => $tls);
 
+        if ($type === 'jmap') {
+            $imap_list['type'] = 'jmap';
+            $imap_list['hide'] = $hidden;
+            $imap_list['port'] = false;
+            $imap_list['tls'] = false;
+        }
+
         if (isset($imap_sieve_host) && $imap_sieve_host) {
             $imap_list['sieve_config_host'] = $imap_sieve_host;
         }
@@ -1465,33 +1472,3 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
         return Hm_IMAP_List::service_connect($imap_server_id, $server, $user, $pass, false);
     }
 }
-
-
-if (!hm_exists('connect_to_jmap_server')) {
-    function connect_to_jmap_server($jmap_address, $hide_from_c_page, $name, $user, $pass, $context) {
-       $hidden = false;
-                       
-       if($hide_from_c_page) {
-           $hidden = true;
-       }
-       
-       $parsed = parse_url($jmap_address);
-       
-       if (array_key_exists('host', $parsed) && @get_headers($jmap_address)) {
-           Hm_IMAP_List::init($context->user_config, $context->session);
-           Hm_IMAP_List::add(array(
-               'name' => $name,
-               'server' => $jmap_address,
-               'hide' => $hidden,
-               'type' => 'jmap',
-               'port' => false,
-               'tls' => false));
-           $servers = Hm_IMAP_List::dump(false, true);
-           $ids = array_keys($servers);
-           $jmap_server_id = array_pop($ids);
-           $server = Hm_IMAP_List::get($jmap_server_id, false);
-
-           return Hm_IMAP_List::service_connect($jmap_server_id, $server, $user, $pass, false);
-       }
-    }
-}

From d5fc17efac15ea0839cf2b1abb75a34a4ece3a5f Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Mon, 11 Mar 2024 20:30:58 +0100
Subject: [PATCH 43/55] Ref: rm hm3.ini

---
 hm3.ini | 900 --------------------------------------------------------
 1 file changed, 900 deletions(-)
 delete mode 100644 hm3.ini

diff --git a/hm3.ini b/hm3.ini
deleted file mode 100644
index 7f139b24e7..0000000000
--- a/hm3.ini
+++ /dev/null
@@ -1,900 +0,0 @@
-
-; -----------------------------------------------------------------------------
-; General settings
-; -----------------------------------------------------------------------------
-
-; Session Type
-; ------------
-; Sessions are how the server maintains your logged in state. Cypht supports
-; standard PHP sessions, as well as its own completely independent session
-; system that uses memcached or a database for storage. In order to use
-; database sessions, the database must be correctly configured in the "DB
-; Support" section and the hm_user_session table must be created. In order to
-; use Memcached sessions, the memcached server must be correctly configured
-; in the "Memcached Support" section. In order to use Redis session, the
-; Redis server must be configured in the "Redis Support" section.
-;
-; Valid values for this setting:
-;
-;  PHP     Standard PHP session handlers
-;  DB      Custom database based sessions
-;  MEM     Custom Memcached based sessions
-;  REDIS   Custom Redis based sessions
-;  custom  Create your own session class. See the modules/site/lib.php file for
-;          more info
-;
-session_type=PHP
-
-
-; Authentication Type
-; -------------------
-; This setting defines how Cypht will authenticate your username and password
-; when you login. If you want to use a database it must be correctly configured
-; in the "DB Support" section and the hm_user table must be created. There are
-; 3 PHP cli scripts to help manage database users in the scripts/ directory (
-; create_account.php, delete_account.php, and update_password.php). If you want
-; to authenticate against an IMAP server, you must setup the imap_auth_* settings
-; below. If you want to authenticate against a POP3 server, you must setup the
-; pop3_auth_* settings below. If you want to authenticate against an LDAP server,
-; you must setup the ldap_auth_* settings. Finally, if you want to let users
-; pick from a list of popular mail services or try to auto-discover a mail
-; system, set this to dynamic and make sure the dynamic_login module set is
-; enabled in the "Module Sets" section of this file.
-; 
-; Valid values for this setting:
-;
-;  DB       Authenticate against the database
-;  LDAP     Authenticate against an LDAP server
-;  IMAP     Authenticate using an IMAP server
-;  POP3     Authenticate using a POP3 server
-;  dynamic  Let the user choose from a list, or try to auto discover the mail
-;           services based on the email domain
-;  custom   Create your own auth class. See the modules/site/lib.php file for
-;           more info
-;
-auth_type=DB
-
-
-; LDAP Authentication
-; -------------------
-; If auth_type is set to LDAP, configure the LDAP server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-
-; The hostname or IP address of the LDAP server to authenticate to
-ldap_auth_server=localhost
-
-; The port the LDAP server is listening on.
-ldap_auth_port=389
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-ldap_auth_tls=
-
-; The "base dn" of the LDAP server
-ldap_auth_base_dn="example,dc=com"
-
-
-; IMAP Authentication
-; -------------------
-; If auth_type is set to IMAP, configure the IMAP server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-imap_auth_name=localhost
-
-; The hostname or IP address of the IMAP server to authenticate to
-imap_auth_server=localhost
-
-; The port the IMAP server is listening on.
-imap_auth_port=143
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections. If you want to use IMAP STARTTLS, do NOT
-; enable this. This is only for TLS enabled sockets (typically on port 993).
-imap_auth_tls=
-
-
-; POP3 Authentication
-; -------------------
-; if auth_type is set to POP3, configure the POP3 server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-pop3_auth_name=localhost
-
-; The hostname or IP address of the POP3 server to authenticate to
-pop3_auth_server=localhost
-
-; The port the POP3 server is listening on.
-pop3_auth_port=110
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-pop3_auth_tls=
-
-
-; Default SMTP Server
-; -------------------
-; You can set a default SMTP server for all Cypht users. Authentication will be
-; done with the users login credentials, so this only makes sense if you are
-; using POP3 or IMAP for authentication. Leave these values blank to disable a
-; default SMTP server, otherwise fill in the required values below
-;
-; This is just a label used in the UI. It can be set to anything
-default_smtp_name=
-
-; The hostname or IP address of the SMTP server
-default_smtp_server=
-
-; The port the SMTP server is listening on.
-default_smtp_port=
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-default_smtp_tls=
-
-; If your SMTP service does not require authentication, you can disable it
-; by setting the following to true.
-default_smtp_no_auth=
-
-
-; Settings Storage
-; ----------------
-; Cypht supports 3 methods for saving user settings between logins. File based
-; settings, database table or custom implementation. To store settings in a
-; database, it must be configured in the "DB Support" section and the
-; hm_user_settings table must be created. To store settings on the filesystem,
-; the user_settings_dir must be created and the webserver software must be able
-; to write to it. For custom implementations, see Hm_User_Config_File.
-; 
-; Valid values for this setting:
-;
-;  file    Store user settings in the filesystem
-;  DB      Store user settings in a database
-;  custom  Store user settings via custom implementation. Specify class name
-;          after colon, e.g. custom:Custom_User_Config
-;
-user_config_type=file
-
-
-; Settings Location
-; -----------------
-; If user_config_type is set to file, this must be set to an existing directory
-; that the webserver software can read and write to. If settings storage is set
-; to DB, this is ignored. It should not be inside the webserver document root.
-user_settings_dir=/var/lib/hm3/users
-
-
-; Attachment Location
-; -------------------
-; Cypht needs a temporary place to store attachments that are to be sent with
-; an outgoing message. This folder must exist and be writable by the webserver
-; software. It should not be inside the webserver document root.
-attachment_dir=/var/lib/hm3/attachments
-
-
-; Application Data Location
-; -------------------------
-; Some Cypht module sets have their own ini files that need to be readable by
-; the webserver software, but not writable, and definitely not inside the
-; webserver document root.
-app_data_dir=/var/lib/hm3/app_data
-
-
-; Disable origin check
-; --------------------
-; To help protect against CSRF attacks, Cypht checks origin headers to confirm
-; that the source and target origin domains match. If you are using proxies this
-; could create a problem making it impossible to login. Change this to true to
-; disable the origin check.
-disable_origin_check=false
-
-
-; Admin Users
-; ----------
-; You can define a comma delimited list of admin users that Cypht will grant
-; special rights to. Currently this only enables the "create account" link in
-; the account module set that provides a form to create a new account. This is
-; only used if the auth_type is set to DB. Leave this blank if you don't want
-; to define any admin users, or are using IMAP or POP3 authentication.
-admin_users=
-
-
-; Cookie Domain
-; -------------
-; By default Cypht uses the server name used in the request to determine
-; the domain name to set the cookie for. Configurations that use a reverse
-; proxy might need to define the domain name used for cookies. Leave this
-; blank to let Cypht automatically determine the domain. You can also use
-; the special value of "none" to force Cypht to NOT set the cookie domain
-; property at all. This is not recommended unless you know what you are
-; doing!
-cookie_domain=
-
-
-; Cookie Path
-; -------------
-; By default Cypht uses the request URI to determine the cookie path to set
-; the cookie for. Configurations that use mod_rewrite might need to define
-; the path used for cookies. E.g. /cypht/embedded?page=compose will set path
-; to /cypht/embedded/ which won't send the cookies back to the server. In that
-; case set cookie_path=/cypht/. Leave this blank to let Cypht automatically
-; determine the path. You can also use the special value of "none" to force
-; Cypht to NOT set the cookie path property at all. This is not recommended
-; unless you know what you are doing!
-cookie_path=
-
-
-; Outbound Email Domain
-; ----------------------
-; Default domain used for outbound email addresses when using IMAP auth and
-; users don't login with a full email address. Users can customize this with
-; the profiles module which will override this default
-default_email_domain=
-
-
-; Auto-Create Profile
-; -------------------
-; When a user logs in and they have only 1 IMAP server and 1 SMTP server, and
-; no configured profiles - enabling this option will auto-create a profile for
-; them. Email and reply-to addresses will use the default_email_domain if
-; set, otherwise it will fallback to the domain Cypht is hosted on.
-autocreate_profile=
-
-
-; Redirect After Login
-; --------------------
-; You can login directly to any page in Cypht by going to the correct url before
-; logging in, but that is not very user-friendly. To redirect users to a url
-; after login, add the url arguments below (everything in the url after, but
-; including, the question mark). You must use double quotes around the value
-; otherwise it will cause an ini parsing error. To redirect users after login
-; to the combined unread view you would use:
-;
-; redirect_after_login="?page=message_list&list_path=unread"
-redirect_after_login=
-
-
-; Application Name
-; ----------------
-; This label is used in the UI to reference the program - you can change it to
-; "Your awesome webmail" to replace the Cypht name used in various places.
-app_name=Cypht
-
-
-; Force Mobile UI
-; ---------------
-; Cypht will detect mobile devices and display a mobile optimized UI. If you want
-; to aways use this UI regardless of device, set this to true
-always_mobile_ui=
-
-
-; Default Language
-; ----------------
-; Users can select from available interface languages on the site settings page.
-; This sets the default for a user who has not done so. Valid values are 2 character
-; langauge codes that have matching language definitions in the language/ folder.
-default_language=en
-
-
-; JavaScript Compression
-; ----------------------
-; When the configuration script is run, all JavaScript files are concatenated
-; and optionally compressed. To compress the content, define a command and its
-; options below. Cypht does not come with compresson software, so you must
-; install and configure that separately. Leave blank or set to false to disable
-; external compression. Compression software must be able to handle ES6.
-;
-; Example:
-;   js_compress='uglifyjs.terser -c -m --verbose --warn'
-;
-js_compress=false
-
-
-; CSS Compression
-; ---------------
-; When the configuration script is run, all CSS files are concatenated and
-; optionally compressed. To compress the content, define a command and its
-; options below. Cypht does not come with compresson software, so you must
-; install and configure that separately. Leave blank or set to false to disable
-; external compression.
-;
-; Example:
-;   css_compress='java -jar /usr/local/lib/yuicompressor-2.4.8.jar --type css'
-;
-css_compress=false
-
-
-; Caching Server Support
-; ---------------------
-
-; Cypht can use Redis or Memcache to improve performance, as well as to store
-; user sessions. Configure Redis or Memcached below and Cypht will
-; automatically use them for caching. All data cached for a user in either
-; system is encrypted. Currently, the feeds, POP3, and IMAP modules will use
-; the configured cache. If both Redis and Memcached are configured, Redis will
-; be used for the cache.
-;
-; If you want to use the user session as a cache, uncomment the line below and
-; set to true. THIS IS NOT RECOMMENDED. Cypht uses parallel requests to the
-; server, and using the session as a cache is likely to cause race conditions
-; and integrity issues. If you are running Cypht in an "embedded" mode with
-; only one email source, this option is less likely to be a problem.
-
-; allow_session_cache=false
-
-; Redis Support
-; -------------
-
-; Configure Redis details below to use it for caching
-enable_redis=true
-redis_server=127.0.0.1
-redis_port=6379
-redis_index=1
-redis_pass=
-redis_socket=/var/run/redis/redis-server.sock
-
-
-; Memcached Support
-; -----------------
-; Configure Memcached details below to use it for caching
-enable_memcached=true
-memcached_server=127.0.0.1
-memcached_port=11211
-
-; If you need SASL authentication for memcached, set the following to true
-; and add the username and password to authenticate with
-memcached_auth=false
-memcached_user=
-memcached_pass=
-
-
-; Allow Long Sessions
-; -------------------
-; Cypht logins only last as long as the browser is open. Closing the browser,
-; or moving to a new network, will cause you to be logged out. This setting
-; provides users with a "stay logged in" option during login that will set the
-; sesison lifetime to a default of 30 days, and disable the IP address check.
-;
-; USE WITH CAUTION SINCE THIS DISABLES SOME SESSION PROTECTIONS.
-;
-; Specifically:
-;
-; - Session cookies stay active after a browser restart making them more
-;   susceptible to snooping
-; - The browser "fingerprint" was use to help protect against session hijacking
-;   includes the client's IP. With this option enabled a client IP can change
-;   mid-session and it won't log them out
-allow_long_session=false
-
-; Set the session lifetime in days. Only applies if allow_long_session is set to
-; true, and a user checks the box to "stay logged in" during login.
-long_session_lifetime=30
-
-
-; Browser Encryption Options
-; --------------------------
-; Cypht can use the Forge JavaScript encryption library to encrypt AJAX
-; responses and data stored in browser local storage. Enabling either one of
-; these options causes the Forge JavaScript library to be included. This adds
-; about 70KB to the page size (when gzipped).
-
-; Use AES encryption for AJAX responses. Set to true to enable, leave blank or
-; set to false to disable.
-encrypt_ajax_requests=
-
-; Use AES encryption for data stored in the browser local storage. Set to true
-; to enable, or leave blank or set to false to disable.
-encrypt_local_storage=
-
-
-; Allow client IP changes
-; -----------------------
-; By default Cypht will log you out if your client IP address changes. This is
-; an extra layer of protection against session hijacking, but it's not uncommon
-; for your client IP to change. Change this to true if you want to disable this
-; check
-disable_ip_check=false
-
-
-; Allow remote image sources
-; --------------------------
-;
-; WARNING: Using this feature could leak information to external sources.
-;
-; By default, Cypht will not allow external images to be loaded when viewing an
-; HTML formatted email message. A Content Security Policy header limits images
-; sources to "self" only and the message content is filtered to remove any external
-; resource. If you really want the ability to view external images in an email,
-; you first need to change the following setting to true. When viewing an HTML
-; formatted message, you will now have a link before the message body called "Allow
-; Images" that will reload the message part with external images visible.
-allow_external_image_sources=false
-
-
-;
-; Single server mode
-; ------------------
-; This setting restricts Cypht to only using a single email source (POP3 or
-; IMAP) and the default SMTP server defined in this file. It modifies the UI to
-; remove the ability to add other email sources, and removes the password
-; restriction when saving data between logins. You must use either IMAP or POP3
-; authentication for this setting to be enforced, and auth server will be the
-; single email source users have access to. If you enable this after users
-; have saved any settings, they will be lost (or if you disable it after they
-; have saved any settings). WARNING: USER SETTINGS SAVED TO THE SERVER WILL NOT
-; BE ENCRYPTED WITH THIS ENABLED
-single_server_mode=false
-
-
-; Integration options
-; -------------------
-; Cypht does a few things to make it more secure by default, but these features
-; can make it difficult to integrate Cypht into 3rd party software. Specifically,
-; Cypht disables PHP "super globals", and sets a restrictive PHP "open basedir"
-; setting, tweaks PHP ini settings to increase security, and uses a browser
-; "fingerprint" to improve session security. You can disable each with the
-; following options:
-
-; Don't empty PHP super globals
-disable_empty_superglobals=false
-
-; Don't apply open basedir restrictions
-disable_open_basedir=false
-
-; Don't tweak ini settings
-disable_ini_settings=false
-
-; Don't use a browser fingerprint
-disable_fingerprint=false
-
-; You can create your own custom authentication and session classes using the
-; site module set, however you might want those classes located somewhere else
-; outside of the Cypht code base. By setting session_type and auth_type to custom,
-; you can control what class is used with the following settings
-
-; auth_class=
-; session_class=
-
-
-; -----------------------------------------------------------------------------
-; DB Support
-; -----------------------------------------------------------------------------
-
-; Database Support
-; ----------------
-; Cypht can use a database for 3 different purposes: authentication, sessions,
-; and user settings. Each requires the following settings to be configured and
-; the correct table to be created. CREATE TABLE SQL statements for MySQL and
-; Postgresql are below.
-;
-; Connection type. Can be "host" to connect to a hostname, or "socket" to
-; connect to a unix socket.
-db_connection_type=host
-
-; Database host name or ip address. If db_connection_type is set to "socket",
-; this value is ignored
-db_host=127.0.0.1
-
-; Database port. Only needed if your database is running on a non-standard
-; port
-db_port=3306
-
-; If db_connection_type is set to "socket", this should be the filesystem
-; location of the unix socket file. If db_connection_type is set to "host"
-; this value is ignored.
-db_socket=/var/lib/mysqld/mysqld.sock
-
-; Name of the database with the required tables
-db_name=cypht
-
-; User to connect to the database with
-db_user=root
-
-; Password to connect to the database with
-db_pass=12345678
-
-; Database type. can be any supported PDO driver ; (http://php.net/manual/en/pdo.drivers.php)
-db_driver=mysql
-
-
-; DB Sessions
-; -----------
-; If your session_type is set to DB, the following table must exist in the DB
-; defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, date timestamp);
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, date timestamp, primary key (hm_id));
-
-
-; DB Authentication
-; -----------------
-; If your auth_type is set to DB, the following table must exist in the DB
-; defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user (username varchar(255) primary key not null, hash varchar(255));
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user (username varchar(250), hash varchar(250), primary key (username));
-
-
-; DB Settings
-; -----------
-; If your user_config_type is set to DB, the following table must exist in the
-; DB defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user_settings (username varchar(250) primary key not null, settings text);
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user_settings(username varchar(250), settings longblob, primary key (username));
-
-
-; -----------------------------------------------------------------------------
-; Modules
-; -----------------------------------------------------------------------------
-
-; Module Sets
-; -----------
-; Cypht uses module sets to separate functionality in the program. Module sets
-; can be enabled and disabled independently by commenting out or uncommenting
-; the assignments below. Add a new assignment to enable your own module sets.
-
-
-; Core
-; ----
-; Handles page layout, login/logout, and the default settings pages. This set
-; is required.
-modules[]=core
-
-; Contacts
-; -------
-; Contact support. This module requires that at least one "backend" contacts
-; module be enabled (ldap_contacts, gmail_contacts, or local_contacts). You
-; can enable all the backends you want to support.
-modules[]=contacts
-
-; Local contact support. Simple, locally stored contacts backend
-modules[]=local_contacts
-
-; LDAP contact support. Use an LDAP server to store contacts. This module
-; uses its own ini file in modules/ldap_contacts/. This file must be edited
-; and moved to your app_data_dir to configure LDAP access.
-; modules[]=ldap_contacts
-
-; Gmail contact support. Read-only support for Gmail contacts. Only available
-; if you have a Gmail account enabled that uses OAuth2 authentication
-; modules[]=gmail_contacts
-
-; Feeds
-; -----
-; RSS/ATOM feed support
-modules[]=feeds
-
-; POP3
-; ----
-; POP3 email account support
-modules[]=pop3
-
-; IMAP
-; ----
-; IMAP email account support. If you want to use OAuth2 over IMAP (currently
-; only supported by Gmail and Outlook.com), you will need to edit the oauth2.ini
-; file in modules/imap/, and move it to your app_data_dir location.
-modules[]=imap
-
-; 2 factor authentication
-; -----------------------
-; This module enables 2 factor authentication using TOTP (compatible with
-; Google Authenticator). You must edit the ini file in modules/2fa/ to
-; configure a shared secret, then move that file to your app_data_dir.
-; modules[]=2fa
-
-; SMTP
-; ----
-; Send outbound email using SMTP servers
-modules[]=smtp
-
-; Account
-; ------
-; UI features for admins to create accounts, and for users to update passwords
-; (when using the built-in DB authentication)
-modules[]=account
-
-; Idle timer
-; ---------
-; Controls idle time and automatic logout
-modules[]=idle_timer
-
-; Desktop notifications
-; ---------------------
-; Enable desktop notifications for new messages
-; modules[]=desktop_notifications
-
-; Calendar
-; -------
-; Basic calendar
-modules[]=calendar
-
-; Themes
-; ------
-; Change the UI using CSS
-modules[]=themes
-
-; NUX
-; ---
-; Friendly new user experience. Quickly add common email services, and view
-; development updates
-modules[]=nux
-
-; Developer
-; ---------
-; For development, provides resources and installation details. Only available
-; in "debug mode"
-modules[]=developer
-
-; Github
-; ------
-; Github repository tracking. This module has its own ini file located in
-; modules/github/. You must edit this file, and move it to your app_data_dir
-; to establish communication with github.
-; modules[]=github
-
-; reCAPTCHA
-; ---------
-; Use the reCAPTCHA server on login. This module has its own ini file in
-; modules/recaptcha/. You must edit this file, and move it to the location
-; defined in app_data_dir to gain access to the WordPress notification API.
-; modules[]=recaptcha
-
-; WordPress
-; ---------
-; WordPress.com notifications. This module has its own ini file in
-; modules/wordpress/. You must edit this file, and move it to the location
-; defined in app_data_dir to gain access to the WordPress notification API.
-; modules[]=wordpress
-
-; History
-; -------
-; Simple list of messages read since login
-modules[]=history
-
-; Saved searches
-; --------------
-; Save and re-run searches easily
-modules[]=saved_searches
-
-; Advanced search
-; ---------------
-; Enable the advanced search form
-modules[]=advanced_search
-
-; Message highlighting
-; --------------------
-; Create custom rules to highlight messages in lists with different colors
-modules[] = highlights
-
-; NASA
-; ----
-; Access the NASA APOD API content
-; modules[]=nasa
-
-; Profiles
-; --------
-; Profiles to set reply-to, name, and signature to associated email accounts
-modules[]=profiles
-
-; Inline message
-; --------------
-; View messages inline in a reading pane instead of on a new page
-modules[]=inline_message
-
-; IMAP folders
-; -----------
-; Support for adding/renaming/deleting folders in IMAP accounts
-modules[]=imap_folders
-
-; Keyboard Shortcuts
-; ------------------
-; Enables configurable keyboard shortcuts for navigations and actions
-modules[]=keyboard_shortcuts
-
-; Site
-; ----
-; Site specific overrides. Used to control other module sets without hacking
-; the code.
-; modules[]=site
-
-; Dynamic login
-; -------------
-; Allows user to authenticate against a list of popular mail services, or to
-; auto-discover the services for the specified email address. The auth_type
-; setting must be set to "dynamic", otherwise this module set does not do
-; anything
-; modules[]=dynamic_login
-
-; API login
-; --------
-; Allows an API based login that returns a JSON response containing the session
-; and hm_id values needed to create a login session. You will need to set the
-; api_login_key value to something unique and include that in the POST request.
-; modules[]=api_login
-; api_login_key=
-
-; Recover settings
-; ----------------
-; When using IMAP or POP3 authentication, if a user's password is changed, we
-; can't decrypt the existing user settings. This module detects that situation
-; and provides a page where a user can enter their old and new passwords to
-; recover their previous settings.
-; modules[]=recover_settings
-
-; Hello World
-; -----------
-; Example module set with lots of comments
-; modules[]=hello_world
-
-
-; -----------------------------------------------------------------------------
-; User Defaults
-; All of these settings can be changed by users, but you can uncomment and set
-; the default behavior using the following options. This will only effect new
-; users or ones that have never saved their settings.
-;
-; Per source time limits have valid values of:
-; -1 day
-; -1 week
-; -2 weeks
-; -4 weeks
-; -6 weeks
-; -6 months
-; -1 year
-; -5 years
-;
-; Per source maximums can be from 1 to 1000
-; -----------------------------------------------------------------------------
-
-; If set to true, passwords for email accounts will never be saved between logins
-; Defaults to false
-; default_setting_no_password_save=false
-
-; Number of messages per page when viewing IMAP folders
-; Defaults to 20
-; default_setting_imap_per_page=20
-
-; Amount of IMAP message structure detail on the message view page
-; Defaults to full structure
-; default_setting_simple_msg_parts=false
-
-; Show icons for each IMAP message part type
-; Defaults to true
-; default_setting_msg_part_icons=true
-
-; Prefer text parts when viewing a message
-; Defaults to false
-; default_setting_text_only=false
-
-; Per source max for the combined sent view
-; Defaults to 20
-; default_setting_sent_per_source=20
-
-; Per source time limit for the combined sent view
-; Defaults to 1 week
-; default_setting_sent_since='-1 week'
-
-; Display source icons in message lists
-; Defaults to true
-; default_setting_show_list_icons=true
-
-; Redirect to this page on login
-; Defaults to none
-; default_setting_start_page=none
-
-; Don't prompt when deleting something
-; Defaults to false
-; default_setting_disable_delete_prompt=false
-
-; Hide icons in the folder list
-; Defaults to false
-; default_setting_no_folder_icons=false
-
-; Source max for the all email combined view
-; Defaults to 20
-; default_setting_all_email_per_source=20
-
-; Per source time limit for the all email combined view
-; Defaults to 1 week
-; default_setting_all_email_since='-1 week'
-
-; Per source time limit for the everything combined view
-; Defaults to 1 week
-; default_setting_all_since='-1 week'
-
-; Per source max for the everything combined view
-; Defaults to 20
-; default_setting_all_per_source=20
-
-; Per source max for the unread combined view
-; Defaults to 20
-; default_setting_unread_per_source=20
-
-; Per source max for the flagged combined view
-; Defaults to 20
-; default_setting_flagged_per_source=20
-
-; Per source time limit for the flagged combined view
-; Defaults to 1 week
-; default_setting_flagged_since='-1 week'
-
-; Per source time limit for the unread combined view
-; Defaults to 1 week
-; default_setting_unread_since='-1 week'
-
-; Timezone for date displays
-; Defaults to UTC
-; default_setting_timezone='UTC'
-
-; Message list format style
-; Defaults to email client style
-; default_setting_list_style='email_style'
-
-; Interface language
-; Defaults to en (English)
-; default_setting_language='en'
-
-; Hide new news feed items from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_feeds=false
-
-; Per source max for news feeds
-; Defaults to 20
-; default_setting_feed_limit=20
-
-; Per source time limit for news feeds
-; Defaults to 1 week
-; default_setting_feed_since='-1 week'
-
-; Toggle between plain text or HTML formatted mail on the compose page
-; Defaults to 0 (plain text)
-; default_setting_smtp_compose_type=0
-
-; BCC a copy of outbound mail to the sender
-; Defaults to false
-; default_setting_smtp_auto_bcc=false
-
-; UI theme
-; Defaults to the default white one ("White Bread")
-; default_setting_theme='default'
-
-; Hide WordPress notifications from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_wordpress=false
-
-; Time limit for WordPress notifications
-; Defaults to 1 week
-; default_setting_wordpress_since='-1 week'
-
-; Hide Github notifications from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_github=false
-
-; Max per source for Github notifications
-; Defaults to 20
-; default_setting_github_limit=20
-
-; Per source time limit for Github notifications
-; Defaults to 1 week
-; default_setting_github_since='-1 weeks'
-
-; Display message details inline from the message list
-; Defaults to false
-; default_setting_inline_message=false
-
-; Enable keyboard shortcuts
-; Defaults to false
-; default_setting_enable_keyboard_shortcuts=1

From f0495146be1d5d259e80950000fef7f1701366d5 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Mon, 11 Mar 2024 20:30:58 +0100
Subject: [PATCH 44/55] Ref: rm hm3.ini

---
 hm3.ini | 900 --------------------------------------------------------
 hm3.rc  |   1 -
 2 files changed, 901 deletions(-)
 delete mode 100644 hm3.ini
 delete mode 100644 hm3.rc

diff --git a/hm3.ini b/hm3.ini
deleted file mode 100644
index 7f139b24e7..0000000000
--- a/hm3.ini
+++ /dev/null
@@ -1,900 +0,0 @@
-
-; -----------------------------------------------------------------------------
-; General settings
-; -----------------------------------------------------------------------------
-
-; Session Type
-; ------------
-; Sessions are how the server maintains your logged in state. Cypht supports
-; standard PHP sessions, as well as its own completely independent session
-; system that uses memcached or a database for storage. In order to use
-; database sessions, the database must be correctly configured in the "DB
-; Support" section and the hm_user_session table must be created. In order to
-; use Memcached sessions, the memcached server must be correctly configured
-; in the "Memcached Support" section. In order to use Redis session, the
-; Redis server must be configured in the "Redis Support" section.
-;
-; Valid values for this setting:
-;
-;  PHP     Standard PHP session handlers
-;  DB      Custom database based sessions
-;  MEM     Custom Memcached based sessions
-;  REDIS   Custom Redis based sessions
-;  custom  Create your own session class. See the modules/site/lib.php file for
-;          more info
-;
-session_type=PHP
-
-
-; Authentication Type
-; -------------------
-; This setting defines how Cypht will authenticate your username and password
-; when you login. If you want to use a database it must be correctly configured
-; in the "DB Support" section and the hm_user table must be created. There are
-; 3 PHP cli scripts to help manage database users in the scripts/ directory (
-; create_account.php, delete_account.php, and update_password.php). If you want
-; to authenticate against an IMAP server, you must setup the imap_auth_* settings
-; below. If you want to authenticate against a POP3 server, you must setup the
-; pop3_auth_* settings below. If you want to authenticate against an LDAP server,
-; you must setup the ldap_auth_* settings. Finally, if you want to let users
-; pick from a list of popular mail services or try to auto-discover a mail
-; system, set this to dynamic and make sure the dynamic_login module set is
-; enabled in the "Module Sets" section of this file.
-; 
-; Valid values for this setting:
-;
-;  DB       Authenticate against the database
-;  LDAP     Authenticate against an LDAP server
-;  IMAP     Authenticate using an IMAP server
-;  POP3     Authenticate using a POP3 server
-;  dynamic  Let the user choose from a list, or try to auto discover the mail
-;           services based on the email domain
-;  custom   Create your own auth class. See the modules/site/lib.php file for
-;           more info
-;
-auth_type=DB
-
-
-; LDAP Authentication
-; -------------------
-; If auth_type is set to LDAP, configure the LDAP server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-
-; The hostname or IP address of the LDAP server to authenticate to
-ldap_auth_server=localhost
-
-; The port the LDAP server is listening on.
-ldap_auth_port=389
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-ldap_auth_tls=
-
-; The "base dn" of the LDAP server
-ldap_auth_base_dn="example,dc=com"
-
-
-; IMAP Authentication
-; -------------------
-; If auth_type is set to IMAP, configure the IMAP server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-imap_auth_name=localhost
-
-; The hostname or IP address of the IMAP server to authenticate to
-imap_auth_server=localhost
-
-; The port the IMAP server is listening on.
-imap_auth_port=143
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections. If you want to use IMAP STARTTLS, do NOT
-; enable this. This is only for TLS enabled sockets (typically on port 993).
-imap_auth_tls=
-
-
-; POP3 Authentication
-; -------------------
-; if auth_type is set to POP3, configure the POP3 server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-pop3_auth_name=localhost
-
-; The hostname or IP address of the POP3 server to authenticate to
-pop3_auth_server=localhost
-
-; The port the POP3 server is listening on.
-pop3_auth_port=110
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-pop3_auth_tls=
-
-
-; Default SMTP Server
-; -------------------
-; You can set a default SMTP server for all Cypht users. Authentication will be
-; done with the users login credentials, so this only makes sense if you are
-; using POP3 or IMAP for authentication. Leave these values blank to disable a
-; default SMTP server, otherwise fill in the required values below
-;
-; This is just a label used in the UI. It can be set to anything
-default_smtp_name=
-
-; The hostname or IP address of the SMTP server
-default_smtp_server=
-
-; The port the SMTP server is listening on.
-default_smtp_port=
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-default_smtp_tls=
-
-; If your SMTP service does not require authentication, you can disable it
-; by setting the following to true.
-default_smtp_no_auth=
-
-
-; Settings Storage
-; ----------------
-; Cypht supports 3 methods for saving user settings between logins. File based
-; settings, database table or custom implementation. To store settings in a
-; database, it must be configured in the "DB Support" section and the
-; hm_user_settings table must be created. To store settings on the filesystem,
-; the user_settings_dir must be created and the webserver software must be able
-; to write to it. For custom implementations, see Hm_User_Config_File.
-; 
-; Valid values for this setting:
-;
-;  file    Store user settings in the filesystem
-;  DB      Store user settings in a database
-;  custom  Store user settings via custom implementation. Specify class name
-;          after colon, e.g. custom:Custom_User_Config
-;
-user_config_type=file
-
-
-; Settings Location
-; -----------------
-; If user_config_type is set to file, this must be set to an existing directory
-; that the webserver software can read and write to. If settings storage is set
-; to DB, this is ignored. It should not be inside the webserver document root.
-user_settings_dir=/var/lib/hm3/users
-
-
-; Attachment Location
-; -------------------
-; Cypht needs a temporary place to store attachments that are to be sent with
-; an outgoing message. This folder must exist and be writable by the webserver
-; software. It should not be inside the webserver document root.
-attachment_dir=/var/lib/hm3/attachments
-
-
-; Application Data Location
-; -------------------------
-; Some Cypht module sets have their own ini files that need to be readable by
-; the webserver software, but not writable, and definitely not inside the
-; webserver document root.
-app_data_dir=/var/lib/hm3/app_data
-
-
-; Disable origin check
-; --------------------
-; To help protect against CSRF attacks, Cypht checks origin headers to confirm
-; that the source and target origin domains match. If you are using proxies this
-; could create a problem making it impossible to login. Change this to true to
-; disable the origin check.
-disable_origin_check=false
-
-
-; Admin Users
-; ----------
-; You can define a comma delimited list of admin users that Cypht will grant
-; special rights to. Currently this only enables the "create account" link in
-; the account module set that provides a form to create a new account. This is
-; only used if the auth_type is set to DB. Leave this blank if you don't want
-; to define any admin users, or are using IMAP or POP3 authentication.
-admin_users=
-
-
-; Cookie Domain
-; -------------
-; By default Cypht uses the server name used in the request to determine
-; the domain name to set the cookie for. Configurations that use a reverse
-; proxy might need to define the domain name used for cookies. Leave this
-; blank to let Cypht automatically determine the domain. You can also use
-; the special value of "none" to force Cypht to NOT set the cookie domain
-; property at all. This is not recommended unless you know what you are
-; doing!
-cookie_domain=
-
-
-; Cookie Path
-; -------------
-; By default Cypht uses the request URI to determine the cookie path to set
-; the cookie for. Configurations that use mod_rewrite might need to define
-; the path used for cookies. E.g. /cypht/embedded?page=compose will set path
-; to /cypht/embedded/ which won't send the cookies back to the server. In that
-; case set cookie_path=/cypht/. Leave this blank to let Cypht automatically
-; determine the path. You can also use the special value of "none" to force
-; Cypht to NOT set the cookie path property at all. This is not recommended
-; unless you know what you are doing!
-cookie_path=
-
-
-; Outbound Email Domain
-; ----------------------
-; Default domain used for outbound email addresses when using IMAP auth and
-; users don't login with a full email address. Users can customize this with
-; the profiles module which will override this default
-default_email_domain=
-
-
-; Auto-Create Profile
-; -------------------
-; When a user logs in and they have only 1 IMAP server and 1 SMTP server, and
-; no configured profiles - enabling this option will auto-create a profile for
-; them. Email and reply-to addresses will use the default_email_domain if
-; set, otherwise it will fallback to the domain Cypht is hosted on.
-autocreate_profile=
-
-
-; Redirect After Login
-; --------------------
-; You can login directly to any page in Cypht by going to the correct url before
-; logging in, but that is not very user-friendly. To redirect users to a url
-; after login, add the url arguments below (everything in the url after, but
-; including, the question mark). You must use double quotes around the value
-; otherwise it will cause an ini parsing error. To redirect users after login
-; to the combined unread view you would use:
-;
-; redirect_after_login="?page=message_list&list_path=unread"
-redirect_after_login=
-
-
-; Application Name
-; ----------------
-; This label is used in the UI to reference the program - you can change it to
-; "Your awesome webmail" to replace the Cypht name used in various places.
-app_name=Cypht
-
-
-; Force Mobile UI
-; ---------------
-; Cypht will detect mobile devices and display a mobile optimized UI. If you want
-; to aways use this UI regardless of device, set this to true
-always_mobile_ui=
-
-
-; Default Language
-; ----------------
-; Users can select from available interface languages on the site settings page.
-; This sets the default for a user who has not done so. Valid values are 2 character
-; langauge codes that have matching language definitions in the language/ folder.
-default_language=en
-
-
-; JavaScript Compression
-; ----------------------
-; When the configuration script is run, all JavaScript files are concatenated
-; and optionally compressed. To compress the content, define a command and its
-; options below. Cypht does not come with compresson software, so you must
-; install and configure that separately. Leave blank or set to false to disable
-; external compression. Compression software must be able to handle ES6.
-;
-; Example:
-;   js_compress='uglifyjs.terser -c -m --verbose --warn'
-;
-js_compress=false
-
-
-; CSS Compression
-; ---------------
-; When the configuration script is run, all CSS files are concatenated and
-; optionally compressed. To compress the content, define a command and its
-; options below. Cypht does not come with compresson software, so you must
-; install and configure that separately. Leave blank or set to false to disable
-; external compression.
-;
-; Example:
-;   css_compress='java -jar /usr/local/lib/yuicompressor-2.4.8.jar --type css'
-;
-css_compress=false
-
-
-; Caching Server Support
-; ---------------------
-
-; Cypht can use Redis or Memcache to improve performance, as well as to store
-; user sessions. Configure Redis or Memcached below and Cypht will
-; automatically use them for caching. All data cached for a user in either
-; system is encrypted. Currently, the feeds, POP3, and IMAP modules will use
-; the configured cache. If both Redis and Memcached are configured, Redis will
-; be used for the cache.
-;
-; If you want to use the user session as a cache, uncomment the line below and
-; set to true. THIS IS NOT RECOMMENDED. Cypht uses parallel requests to the
-; server, and using the session as a cache is likely to cause race conditions
-; and integrity issues. If you are running Cypht in an "embedded" mode with
-; only one email source, this option is less likely to be a problem.
-
-; allow_session_cache=false
-
-; Redis Support
-; -------------
-
-; Configure Redis details below to use it for caching
-enable_redis=true
-redis_server=127.0.0.1
-redis_port=6379
-redis_index=1
-redis_pass=
-redis_socket=/var/run/redis/redis-server.sock
-
-
-; Memcached Support
-; -----------------
-; Configure Memcached details below to use it for caching
-enable_memcached=true
-memcached_server=127.0.0.1
-memcached_port=11211
-
-; If you need SASL authentication for memcached, set the following to true
-; and add the username and password to authenticate with
-memcached_auth=false
-memcached_user=
-memcached_pass=
-
-
-; Allow Long Sessions
-; -------------------
-; Cypht logins only last as long as the browser is open. Closing the browser,
-; or moving to a new network, will cause you to be logged out. This setting
-; provides users with a "stay logged in" option during login that will set the
-; sesison lifetime to a default of 30 days, and disable the IP address check.
-;
-; USE WITH CAUTION SINCE THIS DISABLES SOME SESSION PROTECTIONS.
-;
-; Specifically:
-;
-; - Session cookies stay active after a browser restart making them more
-;   susceptible to snooping
-; - The browser "fingerprint" was use to help protect against session hijacking
-;   includes the client's IP. With this option enabled a client IP can change
-;   mid-session and it won't log them out
-allow_long_session=false
-
-; Set the session lifetime in days. Only applies if allow_long_session is set to
-; true, and a user checks the box to "stay logged in" during login.
-long_session_lifetime=30
-
-
-; Browser Encryption Options
-; --------------------------
-; Cypht can use the Forge JavaScript encryption library to encrypt AJAX
-; responses and data stored in browser local storage. Enabling either one of
-; these options causes the Forge JavaScript library to be included. This adds
-; about 70KB to the page size (when gzipped).
-
-; Use AES encryption for AJAX responses. Set to true to enable, leave blank or
-; set to false to disable.
-encrypt_ajax_requests=
-
-; Use AES encryption for data stored in the browser local storage. Set to true
-; to enable, or leave blank or set to false to disable.
-encrypt_local_storage=
-
-
-; Allow client IP changes
-; -----------------------
-; By default Cypht will log you out if your client IP address changes. This is
-; an extra layer of protection against session hijacking, but it's not uncommon
-; for your client IP to change. Change this to true if you want to disable this
-; check
-disable_ip_check=false
-
-
-; Allow remote image sources
-; --------------------------
-;
-; WARNING: Using this feature could leak information to external sources.
-;
-; By default, Cypht will not allow external images to be loaded when viewing an
-; HTML formatted email message. A Content Security Policy header limits images
-; sources to "self" only and the message content is filtered to remove any external
-; resource. If you really want the ability to view external images in an email,
-; you first need to change the following setting to true. When viewing an HTML
-; formatted message, you will now have a link before the message body called "Allow
-; Images" that will reload the message part with external images visible.
-allow_external_image_sources=false
-
-
-;
-; Single server mode
-; ------------------
-; This setting restricts Cypht to only using a single email source (POP3 or
-; IMAP) and the default SMTP server defined in this file. It modifies the UI to
-; remove the ability to add other email sources, and removes the password
-; restriction when saving data between logins. You must use either IMAP or POP3
-; authentication for this setting to be enforced, and auth server will be the
-; single email source users have access to. If you enable this after users
-; have saved any settings, they will be lost (or if you disable it after they
-; have saved any settings). WARNING: USER SETTINGS SAVED TO THE SERVER WILL NOT
-; BE ENCRYPTED WITH THIS ENABLED
-single_server_mode=false
-
-
-; Integration options
-; -------------------
-; Cypht does a few things to make it more secure by default, but these features
-; can make it difficult to integrate Cypht into 3rd party software. Specifically,
-; Cypht disables PHP "super globals", and sets a restrictive PHP "open basedir"
-; setting, tweaks PHP ini settings to increase security, and uses a browser
-; "fingerprint" to improve session security. You can disable each with the
-; following options:
-
-; Don't empty PHP super globals
-disable_empty_superglobals=false
-
-; Don't apply open basedir restrictions
-disable_open_basedir=false
-
-; Don't tweak ini settings
-disable_ini_settings=false
-
-; Don't use a browser fingerprint
-disable_fingerprint=false
-
-; You can create your own custom authentication and session classes using the
-; site module set, however you might want those classes located somewhere else
-; outside of the Cypht code base. By setting session_type and auth_type to custom,
-; you can control what class is used with the following settings
-
-; auth_class=
-; session_class=
-
-
-; -----------------------------------------------------------------------------
-; DB Support
-; -----------------------------------------------------------------------------
-
-; Database Support
-; ----------------
-; Cypht can use a database for 3 different purposes: authentication, sessions,
-; and user settings. Each requires the following settings to be configured and
-; the correct table to be created. CREATE TABLE SQL statements for MySQL and
-; Postgresql are below.
-;
-; Connection type. Can be "host" to connect to a hostname, or "socket" to
-; connect to a unix socket.
-db_connection_type=host
-
-; Database host name or ip address. If db_connection_type is set to "socket",
-; this value is ignored
-db_host=127.0.0.1
-
-; Database port. Only needed if your database is running on a non-standard
-; port
-db_port=3306
-
-; If db_connection_type is set to "socket", this should be the filesystem
-; location of the unix socket file. If db_connection_type is set to "host"
-; this value is ignored.
-db_socket=/var/lib/mysqld/mysqld.sock
-
-; Name of the database with the required tables
-db_name=cypht
-
-; User to connect to the database with
-db_user=root
-
-; Password to connect to the database with
-db_pass=12345678
-
-; Database type. can be any supported PDO driver ; (http://php.net/manual/en/pdo.drivers.php)
-db_driver=mysql
-
-
-; DB Sessions
-; -----------
-; If your session_type is set to DB, the following table must exist in the DB
-; defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, date timestamp);
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, date timestamp, primary key (hm_id));
-
-
-; DB Authentication
-; -----------------
-; If your auth_type is set to DB, the following table must exist in the DB
-; defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user (username varchar(255) primary key not null, hash varchar(255));
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user (username varchar(250), hash varchar(250), primary key (username));
-
-
-; DB Settings
-; -----------
-; If your user_config_type is set to DB, the following table must exist in the
-; DB defined above, and the db user must have read-write access to it:
-;
-;  Postgresql:
-;   CREATE TABLE hm_user_settings (username varchar(250) primary key not null, settings text);
-;
-;  MySQL or SQLite:
-;   CREATE TABLE hm_user_settings(username varchar(250), settings longblob, primary key (username));
-
-
-; -----------------------------------------------------------------------------
-; Modules
-; -----------------------------------------------------------------------------
-
-; Module Sets
-; -----------
-; Cypht uses module sets to separate functionality in the program. Module sets
-; can be enabled and disabled independently by commenting out or uncommenting
-; the assignments below. Add a new assignment to enable your own module sets.
-
-
-; Core
-; ----
-; Handles page layout, login/logout, and the default settings pages. This set
-; is required.
-modules[]=core
-
-; Contacts
-; -------
-; Contact support. This module requires that at least one "backend" contacts
-; module be enabled (ldap_contacts, gmail_contacts, or local_contacts). You
-; can enable all the backends you want to support.
-modules[]=contacts
-
-; Local contact support. Simple, locally stored contacts backend
-modules[]=local_contacts
-
-; LDAP contact support. Use an LDAP server to store contacts. This module
-; uses its own ini file in modules/ldap_contacts/. This file must be edited
-; and moved to your app_data_dir to configure LDAP access.
-; modules[]=ldap_contacts
-
-; Gmail contact support. Read-only support for Gmail contacts. Only available
-; if you have a Gmail account enabled that uses OAuth2 authentication
-; modules[]=gmail_contacts
-
-; Feeds
-; -----
-; RSS/ATOM feed support
-modules[]=feeds
-
-; POP3
-; ----
-; POP3 email account support
-modules[]=pop3
-
-; IMAP
-; ----
-; IMAP email account support. If you want to use OAuth2 over IMAP (currently
-; only supported by Gmail and Outlook.com), you will need to edit the oauth2.ini
-; file in modules/imap/, and move it to your app_data_dir location.
-modules[]=imap
-
-; 2 factor authentication
-; -----------------------
-; This module enables 2 factor authentication using TOTP (compatible with
-; Google Authenticator). You must edit the ini file in modules/2fa/ to
-; configure a shared secret, then move that file to your app_data_dir.
-; modules[]=2fa
-
-; SMTP
-; ----
-; Send outbound email using SMTP servers
-modules[]=smtp
-
-; Account
-; ------
-; UI features for admins to create accounts, and for users to update passwords
-; (when using the built-in DB authentication)
-modules[]=account
-
-; Idle timer
-; ---------
-; Controls idle time and automatic logout
-modules[]=idle_timer
-
-; Desktop notifications
-; ---------------------
-; Enable desktop notifications for new messages
-; modules[]=desktop_notifications
-
-; Calendar
-; -------
-; Basic calendar
-modules[]=calendar
-
-; Themes
-; ------
-; Change the UI using CSS
-modules[]=themes
-
-; NUX
-; ---
-; Friendly new user experience. Quickly add common email services, and view
-; development updates
-modules[]=nux
-
-; Developer
-; ---------
-; For development, provides resources and installation details. Only available
-; in "debug mode"
-modules[]=developer
-
-; Github
-; ------
-; Github repository tracking. This module has its own ini file located in
-; modules/github/. You must edit this file, and move it to your app_data_dir
-; to establish communication with github.
-; modules[]=github
-
-; reCAPTCHA
-; ---------
-; Use the reCAPTCHA server on login. This module has its own ini file in
-; modules/recaptcha/. You must edit this file, and move it to the location
-; defined in app_data_dir to gain access to the WordPress notification API.
-; modules[]=recaptcha
-
-; WordPress
-; ---------
-; WordPress.com notifications. This module has its own ini file in
-; modules/wordpress/. You must edit this file, and move it to the location
-; defined in app_data_dir to gain access to the WordPress notification API.
-; modules[]=wordpress
-
-; History
-; -------
-; Simple list of messages read since login
-modules[]=history
-
-; Saved searches
-; --------------
-; Save and re-run searches easily
-modules[]=saved_searches
-
-; Advanced search
-; ---------------
-; Enable the advanced search form
-modules[]=advanced_search
-
-; Message highlighting
-; --------------------
-; Create custom rules to highlight messages in lists with different colors
-modules[] = highlights
-
-; NASA
-; ----
-; Access the NASA APOD API content
-; modules[]=nasa
-
-; Profiles
-; --------
-; Profiles to set reply-to, name, and signature to associated email accounts
-modules[]=profiles
-
-; Inline message
-; --------------
-; View messages inline in a reading pane instead of on a new page
-modules[]=inline_message
-
-; IMAP folders
-; -----------
-; Support for adding/renaming/deleting folders in IMAP accounts
-modules[]=imap_folders
-
-; Keyboard Shortcuts
-; ------------------
-; Enables configurable keyboard shortcuts for navigations and actions
-modules[]=keyboard_shortcuts
-
-; Site
-; ----
-; Site specific overrides. Used to control other module sets without hacking
-; the code.
-; modules[]=site
-
-; Dynamic login
-; -------------
-; Allows user to authenticate against a list of popular mail services, or to
-; auto-discover the services for the specified email address. The auth_type
-; setting must be set to "dynamic", otherwise this module set does not do
-; anything
-; modules[]=dynamic_login
-
-; API login
-; --------
-; Allows an API based login that returns a JSON response containing the session
-; and hm_id values needed to create a login session. You will need to set the
-; api_login_key value to something unique and include that in the POST request.
-; modules[]=api_login
-; api_login_key=
-
-; Recover settings
-; ----------------
-; When using IMAP or POP3 authentication, if a user's password is changed, we
-; can't decrypt the existing user settings. This module detects that situation
-; and provides a page where a user can enter their old and new passwords to
-; recover their previous settings.
-; modules[]=recover_settings
-
-; Hello World
-; -----------
-; Example module set with lots of comments
-; modules[]=hello_world
-
-
-; -----------------------------------------------------------------------------
-; User Defaults
-; All of these settings can be changed by users, but you can uncomment and set
-; the default behavior using the following options. This will only effect new
-; users or ones that have never saved their settings.
-;
-; Per source time limits have valid values of:
-; -1 day
-; -1 week
-; -2 weeks
-; -4 weeks
-; -6 weeks
-; -6 months
-; -1 year
-; -5 years
-;
-; Per source maximums can be from 1 to 1000
-; -----------------------------------------------------------------------------
-
-; If set to true, passwords for email accounts will never be saved between logins
-; Defaults to false
-; default_setting_no_password_save=false
-
-; Number of messages per page when viewing IMAP folders
-; Defaults to 20
-; default_setting_imap_per_page=20
-
-; Amount of IMAP message structure detail on the message view page
-; Defaults to full structure
-; default_setting_simple_msg_parts=false
-
-; Show icons for each IMAP message part type
-; Defaults to true
-; default_setting_msg_part_icons=true
-
-; Prefer text parts when viewing a message
-; Defaults to false
-; default_setting_text_only=false
-
-; Per source max for the combined sent view
-; Defaults to 20
-; default_setting_sent_per_source=20
-
-; Per source time limit for the combined sent view
-; Defaults to 1 week
-; default_setting_sent_since='-1 week'
-
-; Display source icons in message lists
-; Defaults to true
-; default_setting_show_list_icons=true
-
-; Redirect to this page on login
-; Defaults to none
-; default_setting_start_page=none
-
-; Don't prompt when deleting something
-; Defaults to false
-; default_setting_disable_delete_prompt=false
-
-; Hide icons in the folder list
-; Defaults to false
-; default_setting_no_folder_icons=false
-
-; Source max for the all email combined view
-; Defaults to 20
-; default_setting_all_email_per_source=20
-
-; Per source time limit for the all email combined view
-; Defaults to 1 week
-; default_setting_all_email_since='-1 week'
-
-; Per source time limit for the everything combined view
-; Defaults to 1 week
-; default_setting_all_since='-1 week'
-
-; Per source max for the everything combined view
-; Defaults to 20
-; default_setting_all_per_source=20
-
-; Per source max for the unread combined view
-; Defaults to 20
-; default_setting_unread_per_source=20
-
-; Per source max for the flagged combined view
-; Defaults to 20
-; default_setting_flagged_per_source=20
-
-; Per source time limit for the flagged combined view
-; Defaults to 1 week
-; default_setting_flagged_since='-1 week'
-
-; Per source time limit for the unread combined view
-; Defaults to 1 week
-; default_setting_unread_since='-1 week'
-
-; Timezone for date displays
-; Defaults to UTC
-; default_setting_timezone='UTC'
-
-; Message list format style
-; Defaults to email client style
-; default_setting_list_style='email_style'
-
-; Interface language
-; Defaults to en (English)
-; default_setting_language='en'
-
-; Hide new news feed items from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_feeds=false
-
-; Per source max for news feeds
-; Defaults to 20
-; default_setting_feed_limit=20
-
-; Per source time limit for news feeds
-; Defaults to 1 week
-; default_setting_feed_since='-1 week'
-
-; Toggle between plain text or HTML formatted mail on the compose page
-; Defaults to 0 (plain text)
-; default_setting_smtp_compose_type=0
-
-; BCC a copy of outbound mail to the sender
-; Defaults to false
-; default_setting_smtp_auto_bcc=false
-
-; UI theme
-; Defaults to the default white one ("White Bread")
-; default_setting_theme='default'
-
-; Hide WordPress notifications from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_wordpress=false
-
-; Time limit for WordPress notifications
-; Defaults to 1 week
-; default_setting_wordpress_since='-1 week'
-
-; Hide Github notifications from the unread combined view
-; Defaults to false
-; default_setting_unread_exclude_github=false
-
-; Max per source for Github notifications
-; Defaults to 20
-; default_setting_github_limit=20
-
-; Per source time limit for Github notifications
-; Defaults to 1 week
-; default_setting_github_since='-1 weeks'
-
-; Display message details inline from the message list
-; Defaults to false
-; default_setting_inline_message=false
-
-; Enable keyboard shortcuts
-; Defaults to false
-; default_setting_enable_keyboard_shortcuts=1
diff --git a/hm3.rc b/hm3.rc
deleted file mode 100644
index c21c4fee36..0000000000
--- a/hm3.rc
+++ /dev/null
@@ -1 +0,0 @@
-{"session_type":"PHP","auth_type":"DB","ldap_auth_server":"localhost","ldap_auth_port":"389","ldap_auth_tls":"","ldap_auth_base_dn":"example,dc=com","imap_auth_name":"localhost","imap_auth_server":"localhost","imap_auth_port":"143","imap_auth_tls":"","pop3_auth_name":"localhost","pop3_auth_server":"localhost","pop3_auth_port":"110","pop3_auth_tls":"","default_smtp_name":"","default_smtp_server":"","default_smtp_port":"","default_smtp_tls":"","default_smtp_no_auth":"","user_config_type":"file","user_settings_dir":"\/var\/lib\/hm3\/users","attachment_dir":"\/var\/lib\/hm3\/attachments","app_data_dir":"\/var\/lib\/hm3\/app_data","disable_origin_check":"","admin_users":"","cookie_domain":"","cookie_path":"","default_email_domain":"","autocreate_profile":"","redirect_after_login":"","app_name":"Cypht","always_mobile_ui":"","default_language":"en","js_compress":"","css_compress":"","enable_redis":"1","redis_server":"127.0.0.1","redis_port":"6379","redis_index":"1","redis_pass":"","redis_socket":"\/var\/run\/redis\/redis-server.sock","enable_memcached":"1","memcached_server":"127.0.0.1","memcached_port":"11211","memcached_auth":"","memcached_user":"","memcached_pass":"","allow_long_session":"","long_session_lifetime":"30","encrypt_ajax_requests":"","encrypt_local_storage":"","disable_ip_check":"","allow_external_image_sources":"","single_server_mode":"","disable_empty_superglobals":"","disable_open_basedir":"","disable_ini_settings":"","disable_fingerprint":"","db_connection_type":"host","db_host":"127.0.0.1","db_port":"3306","db_socket":"\/var\/lib\/mysqld\/mysqld.sock","db_name":"cypht","db_user":"root","db_pass":"12345678","db_driver":"mysql","modules":["core","contacts","local_contacts","feeds","pop3","imap","smtp","account","idle_timer","calendar","themes","nux","developer","history","saved_searches","advanced_search","highlights","profiles","inline_message","imap_folders","keyboard_shortcuts"],"version":0.1,"oauth2.ini":{"gmail":{"client_id":"904001166467-4at4cfbvg4u0vneab9evkid5jmv1aqap.apps.googleusercontent.com","client_secret":"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","client_uri":"http:\/\/localhost:8888\/AvanTech\/cypht\/","auth_uri":"https:\/\/accounts.google.com\/o\/oauth2\/auth","token_uri":"https:\/\/www.googleapis.com\/oauth2\/v3\/token","refresh_uri":"https:\/\/www.googleapis.com\/oauth2\/v3\/token"},"outlook":{"client_id":"","client_secret":"","client_uri":"","auth_uri":"https:\/\/login.live.com\/oauth20_authorize.srf","token_uri":"https:\/\/login.live.com\/oauth20_token.srf","refresh_uri":"https:\/\/login.live.com\/oauth20_token.srf"}},"handler_modules":{"home":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"load_smtp_servers_from_config":["smtp",true],"check_missing_passwords":["core",true],"message_list_type":["core",true],"process_oauth2_authorization":["nux",true],"nux_homepage_data":["nux",true],"nux_dev_news":["nux",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"servers":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"process_add_pop3_server":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"save_pop3_servers":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"process_add_feed":["feeds",true],"add_feeds_to_page_data":["feeds",true],"save_feeds":["feeds",true],"message_list_type":["core",true],"process_add_imap_server":["imap",true],"process_add_jmap_server":["imap",true],"save_imap_servers":["imap",true],"language":["core",true],"load_smtp_servers_from_config":["smtp",true],"process_add_smtp_server":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"save_smtp_servers":["smtp",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"reload_folder_cookie":["core",true],"logout":["core",true],"http_headers":["core",true]},"compose":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"imap_forward_attachments":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"special_folders":["imap_folders",true],"load_smtp_is_imap_forward":["smtp",true],"smtp_from_replace":["smtp",true],"load_smtp_is_imap_draft":["smtp",true],"load_smtp_reply_to_details":["smtp",true],"load_smtp_servers_from_config":["smtp",true],"compose_profile_data":["profiles",true],"process_compose_form_submit":["smtp",true],"imap_mark_as_answered":["imap",true],"imap_save_sent":["imap",true],"imap_unflag_on_send":["imap",true],"add_smtp_servers_to_page_data":["smtp",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"process_send_to_contact":["contacts",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"save":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"process_save_form":["core",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"settings":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"process_idle_time_setting":["idle_timer",true],"process_imap_per_page_setting":["imap",true],"process_unread_on_open":["imap",true],"process_enable_simple_download_options":["imap",true],"process_pagination_links":["imap",true],"process_simple_msg_parts":["imap",true],"process_msg_part_icons":["imap",true],"process_text_only_setting":["imap",true],"process_original_folder_setting":["imap",true],"process_sent_source_max_setting":["imap",true],"process_sent_since_setting":["imap",true],"process_show_list_icons":["core",true],"process_mailto_handler_setting":["core",true],"process_default_sort_order_setting":["core",true],"process_start_page_setting":["core",true],"process_no_password_setting":["core",true],"process_delete_prompt_setting":["core",true],"process_hide_folder_icons":["core",true],"process_all_email_source_max_setting":["core",true],"process_all_email_since_setting":["core",true],"process_all_since_setting":["core",true],"process_all_source_max_setting":["core",true],"process_unread_source_max_setting":["core",true],"process_flagged_source_max_setting":["core",true],"process_flagged_since_setting":["core",true],"process_unread_since_setting":["core",true],"process_timezone_setting":["core",true],"process_list_style_setting":["core",true],"process_language_setting":["core",true],"reset_factory":["core",true],"process_unread_feeds_setting":["feeds",true],"process_feed_limit_setting":["feeds",true],"process_feed_since_setting":["feeds",true],"process_compose_type":["smtp",true],"process_auto_bcc":["smtp",true],"process_theme_setting":["themes",true],"process_inline_message_setting":["inline_message",true],"process_inline_message_style":["inline_message",true],"process_enable_shortcut_setting":["keyboard_shortcuts",true],"save_user_settings":["core",true],"attachment_dir":["smtp",true],"reload_folder_cookie":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"message_list":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"highlight_list_data":["highlights",true],"load_feeds_from_config":["feeds",true],"load_feeds_for_message_list":["feeds",true],"default_sort_order_setting":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"search":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_search":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"save_searches_data":["saved_searches",true],"load_feeds_from_config":["feeds",true],"load_feeds_for_search":["feeds",true],"default_sort_order_setting":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_for_search":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"advanced_search":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"default_sort_order_setting":["core",true],"message_list_type":["advanced_search",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"advanced_search_prepare":["advanced_search",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_reset_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"reset_search":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"message":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"add_feeds_to_page_data":["feeds",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"imap_show_message":["imap",true],"imap_download_message":["imap",true],"pop3_message_list_type":["pop3",true],"feed_list_type":["feeds",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"notfound":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["core",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_message_action":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_message_action":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"imap_oauth2_token_check":["imap",true],"load_pop3_servers_from_config":["pop3",true],"pop3_message_action":["pop3",true],"save_pop3_servers":["pop3",true],"load_feeds_from_config":["feeds",true],"feed_message_action":["feeds",true],"save_feeds":["feeds",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_server_pw":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["imap",true],"load_pop3_servers_from_config":["pop3",true],"check_missing_passwords":["core",true],"process_pw_update":["core",true],"save_imap_servers":["imap",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_hm_folders":{"login":["core",false],"check_internal_users":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"get_shortcut_setting":["keyboard_shortcuts",true],"imap_folder_check":["imap_folders",true],"saved_search_folder_data":["saved_searches",true],"load_theme":["themes",true],"load_imap_servers_from_config":["imap",true],"smtp_auto_bcc_check":["smtp",true],"add_imap_servers_to_page_data":["imap",true],"load_imap_folders":["imap",true],"imap_oauth2_token_check":["imap",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"load_pop3_folders":["pop3",true],"load_feeds_from_config":["feeds",true],"add_feeds_to_page_data":["feeds",true],"load_feed_folders":["feeds",true],"check_folder_icon_setting":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_test":{"login":["core",false],"load_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"contacts":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"process_edit_contact":["local_contacts",true],"load_edit_contact":["local_contacts",true],"process_add_contact":["local_contacts",true],"message_list_type":["contacts",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_imap_message_content":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_bust_cache":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_message_content":["imap",true],"find_message_contacts":["contacts",true],"history_record_imap_message":["history",true],"vcalendar_check":["calendar",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"close_session_early":["core",true]},"ajax_add_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"language":["core",true],"process_add_contact_from_message":["local_contacts",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_autocomplete_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"autocomplete_contact":["contacts",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_delete_contact":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_contacts":["contacts",true],"load_local_contacts":["local_contacts",true],"language":["core",true],"process_delete_contact":["local_contacts",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"info":[],"ajax_feed_combined":{"login":["core",false],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"message_list_type":["core",true],"feed_list_type":["feeds",true],"load_feeds_from_config":["feeds",true],"close_session_early":["core",true],"feed_list_content":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_item_content":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"feed_item_content":["feeds",true],"history_record_feed_message":["history",true],"save_feeds":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_debug":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"delete_feed":["feeds",true],"feed_connect":["feeds",true],"save_feeds":["feeds",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_feed_status":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_feeds_from_config":["feeds",true],"close_session_early":["core",true],"feed_status":["feeds",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_folder_display":{"login":["core",false],"load_user_data":["core",true],"load_theme":["themes",true],"load_pop3_servers_from_config":["pop3",true],"language":["core",true],"message_list_type":["core",true],"pop3_message_list_type":["pop3",true],"close_session_early":["core",true],"pop3_folder_page":["pop3",true],"save_pop3_cache":["pop3",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_message_display":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"pop3_message_content":["pop3",true],"history_record_pop3_message":["history",true],"save_pop3_servers":["pop3",true],"save_pop3_cache":["pop3",true],"close_session_early":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_status":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"close_session_early":["core",true],"pop3_status":["pop3",true],"date":["core",true],"http_headers":["core",true]},"ajax_pop3_debug":{"login":["core",false],"load_user_data":["core",true],"language":["core",true],"load_pop3_servers_from_config":["pop3",true],"add_pop3_servers_to_page_data":["pop3",true],"pop3_connect":["pop3",true],"pop3_delete":["pop3",true],"pop3_forget":["pop3",true],"pop3_save":["pop3",true],"save_pop3_servers":["pop3",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_mark_as_read":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_mark_as_read":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_debug":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_hide":["imap",true],"imap_connect":["imap",true],"imap_delete":["imap",true],"imap_forget":["imap",true],"imap_save":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true],"save_user_data":["core",true]},"ajax_imap_flag_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"flag_imap_message":["imap",true],"save_imap_cache":["imap",true],"save_imap_servers":["imap",true]},"ajax_imap_sent":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_sent":["imap",true],"save_imap_cache":["imap",true]},"ajax_imap_folder_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_folder_status":["imap",true]},"ajax_imap_unread":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_unread":["imap",true],"save_imap_cache":["imap",true]},"ajax_imap_update_combined_source":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"process_imap_source_update":["imap",true],"close_session_early":["core",true]},"ajax_imap_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_status":["imap",true]},"ajax_imap_move_copy_action":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_process_move":["imap",true],"save_imap_cache":["imap",true],"close_session_early":["core",true]},"ajax_imap_flagged":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_flagged":["imap",true]},"ajax_imap_delete_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_delete_message":["imap",true]},"ajax_imap_archive_message":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_archive_message":["imap",true]},"ajax_imap_folder_expand":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_folder_expand":["imap",true],"add_folder_manage_link":["imap_folders",true],"save_imap_cache":["imap",true]},"ajax_imap_folder_display":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"imap_folder_page":["imap",true],"save_imap_cache":["imap",true],"close_session_early":["core",true]},"ajax_imap_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"default_sort_order_setting":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_search":["imap",true]},"ajax_adv_search":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"process_adv_search_request":["advanced_search",true],"default_sort_order_setting":["core",true],"language":["core",true],"date":["core",true],"advanced_search_prepare":["advanced_search",true],"http_headers":["core",true]},"ajax_imap_combined_inbox":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_combined_inbox":["imap",true]},"ajax_imap_all_email":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_theme":["themes",true],"language":["core",true],"date":["core",true],"http_headers":["core",true],"message_list_type":["core",true],"imap_message_list_type":["imap",true],"load_imap_servers_from_config":["imap",true],"imap_oauth2_token_check":["imap",true],"close_session_early":["core",true],"imap_combined_inbox":["imap",true]},"functional_api":{"default_smtp_server":["smtp",true]},"profiles":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_smtp_servers_from_config":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"profile_data":["profiles",true],"process_profile_delete":["profiles",true],"process_profile_update":["profiles",true],"profile_edit_data":["profiles",true],"message_list_type":["profiles",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_smtp_debug":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"add_smtp_servers_to_page_data":["smtp",true],"smtp_connect":["smtp",true],"smtp_delete":["smtp",true],"smtp_forget":["smtp",true],"smtp_save":["smtp",true],"save_smtp_servers":["smtp",true],"save_user_data":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_smtp_save_draft":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["imap",true],"compose_profile_data":["profiles",true],"load_imap_servers_from_config":["imap",true],"smtp_save_draft":["smtp",true],"date":["core",true],"http_headers":["core",true]},"ajax_get_test_chunk":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["imap",true],"load_imap_servers_from_config":["imap",true],"get_test_chunk":["smtp",true]},"ajax_upload_chunk":{"login":["core",false],"load_user_data":["core",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["smtp",true],"compose_profile_data":["profiles",true],"upload_chunk":["smtp",true]},"ajax_smtp_delete_draft":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"process_delete_draft":["smtp",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_profiles_status":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"profile_status":["smtp",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_clear_attachment_chunks":{"login":["core",false],"load_user_data":["core",true],"clear_attachment_chunks":["smtp",true]},"accounts":{"stay_logged_in":["core",false],"login":["core",false],"check_internal_users":["account",true],"account_list":["account",true],"process_create_account":["account",true],"process_delete_account":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["account",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"change_password":{"stay_logged_in":["core",false],"login":["core",false],"check_internal_users":["account",true],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"process_change_password":["account",true],"message_list_type":["account",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_no_op":{"login":["core",false],"load_user_data":["core",true],"process_idle_time":["idle_timer",true],"date":["core",true],"http_headers":["core",true]},"calendar":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_calendar_date":["calendar",true],"process_delete_event":["calendar",true],"process_add_event":["calendar",true],"message_list_type":["calendar",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_wordpess_notifications":[],"ajax_github_data":[],"ajax_nux_service_select":{"login":["core",false],"load_user_data":["core",true],"setup_nux":["nux",true],"process_nux_service":["nux",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_nux_add_service":{"login":["core",false],"load_user_data":["core",true],"setup_nux":["nux",true],"load_smtp_servers_from_config":["smtp",true],"load_imap_servers_from_config":["imap",true],"process_nux_add_service":["nux",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"history":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"get_inline_message_setting":["inline_message",true],"message_list_type":["history",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"load_message_history":["history",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_github_event_detail":[],"ajax_wp_notice_display":[],"ajax_save_search":{"login":["core",false],"load_user_data":["core",true],"save_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_search":{"login":["core",false],"load_user_data":["core",true],"update_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_delete_search":{"login":["core",false],"load_user_data":["core",true],"delete_search":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"ajax_update_save_search_label":{"login":["core",false],"load_user_data":["core",true],"update_save_search_label":["core",true],"language":["saved_searches",true],"date":["core",true],"http_headers":["core",true]},"highlights":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"load_feeds_from_config":["feeds",true],"message_list_type":["highlights",true],"language":["core",true],"highlight_process_form":["highlights",true],"highlight_page_data":["highlights",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_smtp_attach_file":[],"folders":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"folders_server_id":["imap_folders",true],"special_folders":["imap_folders",true],"message_list_type":["imap_folders",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]},"ajax_imap_folders_delete":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_delete":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_folders_rename":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_rename":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_folders_create":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_folder_create":["imap_folders",true],"imap_bust_cache":["imap",true],"close_session_early":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_clear_special_folder":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_clear_special_folder":["imap_folders",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_special_folder":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_special_folder":["imap_folders",true],"save_user_data":["core",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"ajax_imap_accept_special_folders":{"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_imap_servers_from_config":["imap",true],"process_accept_special_folders":["imap_folders",true],"language":["core",true],"date":["core",true],"http_headers":["core",true]},"shortcuts":{"stay_logged_in":["core",false],"login":["core",false],"default_page_data":["core",true],"load_user_data":["core",true],"load_keyboard_shortcuts":["keyboard_shortcuts",true],"load_edit_id":["keyboard_shortcuts",true],"process_edit_shortcut":["keyboard_shortcuts",true],"load_theme":["themes",true],"idle_time_check":["idle_timer",true],"smtp_default_server":["smtp",true],"load_imap_servers_from_config":["imap",true],"fix_folder_assignments":["imap_folders",true],"imap_oauth2_token_check":["imap",true],"add_imap_servers_to_page_data":["imap",true],"prefetch_imap_folders":["imap",true],"load_imap_servers_for_message_list":["imap",true],"load_pop3_servers_from_config":["pop3",true],"load_pop3_servers_for_message_list":["pop3",true],"message_list_type":["keyboard_shortcuts",true],"language":["core",true],"process_search_terms":["core",true],"title":["core",true],"date":["core",true],"save_user_data":["core",true],"logout":["core",true],"http_headers":["core",true]}},"output_modules":{"home":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"home_heading":["core",true],"home_password_dialogs":["core",true],"welcome_dialog":["nux",true],"nux_help":["nux",true],"nux_dev_news":["nux",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"servers":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"server_content_start":["core",true],"quick_add_section":["nux",true],"quick_add_dialog":["nux",true],"add_smtp_server_dialog":["smtp",true],"display_configured_smtp_servers":["smtp",true],"add_imap_server_dialog":["imap",true],"display_configured_imap_servers":["imap",true],"add_jmap_server_dialog":["imap",true],"display_configured_jmap_servers":["imap",true],"add_pop3_server_dialog":["pop3",true],"display_configured_pop3_servers":["pop3",true],"add_feed_dialog":["feeds",true],"display_configured_feeds":["feeds",true],"server_content_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"feed_ids":["feeds",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"compose":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"compose_form_draft_list":["smtp",true],"compose_signature_values":["profiles",true],"compose_form_start":["smtp",true],"compose_form_content":["smtp",true],"compose_signature_button":["profiles",true],"imap_unflag_on_send_controls":["imap",true],"compose_form_end":["smtp",true],"compose_form_attach":["smtp",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"save":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"save_form":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"settings":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"start_settings_form":["core",true],"start_general_settings":["core",true],"enable_shortcut_setting":["keyboard_shortcuts",true],"inline_message_setting":["inline_message",true],"inline_message_style":["inline_message",true],"compose_type_setting":["smtp",true],"attachment_setting":["smtp",true],"auto_bcc_setting":["smtp",true],"language_setting":["core",true],"theme_setting":["feeds",true],"timezone_setting":["core",true],"no_folder_icon_setting":["core",true],"mailto_handler_setting":["core",true],"msg_list_icons_setting":["core",true],"imap_msg_icons_setting":["imap",true],"original_folder_setting":["imap",true],"imap_unread_on_open":["imap",true],"imap_pagination_links":["imap",true],"imap_per_page_setting":["imap",true],"enable_simple_download_options":["imap",true],"imap_simple_msg_parts":["imap",true],"list_style_setting":["core",true],"idle_time_setting":["idle_timer",true],"text_only_setting":["imap",true],"delete_prompt_setting":["core",true],"no_password_setting":["core",true],"start_page_setting":["core",true],"default_sort_order_setting":["core",true],"start_unread_settings":["core",true],"unread_since_setting":["core",true],"unread_source_max_setting":["core",true],"unread_feeds_included":["feeds",true],"start_flagged_settings":["core",true],"flagged_since_setting":["core",true],"flagged_source_max_setting":["core",true],"start_everything_settings":["core",true],"all_since_setting":["core",true],"all_source_max_setting":["core",true],"start_all_email_settings":["core",true],"all_email_since_setting":["core",true],"all_email_source_max_setting":["core",true],"start_feed_settings":["feeds",true],"feed_since_setting":["feeds",true],"feed_limit_setting":["feeds",true],"start_sent_settings":["imap",true],"sent_since_setting":["imap",true],"sent_source_max_setting":["imap",true],"end_settings_form":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"message_list":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"highlight_css":["highlights",true],"content_section_start":["core",true],"imap_custom_controls":["imap",true],"move_copy_controls":["imap",true],"message_list_heading":["core",true],"nux_message_list_notice":["nux",true],"message_list_start":["core",true],"message_list_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"search":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"search_move_copy_controls":["core",true],"search_content_start":["core",true],"search_form_start":["core",true],"search_form_content":["core",true],"search_name_fld":["saved_searches",true],"advanced_search_link":["advanced_search",true],"search_form_end":["core",true],"update_search_icon":["saved_searches",true],"delete_search_icon":["saved_searches",true],"message_list_start":["core",true],"search_results_table_end":["core",true],"update_search_label_icon":["saved_searches",true],"save_search_icon":["saved_searches",true],"search_content_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"advanced_search":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"search_move_copy_controls":["core",true],"advanced_search_content_start":["advanced_search",true],"advanced_search_form_start":["advanced_search",true],"advanced_search_form_content":["advanced_search",true],"advanced_search_form_end":["advanced_search",true],"message_list_start":["advanced_search",true],"advanced_search_results_table_end":["advanced_search",true],"advanced_search_content_end":["advanced_search",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"message":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"message_start":["core",true],"message_end":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"imap_server_ids":["imap",true],"page_js":["core",true],"content_end":["core",false]},"notfound":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"notfound_content":["core",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_hm_folders":{"filter_feed_folders":["feeds",true],"filter_pop3_folders":["pop3",true],"filter_imap_folders":["imap",true],"search_folders":["saved_searches",true],"folder_list_content_start":["core",true],"main_menu_start":["core",true],"search_from_folder_list":["core",true],"main_menu_content":["core",true],"contacts_page_link":["contacts",true],"compose_page_link":["smtp",true],"sent_folder_link":["smtp",true],"calendar_page_link":["calendar",true],"history_page_link":["history",true],"logout_menu_item":["core",true],"main_menu_end":["core",true],"email_menu_content":["core",true],"settings_menu_start":["core",true],"settings_servers_link":["core",true],"settings_site_link":["core",true],"settings_save_link":["core",true],"highlight_link":["highlights",true],"change_password_link":["account",true],"create_account_link":["account",true],"profile_page_link":["profiles",true],"folders_page_link":["imap_folders",true],"shortcuts_page_link":["keyboard_shortcuts",true],"settings_menu_end":["core",true],"folder_list_content_end":["core",true]},"contacts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"contacts_content_start":["contacts",true],"contacts_form":["contacts",true],"contacts_list":["contacts",true],"contacts_content_end":["contacts",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_imap_message_content":{"filter_message_headers":["imap",true],"add_message_contacts":["contacts",true],"filter_message_body":["imap",true],"filter_message_struct":["imap",true]},"ajax_autocomplete_contact":{"filter_autocomplete_list":["contacts",true]},"info":[],"ajax_feed_combined":{"filter_feed_list_data":["feeds",true]},"ajax_feed_item_content":{"filter_feed_item_content":["feeds",true]},"ajax_feed_status":{"filter_feed_status_data":["feeds",true]},"ajax_pop3_folder_display":{"filter_pop3_message_list":["pop3",true]},"ajax_pop3_message_display":{"filter_pop3_message_content":["pop3",true]},"ajax_pop3_status":{"filter_pop3_status_data":["pop3",true]},"ajax_imap_sent":{"filter_sent_data":["imap",true]},"ajax_imap_unread":{"filter_unread_data":["imap",true]},"ajax_imap_status":{"filter_imap_status_data":["imap",true]},"ajax_imap_flagged":{"filter_flagged_data":["imap",true]},"ajax_imap_folder_expand":{"filter_expanded_folder_data":["imap",true]},"ajax_imap_folder_display":{"filter_folder_page":["imap",true]},"ajax_imap_search":{"filter_imap_search":["imap",true]},"ajax_imap_combined_inbox":{"filter_combined_inbox":["imap",true]},"ajax_imap_all_email":{"filter_all_email":["imap",true]},"accounts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"create_form":["account",true],"user_list":["account",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"change_password":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"change_password":["account",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"calendar":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"add_cal_event_form":["calendar",true],"calendar_content":["calendar",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_nux_service_select":{"filter_service_select":["nux",true]},"history":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"inline_message_flag":["inline_message",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"history_heading":["history",true],"history_content":["history",true],"history_footer":["history",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"ajax_save_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_update_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_delete_search":{"filter_saved_search_result":["saved_searches",true]},"ajax_update_save_search_label":{"filter_saved_search_result":["saved_searches",true]},"ajax_adv_search":{"filter_imap_advanced_search":["advanced_search",true]},"highlights":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"highlight_config_page":["highlights",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"profiles":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"profile_edit_form":["profiles",true],"profile_content":["profiles",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"folders":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"folders_content_start":["imap_folders",true],"folders_server_select":["imap_folders",true],"folders_create_dialog":["imap_folders",true],"folders_rename_dialog":["imap_folders",true],"folders_delete_dialog":["imap_folders",true],"folders_trash_dialog":["imap_folders",true],"folders_sent_dialog":["imap_folders",true],"folders_draft_dialog":["imap_folders",true],"folders_archive_dialog":["imap_folders",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]},"shortcuts":{"header_start":["core",false],"header_css":["core",true],"theme_css":["themes",true],"header_content":["core",false],"keyboard_shortcut_data":["keyboard_shortcuts",true],"js_data":["core",true],"js_search_data":["core",true],"header_end":["core",false],"content_start":["core",false],"prefetch_imap_folder_ids":["imap",true],"login_start":["core",false],"login":["core",false],"login_end":["core",false],"loading_icon":["core",true],"date":["core",true],"msgs":["core",false],"folder_list_start":["core",true],"folder_list_end":["core",true],"content_section_start":["core",true],"start_shortcuts_page":["keyboard_shortcuts",true],"shortcut_edit_form":["keyboard_shortcuts",true],"shortcuts_content":["keyboard_shortcuts",true],"content_section_end":["core",true],"save_reminder":["core",true],"page_js":["core",true],"content_end":["core",false]}},"input_filters":{"allowed_output":{"date":[522,false],"formatted_folder_list":[516,false],"router_user_msgs":[522,16777216],"router_login_state":[258,false],"formatted_message_list":[516,16777216],"just_saved_credentials":[258,false],"just_forgot_credentials":[258,false],"deleted_server_id":[257,false],"msg_headers":[516,false],"msg_text":[516,false],"msg_parts":[516,false],"page_links":[516,false],"folder_status":[522,16777216],"contact_deleted":[257,false],"contact_suggestions":[522,16777216],"feed_connect_status":[522,false],"feed_connect_time":[522,false],"feed_detail_display":[516,false],"feed_status_display":[516,false],"feed_status_server_id":[257,false],"feed_server_ids":[522,false],"feed_msg_headers":[516,false],"feed_msg_text":[516,false],"pop3_connect_status":[522,false],"pop3_connect_time":[522,false],"pop3_detail_display":[522,false],"pop3_status_display":[516,false],"pop3_status_server_id":[257,false],"pop3_server_id":[257,false],"imap_connect_status":[522,false],"connect_status":[522,false],"auto_sent_folder":[522,false],"imap_connect_time":[522,false],"imap_detail_display":[516,false],"imap_status_display":[516,false],"imap_status_server_id":[257,false],"imap_expanded_folder_path":[522,false],"imap_expanded_folder_formatted":[516,false],"imap_server_ids":[522,false],"imap_server_id":[257,false],"combined_inbox_server_ids":[522,false],"imap_delete_error":[258,false],"move_count":[522,16777216],"show_pagination_links":[258,false],"file_details":[516,false],"draft_subject":[522,false],"draft_id":[257,false],"profile_value":[522,false],"msg_sent_and_archived":[258,false],"nux_service_step_two":[516,false],"nux_account_added":[258,false],"nux_server_id":[257,false],"nux_service_name":[522,false],"saved_search_result":[257,false],"new_saved_search_label":[522,false],"imap_folders_success":[257,false],"imap_special_name":[522,false]},"allowed_get":{"page":522,"msgs":522,"list_path":522,"list_parent":522,"list_page":257,"uid":522,"search_terms":516,"search_since":522,"search_fld":522,"filter":522,"sort":522,"keyword":522,"contact_id":257,"contact_page":257,"contact_type":522,"contact_source":522,"imap_server_id":257,"imap_download_message":258,"imap_show_message":258,"imap_msg_part":522,"imap_draft":257,"reply":257,"reply_all":257,"forward":257,"draft_id":257,"hm_ajax_hook":522,"compose_to":522,"mailto_uri":522,"compose_from":522,"resumableChunkNumber":257,"resumableTotalChunks":257,"resumableChunkSize":257,"resumableCurrentChunkSize":257,"resumableTotalSize":257,"resumableType":522,"resumableIdentifier":522,"resumableFilename":522,"resumableRelativePath":522,"draft_smtp":522,"date":522,"view":522,"action":522,"code":522,"state":522,"error":522,"security_token":522,"search_name":522,"profile_id":257,"edit_id":257},"allowed_cookie":{"CYPHTID":522,"hm_id":522,"hm_session":522,"hm_msgs":522,"hm_reload_folders":257},"allowed_post":{"payload":522,"reset_factory":522,"hm_page_key":522,"logout":258,"save_and_logout":258,"limit":257,"username":522,"show_list_icons":258,"password":516,"hm_ajax_hook":522,"save_settings":522,"save_settings_permanently":522,"save_settings_permanently_then_logout":522,"language":522,"flagged_per_source":257,"flagged_since":522,"unread_per_source":257,"unread_since":522,"all_email_per_source":257,"all_email_since":522,"all_per_source":257,"all_since":522,"no_folder_icons":258,"mailto_handler":258,"list_style":522,"timezone":522,"disable_delete_prompt":257,"section_state":522,"section_class":522,"message_ids":522,"action_type":522,"server_pw_id":522,"message_list_since":522,"no_password_save":258,"start_page":522,"default_sort_order":522,"stay_logged_in":258,"contact_email":522,"contact_name":522,"contact_phone":522,"contact_id":257,"contact_value":522,"edit_contact":522,"add_contact":522,"contact_source":522,"contact_type":522,"feed_id":257,"delete_feed":257,"feed_connect":257,"feed_server_ids":522,"submit_feed":522,"new_feed_name":522,"feed_delete":257,"new_feed_address":522,"unread_exclude_feeds":257,"feed_list_path":522,"feed_uid":522,"feed_since":522,"feed_limit":257,"feed_search":257,"new_pop3_name":522,"new_pop3_address":522,"new_pop3_port":522,"pop3_connect":257,"pop3_forget":257,"pop3_save":257,"pop3_delete":257,"submit_pop3_server":522,"pop3_server_id":257,"pop3_server_ids":522,"pop3_user":522,"pop3_pass":516,"pop3_list_path":522,"pop3_uid":257,"pop3_limit":257,"pop3_since":522,"pop3_unread_only":258,"pop3_search":257,"server_port":257,"server":522,"imap_server_id":257,"imap_server_ids":522,"imap_user":522,"imap_pass":516,"text_only":258,"msg_part_icons":258,"simple_msg_parts":258,"pagination_links":258,"imap_per_page_setting":258,"unread_on_open":258,"imap_allow_images":258,"imap_delete":522,"imap_connect":522,"imap_remember":257,"imap_folder_ids":522,"imap_forget":522,"imap_save":522,"submit_imap_server":522,"submit_jmap_server":522,"new_jmap_address":518,"new_jmap_name":522,"new_imap_address":522,"new_imap_hidden":258,"new_imap_port":257,"new_imap_name":522,"sieve_config_host":522,"imap_sieve_host":522,"tls":258,"folder":522,"force_update":258,"imap_folder_state":516,"imap_msg_uid":522,"imap_msg_part":522,"imap_prefetch":258,"hide_imap_server":258,"imap_flag_state":522,"combined_source_state":257,"list_path":522,"imap_move_ids":522,"imap_move_to":522,"imap_move_action":522,"sent_since":522,"sent_per_source":522,"imap_move_page":522,"compose_unflag_send":258,"imap_per_page":257,"original_folder":258,"post_archive":257,"attachment_id":522,"smtp_compose_type":257,"new_smtp_name":522,"new_smtp_address":522,"new_smtp_port":522,"smtp_connect":257,"smtp_forget":257,"smtp_save":257,"smtp_delete":257,"smtp_send":257,"submit_smtp_server":522,"smtp_server_id":257,"smtp_user":522,"smtp_pass":516,"delete_uploaded_files":258,"compose_to":516,"compose_msg_path":522,"compose_msg_uid":257,"compose_body":516,"compose_subject":516,"compose_in_reply_to":516,"compose_cc":516,"compose_bcc":516,"compose_smtp_id":522,"draft_id":257,"draft_body":516,"draft_subject":516,"draft_to":516,"draft_smtp":522,"draft_cc":516,"draft_bcc":516,"draft_in_reply_to":516,"draft_notice":258,"smtp_auto_bcc":257,"profile_value":522,"uploaded_files":522,"send_uploaded_files":522,"next_email_post":522,"create_username":522,"create_password":516,"create_password_again":516,"delete_username":522,"new_pass1":516,"new_pass2":516,"old_pass":516,"change_password":522,"idle_time":257,"event_title":522,"event_detail":522,"event_date":522,"event_time":522,"event_repeat":522,"delete_id":522,"theme_setting":522,"nux_service":522,"nux_email":522,"nux_name":522,"nux_pass":516,"nux_account_name":522,"search_name":522,"search_terms":522,"search_fld":522,"search_since":522,"search_terms_label":522,"old_search_terms_label":522,"adv_source":522,"adv_start":522,"adv_source_limit":257,"adv_end":522,"adv_charset":522,"adv_flags":{"filter":522,"flags":16777216},"adv_terms":{"filter":522,"flags":16777216},"adv_targets":{"filter":522,"flags":16777216},"rule_del_id":257,"hl_target":522,"hl_color":522,"hl_source_type":522,"hl_important":258,"hl_feeds_unseen":258,"hl_github_unseen":258,"hl_imap_flags":{"filter":522,"flags":16777216},"hl_imap_sources":{"filter":522,"flags":16777216},"hl_github_sources":{"filter":522,"flags":16777216},"hl_feeds_sources":{"filter":522,"flags":16777216},"profile_name":522,"profile_id":257,"profile_replyto":522,"profile_smtp":522,"profile_imap":522,"profile_default":257,"profile_address":522,"profile_sig":516,"profile_delete":522,"inline_message":257,"inline_message_style":522,"parent":522,"new_folder":522,"special_folder_type":522,"imap_service_name":522,"enable_keyboard_shortcuts":257,"shortcut_meta":{"filter":522,"flags":67108864},"shortcut_key":257,"shortcut_id":257},"allowed_server":{"REQUEST_URI":522,"REQUEST_METHOD":522,"SERVER_ADDR":275,"REMOTE_ADDR":275,"SERVER_PORT":257,"SERVER_PROTOCOL":522,"PHP_SELF":522,"REQUEST_SCHEME":522,"HTTP_HOST":522,"HTTP_ORIGIN":273,"HTTP_REFERER":273,"HTTP_ACCEPT_LANGUAGE":522,"HTTP_ACCEPT_ENCODING":522,"HTTP_ACCEPT_CHARSET":522,"HTTP_ACCEPT":522,"HTTP_USER_AGENT":522,"HTTPS":522,"SERVER_NAME":522,"HTTP_X_REQUESTED_WITH":522,"HTTP_X_FORWARDED_HOST":522},"allowed_pages":["save","home","compose","message_list","message","settings","servers","ajax_test","ajax_hm_folders","ajax_message_action","ajax_reset_search","ajax_update_server_pw","ajax_no_op","notfound","search","contacts","ajax_add_contact","ajax_delete_contact","ajax_autocomplete_contact","ajax_feed_combined_inbox","ajax_feed_list_display","ajax_feed_item_content","ajax_feed_combined","ajax_feed_debug","ajax_feed_status","ajax_pop3_debug","ajax_pop3_message_display","ajax_pop3_folder_display","ajax_pop3_unread","ajax_pop3_status","ajax_imap_debug","ajax_imap_status","ajax_imap_unread","ajax_imap_sent","ajax_imap_flagged","ajax_imap_folder_expand","ajax_imap_folder_display","ajax_imap_combined_inbox","ajax_imap_search","ajax_unread_count","ajax_imap_message_content","ajax_imap_save_folder_state","ajax_imap_message_action","ajax_imap_delete_message","ajax_imap_archive_message","ajax_imap_flag_message","ajax_imap_update_combined_source","ajax_imap_mark_as_read","ajax_imap_move_copy_action","ajax_imap_folder_status","ajax_clear_attachment_chunks","ajax_smtp_debug","ajax_smtp_save_draft","ajax_smtp_delete_draft","ajax_profiles_status","ajax_get_test_chunk","ajax_upload_chunk","accounts","change_password","ajax_no_op","calendar","ajax_nux_service_select","ajax_nux_add_service","history","ajax_save_search","ajax_update_search","ajax_delete_search","ajax_update_save_search_label","advanced_search","ajax_adv_search","highlights","profiles","folders","ajax_imap_folders_delete","ajax_imap_folders_create","ajax_imap_folders_rename","ajax_imap_special_folder","ajax_imap_clear_special_folder","ajax_imap_accept_special_folders","shortcuts"]}}
\ No newline at end of file

From 99c5bb0d2785051a95a0c64f9db8079971823c11 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 19:40:21 +0100
Subject: [PATCH 45/55] Ref: remove logs

---
 modules/core/site.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/core/site.js b/modules/core/site.js
index 8b6148d333..fc6adab870 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -2162,7 +2162,6 @@ function submitSmtpImapServer() {
         $('#srv_setup_stepper_form_loader').addClass('hide');
         $('.step_config-actions').removeClass('hide');
         Hm_Notices.show(res.router_user_msgs);
-        console.log("res", res);
 
         if (res.just_saved_credentials) {
             $('#srv_setup_stepper_stepper').find('form').trigger('reset');

From cb752dcb59d699e349a7ea4e6975a3993198a85b Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 19:41:42 +0100
Subject: [PATCH 46/55] Ref: remove unused function

---
 modules/core/handler_modules.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index 83bc128049..4779ee206e 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -1030,8 +1030,7 @@ public function process() {
                     return;
                 }
                 
-                $this->jmap_server_id = connect_to_jmap_server($jmapAddress, $jmapHideFromCPage, $profileName, $email, $password, 'imap', $this);
-                 connect_to_imap_server(
+                $this->jmap_server_id = connect_to_imap_server(
                      $jmapAddress,
                      $profileName,
                      $imapPort,

From f9ab9755d09f569ee56fc6bca3f0070dbe0b8a6c Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 19:45:29 +0100
Subject: [PATCH 47/55] Ref: fix indentation

---
 modules/core/handler_modules.php | 167 ++++++++++++++++---------------
 1 file changed, 84 insertions(+), 83 deletions(-)

diff --git a/modules/core/handler_modules.php b/modules/core/handler_modules.php
index 4779ee206e..6ad7967751 100644
--- a/modules/core/handler_modules.php
+++ b/modules/core/handler_modules.php
@@ -972,28 +972,28 @@ class Hm_Handler_quick_servers_setup extends Hm_Handler_Module {
 
     public function process() {
         list($success, $form) = $this->process_form(array(
-           'srv_setup_stepper_profile_name',
-           'srv_setup_stepper_email',
-           'srv_setup_stepper_password',
-           'srv_setup_stepper_provider',
-           'srv_setup_stepper_is_sender',
-           'srv_setup_stepper_is_receiver',
-           'srv_setup_stepper_smtp_address',
-           'srv_setup_stepper_smtp_port',
-           'srv_setup_stepper_smtp_tls',
-           'srv_setup_stepper_imap_address',
-           'srv_setup_stepper_imap_port',
-           'srv_setup_stepper_imap_tls',
-           'srv_setup_stepper_enable_sieve',
-           'srv_setup_stepper_create_profile',
-           'srv_setup_stepper_profile_is_default',
-           'srv_setup_stepper_profile_signature',
-           'srv_setup_stepper_profile_reply_to',
-           'srv_setup_stepper_imap_sieve_host',
-           'srv_setup_stepper_only_jmap',
-           'srv_setup_stepper_jmap_hide_from_c_page',
-           'srv_setup_stepper_jmap_address',
-           ));
+            'srv_setup_stepper_profile_name',
+            'srv_setup_stepper_email',
+            'srv_setup_stepper_password',
+            'srv_setup_stepper_provider',
+            'srv_setup_stepper_is_sender',
+            'srv_setup_stepper_is_receiver',
+            'srv_setup_stepper_smtp_address',
+            'srv_setup_stepper_smtp_port',
+            'srv_setup_stepper_smtp_tls',
+            'srv_setup_stepper_imap_address',
+            'srv_setup_stepper_imap_port',
+            'srv_setup_stepper_imap_tls',
+            'srv_setup_stepper_enable_sieve',
+            'srv_setup_stepper_create_profile',
+            'srv_setup_stepper_profile_is_default',
+            'srv_setup_stepper_profile_signature',
+            'srv_setup_stepper_profile_reply_to',
+            'srv_setup_stepper_imap_sieve_host',
+            'srv_setup_stepper_only_jmap',
+            'srv_setup_stepper_jmap_hide_from_c_page',
+            'srv_setup_stepper_jmap_address',
+        ));
 
         if ($success) {
             // Destructure form array into variables
@@ -1020,88 +1020,89 @@ public function process() {
                 'srv_setup_stepper_jmap_hide_from_c_page' => $jmapHideFromCPage,
                 'srv_setup_stepper_jmap_address' => $jmapAddress,
             ] = $form;
-            
+
             /*
             * When JMAP selected only configure JMAP
             */
-             if(isset($onlyJmap) && $onlyJmap) {
+            if(isset($onlyJmap) && $onlyJmap) {
                 if (!$this->module_is_supported('jmap')) {
                     Hm_Msgs::add("ERRJMAP module is not enabled");
                     return;
                 }
-                
+
                 $this->jmap_server_id = connect_to_imap_server(
-                     $jmapAddress,
-                     $profileName,
-                     $imapPort,
-                     $email,
-                     $password,
-                     $imapTls,
-                     null,
-                     false,
-                     'imap',
-                     $this,
-                     $jmapHideFromCPage);
-                
+                    $jmapAddress,
+                    $profileName,
+                    $imapPort,
+                    $email,
+                    $password,
+                    $imapTls,
+                    null,
+                    false,
+                    'imap',
+                    $this,
+                    $jmapHideFromCPage
+                );
+
                 Hm_Msgs::add("JMAP Server saved");
                 $this->out('just_saved_credentials', true);
-                          
-             } else {
-                 /*
-                 *  Connect to SMTP server if user wants to send emails
-                 */
-                 if($isSender){
+            } else {
+                /*
+                *  Connect to SMTP server if user wants to send emails
+                */
+                if($isSender){
                     if (!$this->module_is_supported('smtp')) {
                         Hm_Msgs::add("ERRSMTP module is not enabled");
                         return;
                     }
-                    
+
                     $this->smtp_server_id = connect_to_smtp_server($smtpAddress, $profileName, $smtpPort, $email, $password, $smtpTls, $this);
                     if(!isset($this->smtp_server_id)){
                         return;
                     }
-                 }
-    
-                 /*
-                  *  Connect to IMAP server if user wants to receive emails
-                  */
-                 if($isReceiver){
-                     if (!$this->module_is_supported('imap')) {
+                }
+
+                /*
+                *  Connect to IMAP server if user wants to receive emails
+                */
+                if($isReceiver){
+                    if (!$this->module_is_supported('imap')) {
                         Hm_Msgs::add("ERRIMAP module is not enabled");
                         return;
-                     }
+                    }
 
-                     $this->imap_server_id = connect_to_imap_server(
-                          $imapAddress,
-                          $profileName,
-                          $imapPort,
-                          $email,
-                          $password,
-                          $imapTls,
-                          $imapSieveHost,
-                          $enableSieve,
-                          'imap',
-                          $this);
-                      
-                      if(!isset($this->imap_server_id)) {
-                          if($isSender && isset($this->smtp_server_id)){
-                                delete_smtp_server($this->smtp_server_id, $this);
-                          }
-                          return;
-                      };
-                 }
-    
-                 if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
-                      if (!$this->module_is_supported('profiles')) {
-                         Hm_Msgs::add("ERRProfiles module is not enabled");
-                         return;
-                      }
-                                          
-                     add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $this);
-                 }
-    
-                 Hm_Msgs::add("Server saved");
-                 $this->out('just_saved_credentials', true);
+                    $this->imap_server_id = connect_to_imap_server(
+                        $imapAddress,
+                        $profileName,
+                        $imapPort,
+                        $email,
+                        $password,
+                        $imapTls,
+                        $imapSieveHost,
+                        $enableSieve,
+                        'imap',
+                        $this
+                    );
+
+                    if(!isset($this->imap_server_id)) {
+                        if($isSender && isset($this->smtp_server_id)){
+                            delete_smtp_server($this->smtp_server_id, $this);
+                        }
+                        return;
+                    };
+                }
+
+                if($isSender && $isReceiver && $createProfile && isset($this->imap_server_id) && isset($this->smtp_server_id)) {
+                    if (!$this->module_is_supported('profiles')) {
+                        Hm_Msgs::add("ERRProfiles module is not enabled");
+                        return;
+                    }
+
+                    add_profile($profileName, $profileSignature, $profileReplyTo, $profileIsDefault, $email, $imapAddress, $this->smtp_server_id, $this->imap_server_id, $this);
+                }
+
+                Hm_Msgs::add("Server saved");
+                $this->out('just_saved_credentials', true);
             }
         }
     }

From 1197d01be692cec94ae44b002181db898a0104c6 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 19:46:43 +0100
Subject: [PATCH 48/55] Ref: fix function name

---
 modules/smtp/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index 1717f00de6..af4009e31e 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -3,7 +3,7 @@
 
 if (!defined('DEBUG_MODE')) { die(); }
 
-if (!hm_exists('add_and_connect_to_smtp_server')) {
+if (!hm_exists('connect_to_smtp_server')) {
     function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $context) {
         Hm_SMTP_List::init($context->user_config, $context->session);
         $smtp_list = array(

From fae1f280050079f3b7baa4836f8f1375f5bb90c7 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 19:48:53 +0100
Subject: [PATCH 49/55] Ref: fix indentation

---
 modules/smtp/modules.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index a27afd48d8..14432a235a 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -442,8 +442,7 @@ public function process() {
                     Hm_Msgs::add('ERRThis server and username are already configured');
                     return;
                 }
-
-               $smtp = Hm_SMTP_List::connect($form['smtp_server_id'], false, $form['smtp_user'], $form['smtp_pass'], true);
+                $smtp = Hm_SMTP_List::connect($form['smtp_server_id'], false, $form['smtp_user'], $form['smtp_pass'], true);
                 if (smtp_authed($smtp)) {
                     $just_saved_credentials = true;
                     Hm_Msgs::add("Server saved");

From c32e21e22ae277c4baf70bf1bba7ced8cbec4c72 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 20:01:30 +0100
Subject: [PATCH 50/55] Ref: use id from add server

---
 modules/imap/functions.php | 5 +----
 modules/smtp/functions.php | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 85452dbe5e..3a69b62e56 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1449,10 +1449,7 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
             $imap_list['sieve_config_host'] = $imap_sieve_host;
         }
 
-        Hm_IMAP_List::add($imap_list);
-        $servers = Hm_IMAP_List::dump(false, true);
-        $ids = array_keys($servers);
-        $imap_server_id = array_pop($ids);
+        $imap_server_id = Hm_IMAP_List::add($imap_list);
         $server = Hm_IMAP_List::get($imap_server_id, false);
 
         if ($enableSieve &&
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index af4009e31e..a4a6b6c096 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -15,10 +15,8 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $con
             'pass' => $pass,
             'tls' => $tls);
 
-        Hm_SMTP_List::add($smtp_list);
-        $servers = Hm_SMTP_List::dump(false, true);
-        $ids = array_keys($servers);
-        $smtp_server_id = array_pop($ids);
+
+        $smtp_server_id =  Hm_SMTP_List::add($smtp_list);
         $server = Hm_SMTP_List::get($smtp_server_id, false);
 
         $result = Hm_SMTP_List::service_connect($smtp_server_id, $server, $user, $pass, false);

From 80ad5748a21ca3cf1665a047533307b8ed5c84bd Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Tue, 12 Mar 2024 20:40:21 +0100
Subject: [PATCH 51/55] Ref: fix indentation

---
 modules/core/output_modules.php | 297 ++++++++++++++++----------------
 1 file changed, 147 insertions(+), 150 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 070271fa6f..d395b25b11 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -2075,150 +2075,147 @@ protected function output() {
 
 class Hm_Output_server_config_stepper extends Hm_Output_Module {
     protected function output() {
-    $accordionTitle = '';
-    $configuredText = $this->trans('Configured') .' ';
-    $hasEssentialModuleActivated = false;
-    
-    $hasImapActivated = in_array('imap', $this->get('router_module_list'), true);
-    $hasSmtpActivated = in_array('smtp', $this->get('router_module_list'), true);
-    $hasJmapActivated = in_array('jmap', $this->get('router_module_list'), true);
-    
-    if($hasImapActivated){
-        $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
-        $accordionTitle .= 'IMAP';
-        $configuredText .= $imap_servers_count .' IMAP';
-        $hasEssentialModuleActivated = true;
-    }
-    
-    if($hasJmapActivated){
-        $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
-        if($accordionTitle != ''){
-            $accordionTitle .= ' - ';
-            $configuredText .= ' / ';
+        $accordionTitle = '';
+        $configuredText = $this->trans('Configured') .' ';
+        $hasEssentialModuleActivated = false;
+
+        $hasImapActivated = in_array('imap', $this->get('router_module_list'), true);
+        $hasSmtpActivated = in_array('smtp', $this->get('router_module_list'), true);
+        $hasJmapActivated = in_array('jmap', $this->get('router_module_list'), true);
+
+        if($hasImapActivated){
+            $imap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return !array_key_exists('type', $v) || $v['type'] != 'jmap'; }));
+            $accordionTitle .= 'IMAP';
+            $configuredText .= $imap_servers_count .' IMAP';
+            $hasEssentialModuleActivated = true;
+        }
+
+        if($hasJmapActivated){
+            $jmap_servers_count = count(array_filter($this->get('imap_servers', array()), function($v) { return array_key_exists('type', $v) && $v['type'] == 'jmap'; }));
+            if($accordionTitle != ''){
+                $accordionTitle .= ' - ';
+                $configuredText .= ' / ';
+            }
+            $accordionTitle .= 'JMAP';
+            $configuredText .= $jmap_servers_count .' JMAP';
+            $hasEssentialModuleActivated = true;
         }
-        $accordionTitle .= 'JMAP';
-        $configuredText .= $jmap_servers_count .' JMAP';
-        $hasEssentialModuleActivated = true;
-    }
-    
-    if($hasSmtpActivated){        
-        $smtp_servers_count = count($this->get('smtp_servers', array()));
-        if($accordionTitle != ''){
-            $accordionTitle .= ' - ';
-            $configuredText .= ' / ';
+
+        if($hasSmtpActivated){
+            $smtp_servers_count = count($this->get('smtp_servers', array()));
+            if($accordionTitle != ''){
+                $accordionTitle .= ' - ';
+                $configuredText .= ' / ';
+            }
+            $accordionTitle .= 'SMTP';
+            $configuredText .= $smtp_servers_count .' SMTP';
+            $hasEssentialModuleActivated = true;
         }
-        $accordionTitle .= 'SMTP';
-        $configuredText .= $smtp_servers_count .' SMTP';
-        $hasEssentialModuleActivated = true;
-    }
-    
-    $accordionTitle .= ' Servers';
-    
-    // When essential module is not activated, we don't display the accordion
-    if(!$hasEssentialModuleActivated) return '';
 
-    $serverList = null;
+        $accordionTitle .= ' Servers';
 
+        // When essential module is not activated, we don't display the accordion
+        if(!$hasEssentialModuleActivated) return '';
 
-    if(class_exists('Nux_Quick_Services')){
-        $serverList = Nux_Quick_Services::option_list(false, $this);
-    }
+        $serverList = null;
 
-    $hideClass = 'd-none';
+        if(class_exists('Nux_Quick_Services')){
+            $serverList = Nux_Quick_Services::option_list(false, $this);
+        }
 
-    // Don't hide this section if at least one of the essential module is activated
-    if($hasImapActivated || $hasSmtpActivated || $hasJmapActivated){
-        $hideClass = '';
-    }
-    
-    
-    $res = '<div class="smtp_imap_server_setup '. $hideClass .'">
-              <div data-target=".server_config_section" class="server_section border-bottom cursor-pointer px-1 py-3 pe-auto">
-                  <a href="#" class="pe-auto">
-                      <i class="bi bi-envelope-fill me-3"></i>
-                      <b> '.$accordionTitle.'</b>
-                  </a> 
-                  <div class="server_count">'.$configuredText.'</div>
-              </div>
-         <div class="server_config_section">
-            <div class="stepper" id="srv_setup_stepper_stepper">
-                <div class="step-container">
-                    <div id="step_config_1" class="step step_config">
-                        <div class="step_config-title">
-                            <h2>'.$this->trans('Step 1').'</h2>
-                            <span>('.$this->trans('Authentication').')</span>
+        $hideClass = 'd-none';
+
+        // Don't hide this section if at least one of the essential module is activated
+        if($hasImapActivated || $hasSmtpActivated || $hasJmapActivated){
+            $hideClass = '';
+        }
+
+        $res = '<div class="smtp_imap_server_setup '. $hideClass .'">
+                  <div data-target=".server_config_section" class="server_section border-bottom cursor-pointer px-1 py-3 pe-auto">
+                      <a href="#" class="pe-auto">
+                          <i class="bi bi-envelope-fill me-3"></i>
+                          <b> '.$accordionTitle.'</b>
+                      </a> 
+                      <div class="server_count">'.$configuredText.'</div>
+                  </div>
+             <div class="server_config_section">
+                <div class="stepper" id="srv_setup_stepper_stepper">
+                    <div class="step-container">
+                        <div id="step_config_1" class="step step_config">
+                            <div class="step_config-title">
+                                <h2>'.$this->trans('Step 1').'</h2>
+                                <span>('.$this->trans('Authentication').')</span>
+                            </div>
+                            <div>
+                                <form class=" me-0" method="POST">
+                                        <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
+                                        <div class="form-floating mb-3">
+                                            <input required type="text" id="srv_setup_stepper_profile_name" name="srv_setup_stepper_profile_name" class="txt_fld form-control" value="" placeholder="'.$this->trans('Name').'">
+                                            <label class="" for="srv_setup_stepper_profile_name">'.$this->trans('Name').'</label>
+                                            <span id="srv_setup_stepper_profile_name-error" class="error-message"></span>
+                                        </div>
+                                        <div class="form-floating mb-3">
+                                            <input required type="text" id="srv_setup_stepper_email" name="srv_setup_stepper_email" class="txt_fld form-control" value="" placeholder="'.$this->trans('Email or Username').'">
+                                            <label class="" for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
+                                            <span id="srv_setup_stepper_email-error" class="error-message"></span>
+                                        </div>
+                                        <div class="form-floating mb-3">
+                                            <input required type="password" id="srv_setup_stepper_password" name="srv_setup_stepper_password" class="txt_fld form-control" value="" placeholder="'.$this->trans('Password').'">
+                                            <label class="" for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
+                                            <span id="srv_setup_stepper_password-error" class="error-message"></span>
+                                        </div>
+                                </form>
+                            </div>
+                            <div class="step_config-actions">
+                                <button class="btn btn-success px-5" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                                <button class="btn btn-success px-5" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
+                            </div>
                         </div>
-                        <div>
-                            <form class=" me-0" method="POST">
-                                    <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
-                                    <div class="form-floating mb-3">
-                                        <input required type="text" id="srv_setup_stepper_profile_name" name="srv_setup_stepper_profile_name" class="txt_fld form-control" value="" placeholder="'.$this->trans('Name').'">
-                                        <label class="" for="srv_setup_stepper_profile_name">'.$this->trans('Name').'</label>
-                                        <span id="srv_setup_stepper_profile_name-error" class="error-message"></span>
-                                    </div>
-                                    <div class="form-floating mb-3">
-                                        <input required type="text" id="srv_setup_stepper_email" name="srv_setup_stepper_email" class="txt_fld form-control" value="" placeholder="'.$this->trans('Email or Username').'">
-                                        <label class="" for="srv_setup_stepper_email">'.$this->trans('Email or Username').'</label>
-                                        <span id="srv_setup_stepper_email-error" class="error-message"></span>
-                                    </div>
+                        <div id="step_config_2" class="step step_config">
+                            <div class="step_config-title">
+                                <h2>'.$this->trans('Step 2').'</h2>
+                                <span>('.$this->trans('Mail server configuration').')</span>
+                            </div>
+                            <div>
+                                <form>
                                     <div class="form-floating mb-3">
-                                        <input required type="password" id="srv_setup_stepper_password" name="srv_setup_stepper_password" class="txt_fld form-control" value="" placeholder="'.$this->trans('Password').'">
-                                        <label class="" for="srv_setup_stepper_password">'.$this->trans('Password').'</label>
-                                        <span id="srv_setup_stepper_password-error" class="error-message"></span>
-                                    </div>
-                            </form>
-                        </div>
-                        <div class="step_config-actions">
-                            <button class="btn btn-success px-5" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                            <button class="btn btn-success px-5" onclick="display_config_step(2)">'.$this->trans('Next').'</button>
-                        </div>
-                    </div>
-                    <div id="step_config_2" class="step step_config">
-                        <div class="step_config-title">
-                            <h2>'.$this->trans('Step 2').'</h2>
-                            <span>('.$this->trans('Mail server configuration').')</span>
-                        </div>
-                        <div>
-                            <form>
-                                <div class="form-floating mb-3">
-                                  <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) label="'.$this->trans('Provider').'">
-                                    <option value="">'.$this->trans('Other').'</option>'.$serverList.'
-                                  </select>
-                                  <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
-                                </div>';
-                               
-   if($hasSmtpActivated && $hasImapActivated) {
-        $res .= '
-             <div class="form-check form-switch">
-               <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked>
-               <label class="form-check-label" for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
-             </div>
-             <div class="form-check form-switch">
-               <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked>
-               <label class="form-check-label" for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
-             </div>
-              <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
-        ';
-   }
-                               
-   $res .= '<div class="step_config-smtp_imap_bloc">';
-
-   return $res;
-
-   }
+                                      <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) label="'.$this->trans('Provider').'">
+                                        <option value="">'.$this->trans('Other').'</option>'.$serverList.'
+                                      </select>
+                                      <label for="srv_setup_stepper_provider">'.$this->trans('Provider').'</label>
+                                    </div>';
+
+        if($hasSmtpActivated && $hasImapActivated) {
+            $res .= '
+                 <div class="form-check form-switch">
+                   <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_sender" checked>
+                   <label class="form-check-label" for="srv_setup_stepper_is_sender">'.$this->trans('Sender account').'</label>
+                 </div>
+                 <div class="form-check form-switch">
+                   <input class="form-check-input" type="checkbox" role="switch" onchange="handleSmtpImapCheckboxChange(this)" id="srv_setup_stepper_is_receiver" checked>
+                   <label class="form-check-label" for="srv_setup_stepper_is_receiver">'.$this->trans('Receiver account').'</label>
+                 </div>
+                  <span id="srv_setup_stepper_serve_type-error" class="error-message"></span>
+            ';
+        }
+
+        $res .= '<div class="step_config-smtp_imap_bloc">';
+
+        return $res;
+    }
 }
 
 class Hm_Output_server_config_stepper_end_part extends Hm_Output_Module {
     protected function output() {
         $res = '</div>';
-        
+
         if(in_array('profiles', $this->get('router_module_list'), true)) {
             $res .= '
-                 <div class="form-check form-switch mt-3" id="srv_setup_stepper_profile_checkbox_bloc">
-                   <input class="form-check-input" type="checkbox" role="switch" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked>
-                   <label class="form-check-label" for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
-                 </div>
-                 <div class="ms-3" id="srv_setup_stepper_profile_bloc">
+                <div class="form-check form-switch mt-3" id="srv_setup_stepper_profile_checkbox_bloc">
+                    <input class="form-check-input" type="checkbox" role="switch" onchange="handleCreateProfileCheckboxChange(this)" id="srv_setup_stepper_create_profile" checked>
+                    <label class="form-check-label" for="srv_setup_stepper_create_profile">'.$this->trans('Create Profile').'</label>
+                </div>
+                <div class="ms-3" id="srv_setup_stepper_profile_bloc">
                     <div class="form-floating mb-2">
                         <input required type="text" id="srv_setup_stepper_profile_reply_to" name="srv_setup_stepper_profile_reply_to" class="txt_fld form-control" value="" placeholder="'.$this->trans('Reply to').'">
                         <label class="" for="srv_setup_stepper_profile_reply_to">'.$this->trans('Reply to').'</label>
@@ -2228,34 +2225,34 @@ protected function output() {
                         <label class="" for="srv_setup_stepper_profile_signature">'.$this->trans('Signature').'</label>
                     </div>
                     <div class="form-check" id="srv_setup_stepper_profile_checkbox_bloc">
-                       <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_profile_is_default" checked>
-                       <label class="form-check-label" for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
+                        <input class="form-check-input" type="checkbox" role="switch" id="srv_setup_stepper_profile_is_default" checked>
+                        <label class="form-check-label" for="srv_setup_stepper_profile_is_default">'.$this->trans('Set this profile default').'</label>
                     </div>
-                 </div>
+                </div>
             ';
         }
-        
+
         $res .= '</form>
-                      </div>
-                      <div class="srv_setup_stepper_form_loader hide" id="srv_setup_stepper_form_loader">
-                          <div class="spinner-border text-dark" role="status">
-                              <span class="visually-hidden">Loading...</span>
-                          </div>
-                      </div>
-                      <div class="step_config-actions">
-                          <button class="btn btn-danger px-3" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
-                          <button class="btn btn-success px-3" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
-                          <button class="btn btn-success px-3" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
-                      </div>
-                  </div>
-                  <div id="step_config_0" class="step_config current_config_step">
-                      <button class="btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
-                  </div>
+            </div>
+            <div class="srv_setup_stepper_form_loader hide" id="srv_setup_stepper_form_loader">
+                <div class="spinner-border text-dark" role="status">
+                    <span class="visually-hidden">Loading...</span>
                 </div>
-         </div>
-         <div class="px-5">';
+            </div>
+            <div class="step_config-actions">
+                <button class="btn btn-danger px-3" onclick="display_config_step(0)">'.$this->trans('Cancel').'</button>
+                <button class="btn btn-success px-3" onclick="display_config_step(1)">'.$this->trans('Previous').'</button>
+                <button class="btn btn-success px-3" onclick="display_config_step(3)">'.$this->trans('Finish').'</button>
+            </div>
+        </div>
+        <div id="step_config_0" class="step_config current_config_step">
+            <button class="btn btn-success px-5" onclick="display_config_step(1)">+ '.$this->trans('Add a new server').'</button>
+        </div>
+    </div>
+</div>
+<div class="px-5">';
 
-         return $res;
+        return $res;
     }
 }
 

From d0ef0edd246b63add65833b29059688fa158528a Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 16 Mar 2024 11:00:47 +0100
Subject: [PATCH 52/55] Ref: use Hm_Handlers

---
 modules/core/setup.php         | 1 +
 modules/imap/functions.php     | 1 -
 modules/profiles/functions.php | 1 -
 modules/smtp/functions.php     | 4 ----
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/core/setup.php b/modules/core/setup.php
index 3ff3128aa2..27a2adff9c 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -175,6 +175,7 @@
 add_handler('ajax_quick_servers_setup', 'quick_servers_setup', true);
 add_handler('ajax_quick_servers_setup', 'load_smtp_servers_from_config',  true, 'smtp');
 add_handler('ajax_quick_servers_setup', 'load_imap_servers_from_config',  true, 'imap');
+add_handler('ajax_quick_servers_setup', 'profile_data',  true, 'profiles');
 add_handler('ajax_quick_servers_setup', 'compose_profile_data',  true, 'profiles');
 add_handler('ajax_quick_servers_setup', 'save_user_data',  true, 'core');
 add_handler('ajax_quick_servers_setup', 'language',  true, 'core');
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 3a69b62e56..465584a946 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1428,7 +1428,6 @@ function parse_sieve_config_host($host) {
 
 if (!hm_exists('connect_to_imap_server')) {
     function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $imap_sieve_host, $enableSieve, $type, $context, $hidden = false) {
-        Hm_IMAP_List::init($context->user_config, $context->session);
         $imap_list = array(
             'name' => $name,
             'server' => $address,
diff --git a/modules/profiles/functions.php b/modules/profiles/functions.php
index 446341c2fa..2f33deea87 100644
--- a/modules/profiles/functions.php
+++ b/modules/profiles/functions.php
@@ -16,7 +16,6 @@ function add_profile($name, $signature, $reply_to, $is_default, $email, $server_
             'type' => 'imap'
         );
 
-        Hm_Profiles::init($context);
         Hm_Profiles::add($profile);
     }
 }
\ No newline at end of file
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index a4a6b6c096..50e0a49776 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -5,7 +5,6 @@
 
 if (!hm_exists('connect_to_smtp_server')) {
     function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $context) {
-        Hm_SMTP_List::init($context->user_config, $context->session);
         $smtp_list = array(
             'name' => $name,
             'server' => $address,
@@ -21,9 +20,6 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $con
 
         $result = Hm_SMTP_List::service_connect($smtp_server_id, $server, $user, $pass, false);
 
-        $smtp_servers = Hm_SMTP_List::dump(false, true);
-        $context->user_config->set('smtp_servers', $smtp_servers);
-
         return $result;
     }
 }

From 2fbeca8a6d48f9897c97e5e94bb2b66f02840445 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 16 Mar 2024 11:36:17 +0100
Subject: [PATCH 53/55] Fix: handler marker & placement

---
 modules/core/setup.php     | 6 +++---
 modules/smtp/functions.php | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/core/setup.php b/modules/core/setup.php
index 27a2adff9c..3bf8111329 100644
--- a/modules/core/setup.php
+++ b/modules/core/setup.php
@@ -173,9 +173,9 @@
 add_handler('ajax_quick_servers_setup', 'login', false, 'core');
 add_handler('ajax_quick_servers_setup', 'load_user_data', true, 'core');
 add_handler('ajax_quick_servers_setup', 'quick_servers_setup', true);
-add_handler('ajax_quick_servers_setup', 'load_smtp_servers_from_config',  true, 'smtp');
-add_handler('ajax_quick_servers_setup', 'load_imap_servers_from_config',  true, 'imap');
-add_handler('ajax_quick_servers_setup', 'profile_data',  true, 'profiles');
+add_handler('ajax_quick_servers_setup', 'load_smtp_servers_from_config',  true, 'smtp', 'quick_servers_setup', 'before');
+add_handler('ajax_quick_servers_setup', 'load_imap_servers_from_config',  true, 'imap', 'quick_servers_setup', 'before');
+add_handler('ajax_quick_servers_setup', 'profile_data',  true, 'profiles', 'quick_servers_setup', 'before');
 add_handler('ajax_quick_servers_setup', 'compose_profile_data',  true, 'profiles');
 add_handler('ajax_quick_servers_setup', 'save_user_data',  true, 'core');
 add_handler('ajax_quick_servers_setup', 'language',  true, 'core');
diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
index 50e0a49776..f9e9852119 100644
--- a/modules/smtp/functions.php
+++ b/modules/smtp/functions.php
@@ -14,7 +14,6 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $con
             'pass' => $pass,
             'tls' => $tls);
 
-
         $smtp_server_id =  Hm_SMTP_List::add($smtp_list);
         $server = Hm_SMTP_List::get($smtp_server_id, false);
 

From b709476654d6ea1a9c897783bb4e1d2ace853b51 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 16 Mar 2024 21:38:54 +0100
Subject: [PATCH 54/55] Ref: use sieve HM_Client_Factory

---
 modules/imap/functions.php         |  11 +-
 modules/sievefilters/functions.php | 447 ++++++++++++++++++++++++++++
 modules/sievefilters/hm-sieve.php  |  21 ++
 modules/sievefilters/modules.php   | 455 +----------------------------
 4 files changed, 481 insertions(+), 453 deletions(-)
 create mode 100644 modules/sievefilters/functions.php
 create mode 100644 modules/sievefilters/hm-sieve.php

diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 465584a946..5ef3c7d522 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -1456,9 +1456,14 @@ function connect_to_imap_server($address, $name, $port, $user, $pass, $tls, $ima
             $context->module_is_supported('sievefilters') &&
             $context->user_config->get('enable_sieve_filter_setting', true)) {
             try {
-                list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_sieve_host);
-                $client = new \PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
-                $client->connect($user, $pass, $sieve_tls, "", "PLAIN");
+
+                include APP_PATH.'modules/sievefilters/hm-sieve.php';
+                $sieveClientFactory = new Hm_Sieve_Client_Factory();
+                $client = $sieveClientFactory::init(null, $server);
+
+                if (!$client) {
+                    Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
+                }
             } catch (Exception $e) {
                 Hm_Msgs::add("ERRFailed to authenticate to the Sieve host");
                 return;
diff --git a/modules/sievefilters/functions.php b/modules/sievefilters/functions.php
new file mode 100644
index 0000000000..2b36b22dc7
--- /dev/null
+++ b/modules/sievefilters/functions.php
@@ -0,0 +1,447 @@
+<?php
+
+if (!defined('DEBUG_MODE')) { die(); }
+
+
+
+if (!hm_exists('get_script_modal_content')) {
+    function get_script_modal_content()
+    {
+        return '<div id="edit_script_modal" class="d-none">
+            <div class="mb-2">
+                <h3 class="mb-1">General</h3>
+                <small>Input a name and order for your filter. In filters, the order of execution is important. You can define an order value (or priority value) for your filter. Filters will run from lowest to highest priority value.</small>
+            </div>
+            <div class="mb-2 mt-4">
+                <label for="sieve-script-name" class="form-label fw-bold">Filter Name:</label>
+                <input class="modal_sieve_script_name form-control" type="text" placeholder="Your filter name" id="sieve-script-name" />
+            </div>
+            <div class="mb-2">
+                <label for="sieve-script-priority" class="form-label fw-bold">Priority:</label>
+                <input class="modal_sieve_script_priority form-control" type="number" placeholder="0" id="sieve-script-priority"" /> 
+            </div>
+            <div class="mb-2">
+                <h3 class="mb-1">Sieve Script</h3>
+                <small>Paste the Sieve script in the field below. Manually added scripts cannot be edited with the filters interface.</small>
+            </div>
+            <div class="mb-2 mt-4">
+                <textarea rows="20" class="modal_sieve_script_textarea form-control"></textarea>
+            </div>
+        </div>';
+    }
+}
+
+
+if (!hm_exists('get_classic_filter_modal_content')) {
+    function get_classic_filter_modal_content()
+    {
+        return '<div id="edit_filter_modal" class="d-none">
+            <div class="mb-2">
+                <h3 class="mb-1">General</h3>
+                <small>Input a name and order for your filter. In filters, the order of execution is important. You can define an order value (or priority value) for your filter. Filters will run from lowest to highest priority value.</small>
+            </div>
+            <div class="mb-2 mt-4">
+                <label for="sieve-filter-name" class="form-label fw-bold">Filter Name:</label>
+                <input type="text" class="modal_sieve_filter_name form-control" placeholder="Your filter name" id="sieve-filter-name" />
+            </div>
+            <div class="mb-2">
+                <label for="sieve-filter-priority" class="form-label fw-bold">Priority:</label>
+                <input class="modal_sieve_filter_priority form-control" type="number" placeholder="0" id="sieve-filter-priority" /> 
+            </div>
+            <div class="mb-2">
+                <label for="sieve-filter-test" class="form-label fw-bold">Test:</label>
+                <select class="modal_sieve_filter_test form-control" name="test_type" placeholder="0" id="sieve-filter-test"> 
+                    <option value="ANYOF">ANYOF (OR)</option>
+                    <option value="ALLOF" selected>ALLOF (AND)</option>
+                </select>
+            </div>
+            <div class="d-block mb-2 mt-4">
+                <h3 class="mb-1">Conditions & Actions</h3>
+                <small>Filters must have at least one action and one condition</small>
+            </div>
+            <div style="background-color: #f7f2ef;" class="mt-2 rounded">
+                <div class="p-2">
+                    <div class="d-flex">
+                        <div class="col-sm-10">
+                            <h5 class="mt-0">Conditions</h5>
+                        </div>
+                        <div class="flex-grow-1 text-end">
+                            <button class="sieve_add_condition_modal_button btn btn-sm border bg-white">Add Condition</button>
+                        </div>
+                    </div>
+                    <div class="d-block mt-3">
+                        <table class="sieve_list_conditions_modal">
+                        </table>
+                    </div>
+                </div>
+                <hr/>
+                <div class="p-2">
+                    <div class="d-flex">
+                        <div class="col-sm-10">
+                            <h5 class="mt-0">Actions</h5>
+                        </div>
+                        <div class="flex-grow-1 text-end">
+                            <button class="filter_modal_add_action_btn btn btn-sm  border bg-white">Add Action</button>
+                        </div>
+                    </div>
+                    <div class="d-block mt-3">
+                        <table class="filter_actions_modal_table">
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>';
+    }
+}
+
+if (!hm_exists('get_mailbox_filters')) {
+    function get_mailbox_filters($mailbox, $site_config, $user_config, $html=false)
+    {
+        $factory = get_sieve_client_factory($site_config);
+        try {
+            $client = $factory->init($user_config, $mailbox);
+            $scripts = [];
+            foreach ($client->listScripts() as $script) {
+                if (strstr($script, 'cypht')) {
+                    $scripts[] = $script;
+                }
+            }
+        } catch (Exception $e) {
+            Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
+            return !$html ? []: '';
+        }
+
+        if ($html == false) {
+            return $scripts;
+        }
+
+        $scripts_sorted = [];
+        foreach ($scripts as $script_name) {
+            $exp_name = explode('-', $script_name);
+            if (end($exp_name) == 'cypht') {
+                $base_class = 'script';
+            }
+            else if (end($exp_name) == 'cyphtfilter') {
+                $base_class = 'filter';
+            }
+            else {
+                continue;
+            }
+            $parsed_name = str_replace('_', ' ', $exp_name[0]);
+            $scripts_sorted[$script_name] = $exp_name[sizeof($exp_name) - 2];
+        }
+        asort($scripts_sorted);
+
+        $script_list = '';
+        foreach ($scripts_sorted as $script_name => $sc) {
+            $exp_name = explode('-', $script_name);
+            $parsed_name = str_replace('_', ' ', $exp_name[0]);
+            $script_list .= '
+            <tr>
+                <td>'. $exp_name[sizeof($exp_name) - 2] .'</td>
+                <td>' . str_replace('_', ' ', implode('-', array_slice($exp_name, 0, count($exp_name) - 2))) . '</td>
+                <td>
+                    <a href="#" script_name_parsed="'.$parsed_name.'"  priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'"  class="edit_'.$base_class.'">
+                        <i class="bi bi-pencil-fill"></i>
+                    </a>
+                    <a href="#" script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="delete_'.$base_class.' ps-2">
+                        <i class="bi bi-trash3 text-danger"></i>
+                    </a>
+                </td>
+            </tr>
+            ';
+        }
+        return $script_list;
+    }
+}
+
+if (!hm_exists('generate_main_script')) {
+    function generate_main_script($script_list)
+    {
+        $sorted_list = [];
+        foreach ($script_list as $script_name) {
+            if ($script_name == 'main_script') {
+                continue;
+            }
+
+            if (strstr($script_name, 'cypht')) {
+                $ex_name = explode('-', $script_name);
+                $sorted_list[$script_name] = $ex_name[1];
+            }
+        }
+        asort($sorted_list);
+        $include_header = 'require ["include"];'."\n\n";
+        $include_body = '';
+
+        // Block List MUST be the first script executed
+        $include_body .= 'include :personal "blocked_senders";'."\n";
+
+        foreach ($sorted_list as $script_name => $include_script) {
+            $include_body .= 'include :personal "'.$script_name.'";'."\n";
+        }
+        return $include_header.$include_body;
+    }
+}
+
+if (!hm_exists('generate_script_name')) {
+    function generate_script_name($name, $priority)
+    {
+        return str_replace(' ', '_', strtolower($name)).'-'.$priority.'-cypht';
+    }
+}
+
+if (!hm_exists('generate_filter_name')) {
+    function generate_filter_name($name, $priority)
+    {
+        return str_replace(' ', '_', strtolower($name)).'-'.$priority.'-cyphtfilter';
+    }
+}
+
+if (!hm_exists('get_sieve_client_factory')) {
+    function get_sieve_client_factory($site_config)
+    {
+        if (!is_null($site_config) && isset($site_config) && $factory_class = $site_config->get('sieve_client_factory')) {
+            return new $factory_class;
+        } else {
+            return new Hm_Sieve_Client_Factory;
+        }
+    }
+}
+
+if (!hm_exists('get_domain')) {
+    function get_domain($email)
+    {
+        $domain = explode('@', $email)[1];
+        if (preg_match('/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain, $regs)) {
+            return $regs['domain'];
+        }
+        return false;
+    }
+}
+
+if (!hm_exists('default_reject_message')) {
+    function default_reject_message($user_config, $imap_server_id)
+    {
+        $reject_message = '';
+        if ($user_config->get('sieve_block_default_reject_message')) {
+            if (array_key_exists($imap_server_id, $user_config->get('sieve_block_default_reject_message'))) {
+                $reject_message = $user_config->get('sieve_block_default_reject_message')[$imap_server_id];
+            }
+        }
+        return $reject_message;
+    }
+}
+
+if (!hm_exists('block_filter')) {
+    function block_filter($filter, $user_config, $action, $imap_server_id, $sender, $custom_reject_message = '')
+    {
+        $ret = ['action' => $action];
+
+        if (explode('@', $sender)[0] == '*') {
+            $filter->addRequirement('regex');
+        }
+        $custom_condition = new \PhpSieveManager\Filters\Condition(
+            "", 'anyof'
+        );
+        $cond = \PhpSieveManager\Filters\FilterCriteria::if('header');
+        $cond->contains('"From" ["'.$sender.'"]');
+
+        if ($action == 'default') {
+            $default_behaviour = 'Discard';
+            if ($user_config->get('sieve_block_default_behaviour')) {
+                if (array_key_exists($imap_server_id, $user_config->get('sieve_block_default_behaviour'))) {
+                    $default_behaviour = $user_config->get('sieve_block_default_behaviour')[$imap_server_id];
+                    if ($default_behaviour == 'Reject') {
+                        $reject_message = default_reject_message($user_config, $imap_server_id);
+                    }
+                }
+            }
+        } elseif ($action == 'discard') {
+            $default_behaviour = 'Discard';
+        } elseif ($action == 'reject_default') {
+            $default_behaviour = 'Reject';
+            $reject_message = default_reject_message($user_config, $imap_server_id);
+            $ret['reject_message'] = $reject_message;
+        } elseif ($action == 'reject_with_message') {
+            $default_behaviour = 'Reject';
+            $reject_message = $custom_reject_message;
+            $ret['reject_message'] = $custom_reject_message;
+        } elseif ($action == 'blocked') {
+            $default_behaviour = 'Move';
+        }
+
+        $custom_condition->addCriteria($cond);
+
+        if ($default_behaviour == 'Discard') {
+            $custom_condition->addAction(
+                new \PhpSieveManager\Filters\Actions\DiscardFilterAction()
+            );
+        }
+        elseif ($default_behaviour == 'Reject') {
+            $filter->addRequirement('reject');
+            $custom_condition->addAction(
+                new \PhpSieveManager\Filters\Actions\RejectFilterAction([$reject_message])
+            );
+        }
+        elseif ($default_behaviour == 'Move') {
+            $filter->addRequirement('fileinto');
+            $custom_condition->addAction(
+                new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['Blocked'])
+            );
+        }
+
+        $custom_condition->addAction(
+            new \PhpSieveManager\Filters\Actions\StopFilterAction()
+        );
+
+        $filter->setCondition($custom_condition);
+
+        return $ret;
+    }
+}
+
+if (!hm_exists('block_filter_dropdown')) {
+    function block_filter_dropdown($mod, $with_scope = true, $submit_id = 'block_sender', $submit_title = 'Block') {
+        $ret = '<div class="dropdown-menu p-3" id="dropdownMenuBlockSender">'
+            .'<form id="block_sender_form">';
+        if ($with_scope) {
+            $ret .= '<div class="mb-2">'
+                .   '<label for="blockSenderScope" class="form-label">'.$mod->trans('Who Is Blocked').'</label>'
+                .   '<select name="scope" class="form-select form-select-sm" id="blockSenderScope">'
+                .   '<option value="sender">'.$mod->trans('This Sender').'</option>'
+                .   '<option value="domain">'.$mod->trans('Whole domain').'</option></select>'
+                .'</div>';
+        }
+        $ret .= '<div class="mb-2">'
+            .   '<label for="block_action" class="form-label">'.$mod->trans('Action').'</label>'
+            .   '<select class="form-select form-select-sm" name="block_action" id="block_action">'
+            .       '<option value="default">'.$mod->trans('Default action').'</option>'
+            .       '<option value="discard">'.$mod->trans('Discard').'</option>'
+            .       '<option value="blocked">'.$mod->trans('Move To Blocked Folder').'</option>'
+            .       '<option value="reject_default">'.$mod->trans('Reject With Default Message').'</option>'
+            .       '<option value="reject_with_message">'.$mod->trans('Reject With Specific Message').'</option>'
+            .   '</select>'
+            .'</div>'
+            .'<div class="d-grid gap-1">'
+            .   '<button class="btn btn-danger btn-sm mt-2" type="submit" id="'.$submit_id.'">'
+            .       $mod->trans($submit_title)
+            .   '</button>'
+            .'</div>'
+            .'</form>'
+            .'</div>';
+        return $ret;
+    }
+}
+
+if (!hm_exists('get_blocked_senders_array')) {
+    function get_blocked_senders_array($mailbox, $site_config, $user_config)
+    {
+        $factory = get_sieve_client_factory($site_config);
+        try {
+            $client = $factory->init($user_config, $mailbox);
+            $scripts = $client->listScripts();
+
+            if (array_search('blocked_senders', $scripts, true) === false) {
+                return [];
+            }
+
+            $blocked_senders = [];
+            $current_script = $client->getScript('blocked_senders');
+            if ($current_script != '') {
+                $base64_obj = str_replace("# ", "", preg_split('#\r?\n#', $current_script, 0)[1]);
+                $blocked_list = json_decode(base64_decode($base64_obj));
+                if (!$blocked_list) {
+                    return [];
+                }
+                foreach ($blocked_list as $blocked_sender) {
+                    if (explode('@', $blocked_sender)[0] == '') {
+                        $blocked_sender = '*' . $blocked_sender;
+                    }
+                    $blocked_senders[] = $blocked_sender;
+                }
+            }
+            return $blocked_senders;
+        } catch (Exception $e) {
+            Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
+            return [];
+        }
+    }
+}
+
+if (!hm_exists('get_blocked_senders')){
+    function get_blocked_senders($mailbox, $mailbox_id, $icon_svg, $icon_block_domain_svg, $site_config, $user_config, $module) {
+        $factory = get_sieve_client_factory($site_config);
+        try {
+            $client = $factory->init($user_config, $mailbox);
+            $scripts = $client->listScripts();
+            if (array_search('blocked_senders', $scripts, true) === false) {
+                return '';
+            }
+            $current_script = $client->getScript('blocked_senders');
+            $blocked_list_actions = [];
+            if ($current_script != '') {
+                $script_split = preg_split('#\r?\n#', $current_script, 0);
+                if (!isset($script_split[1])) {
+                    return '';
+                }
+                $base64_obj = str_replace("# ", "", $script_split[1]);
+                $blocked_list = json_decode(base64_decode($base64_obj));
+                if (!$blocked_list) {
+                    return '';
+                }
+                if (isset($script_split[2])) {
+                    $base64_obj_actions = str_replace("# ", "", $script_split[2]);
+                    $blocked_list_actions = json_decode(base64_decode($base64_obj_actions), true);
+                }
+                foreach ($blocked_list as $blocked_sender) {
+                    if (explode('@', $blocked_sender)[0] == '') {
+                        $blocked_sender = '*'.$blocked_sender;
+                    }
+                    $blocked_senders[] = $blocked_sender;
+                }
+            }
+
+            $actions_map = [
+                'blocked' => $module->trans('Move To Blocked'),
+                'reject_with_message' => $module->trans('Reject With Message'),
+                'reject_default' => $module->trans('Reject'),
+                'discard' => $module->trans('Discard'),
+                'default' => $module->trans('Default'),
+            ];
+            $ret = '';
+            foreach ($blocked_senders as $sender) {
+                $reject_message = $blocked_list_actions[$sender]['reject_message'];
+                $ret .= '<tr><td>'.$sender.'</td><td>';
+                if (is_array($blocked_list_actions) && array_key_exists($sender, $blocked_list_actions)) {
+                    $action = $blocked_list_actions[$sender]['action'] ?: 'default';
+                    $ret .= $actions_map[$action];
+                    if ($action == 'reject_with_message') {
+                        $ret .= ' - '.$reject_message;
+                    }
+                } else {
+                    $action = 'default';
+                    $ret .= 'Default';
+                }
+                $ret .= '<a href="#" mailbox_id="'.$mailbox_id.'" data-action="'.$action.'" data-reject-message="'.$reject_message.'" title="'.$module->trans('Change Behavior').'" class="block_sender_link toggle-behavior-dropdown"> <i class="bi bi-pencil-fill ms-3"></i></a>';
+                $ret .= '</td><td><i class="bi bi-'.$icon_svg.' unblock_button" mailbox_id="'.$mailbox_id.'"></i>';
+                if (!strstr($sender, '*')) {
+                    $ret .= ' <i class="bi bi-'.$icon_block_domain_svg.' block_domain_button" mailbox_id="'.$mailbox_id.'"></i>';
+                }
+                $ret .= '</td></tr>';
+            }
+            return $ret;
+        } catch (Exception $e) {
+            Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
+            return '';
+        }
+    }
+}
+
+if (!hm_exists('initialize_sieve_client_factory')) {
+    function initialize_sieve_client_factory($site_config, $user_config, $imapServer)
+    {
+        $factory = get_sieve_client_factory($site_config);
+        return $factory->init($user_config, $imapServer);
+    }
+
+}
\ No newline at end of file
diff --git a/modules/sievefilters/hm-sieve.php b/modules/sievefilters/hm-sieve.php
new file mode 100644
index 0000000000..c2a0a71ea2
--- /dev/null
+++ b/modules/sievefilters/hm-sieve.php
@@ -0,0 +1,21 @@
+
+<?php
+
+class Hm_Sieve_Client_Factory {
+    public function init($user_config = null, $imap_account = null)
+    {
+        if ($imap_account && ! empty($imap_account['sieve_config_host'])) {
+            list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_account['sieve_config_host']);
+            $client = new PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
+            $client->connect($imap_account['user'], $imap_account['pass'], $sieve_tls, "", "PLAIN");
+            return $client;
+        } else {
+            $errorMsg = 'Invalid config host';
+            if (isset($imap_account['name'])) {
+                $errorMsg .= ' for ' . $imap_account['name'];
+            }
+            throw new Exception($errorMsg);
+        }
+    }
+}
+
diff --git a/modules/sievefilters/modules.php b/modules/sievefilters/modules.php
index 097a414309..be18178774 100644
--- a/modules/sievefilters/modules.php
+++ b/modules/sievefilters/modules.php
@@ -12,6 +12,8 @@
 
 require_once APP_PATH.'modules/imap/functions.php';
 require_once APP_PATH.'modules/imap/hm-imap.php';
+require_once APP_PATH.'modules/sievefilters/hm-sieve.php';
+require_once APP_PATH.'modules/sievefilters/functions.php';
 
 /**
  * @subpackage sievefilters/handler
@@ -202,74 +204,6 @@ public function process() {
     }
 }
 
-function get_blocked_senders($mailbox, $mailbox_id, $icon_svg, $icon_block_domain_svg, $site_config, $user_config, $module) {
-    $factory = get_sieve_client_factory($site_config);
-    try {
-        $client = $factory->init($user_config, $mailbox);
-        $scripts = $client->listScripts();
-        if (array_search('blocked_senders', $scripts, true) === false) {
-            return '';
-        }
-        $current_script = $client->getScript('blocked_senders');
-        $blocked_list_actions = [];
-        if ($current_script != '') {
-            $script_split = preg_split('#\r?\n#', $current_script, 0);
-            if (!isset($script_split[1])) {
-                return '';
-            }
-            $base64_obj = str_replace("# ", "", $script_split[1]);
-            $blocked_list = json_decode(base64_decode($base64_obj));        
-            if (!$blocked_list) {
-                return '';
-            }
-            if (isset($script_split[2])) {
-                $base64_obj_actions = str_replace("# ", "", $script_split[2]);
-                $blocked_list_actions = json_decode(base64_decode($base64_obj_actions), true);
-            }
-            foreach ($blocked_list as $blocked_sender) {
-                if (explode('@', $blocked_sender)[0] == '') {
-                    $blocked_sender = '*'.$blocked_sender;
-                }
-                $blocked_senders[] = $blocked_sender;
-            }
-        }
-
-        $actions_map = [
-            'blocked' => $module->trans('Move To Blocked'),
-            'reject_with_message' => $module->trans('Reject With Message'),
-            'reject_default' => $module->trans('Reject'),
-            'discard' => $module->trans('Discard'),
-            'default' => $module->trans('Default'),
-        ];
-        $ret = '';
-        foreach ($blocked_senders as $sender) {
-            $reject_message = $blocked_list_actions[$sender]['reject_message'];
-            $ret .= '<tr><td>'.$sender.'</td><td>';
-            if (is_array($blocked_list_actions) && array_key_exists($sender, $blocked_list_actions)) {
-                $action = $blocked_list_actions[$sender]['action'] ?: 'default';
-                $ret .= $actions_map[$action];
-                if ($action == 'reject_with_message') {
-                    $ret .= ' - '.$reject_message;
-                }
-            } else {
-                $action = 'default';
-                $ret .= 'Default';
-            }
-            $ret .= '<a href="#" mailbox_id="'.$mailbox_id.'" data-action="'.$action.'" data-reject-message="'.$reject_message.'" title="'.$module->trans('Change Behavior').'" class="block_sender_link toggle-behavior-dropdown"> <i class="bi bi-pencil-fill ms-3"></i></a>';
-            $ret .= '</td><td><i class="bi bi-'.$icon_svg.' unblock_button" mailbox_id="'.$mailbox_id.'"></i>';
-            if (!strstr($sender, '*')) {
-                $ret .= ' <i class="bi bi-'.$icon_block_domain_svg.' block_domain_button" mailbox_id="'.$mailbox_id.'"></i>';
-            }
-            $ret .= '</td></tr>';
-        }
-        return $ret;
-    } catch (Exception $e) {
-        Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
-        return '';
-    }
-}
-
-
 /**
  * @subpackage sievefilters/handler
  */
@@ -1228,39 +1162,6 @@ protected function output() {
     }
 }
 
-function get_blocked_senders_array($mailbox, $site_config, $user_config) {
-    $factory = get_sieve_client_factory($site_config);
-    try {
-        $client = $factory->init($user_config, $mailbox);
-        $scripts = $client->listScripts();
-
-        if (array_search('blocked_senders', $scripts, true) === false) {
-            return [];
-        }
-
-        $blocked_senders = [];
-        $current_script = $client->getScript('blocked_senders');
-        if ($current_script != '') {
-            $base64_obj = str_replace("# ", "", preg_split('#\r?\n#', $current_script, 0)[1]);
-            $blocked_list = json_decode(base64_decode($base64_obj));
-            if (!$blocked_list) {
-                return [];
-            }
-            foreach ($blocked_list as $blocked_sender) {
-                if (explode('@', $blocked_sender)[0] == '') {
-                    $blocked_sender = '*'.$blocked_sender;
-                }
-                $blocked_senders[] = $blocked_sender;
-            }
-        }
-        return $blocked_senders;
-    } catch (Exception $e) {
-        Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
-        return [];
-    }
-}
-
-
 /**
  * @subpackage sievefilters/handler
  */
@@ -1437,8 +1338,9 @@ public function process() {
                         $this->out('sieve_server_capabilities', self::$capabilities[$imap_account['sieve_config_host']]);
                         continue;
                     }
-                    $clientFactory = new Hm_Sieve_Client_Factory();
-                    $client = $clientFactory->init(null, $imap_account);
+
+                    $client = initialize_sieve_client_factory(null, null, $imap_account);
+
                     if ($client) {
                         $this->out('sieve_server_capabilities', $client->getCapabilities());
                         self::$capabilities[$imap_account['sieve_config_host']] = $client->getCapabilities();
@@ -1447,351 +1349,4 @@ public function process() {
             }
         }
     }
-}
-
-if (!hm_exists('get_script_modal_content')) {
-    function get_script_modal_content()
-    {
-        return '<div id="edit_script_modal" class="d-none">
-            <div class="mb-2">
-                <h3 class="mb-1">General</h3>
-                <small>Input a name and order for your filter. In filters, the order of execution is important. You can define an order value (or priority value) for your filter. Filters will run from lowest to highest priority value.</small>
-            </div>
-            <div class="mb-2 mt-4">
-                <label for="sieve-script-name" class="form-label fw-bold">Filter Name:</label>
-                <input class="modal_sieve_script_name form-control" type="text" placeholder="Your filter name" id="sieve-script-name" />
-            </div>
-            <div class="mb-2">
-                <label for="sieve-script-priority" class="form-label fw-bold">Priority:</label>
-                <input class="modal_sieve_script_priority form-control" type="number" placeholder="0" id="sieve-script-priority"" /> 
-            </div>
-            <div class="mb-2">
-                <h3 class="mb-1">Sieve Script</h3>
-                <small>Paste the Sieve script in the field below. Manually added scripts cannot be edited with the filters interface.</small>
-            </div>
-            <div class="mb-2 mt-4">
-                <textarea rows="20" class="modal_sieve_script_textarea form-control"></textarea>
-            </div>
-        </div>';
-    }
-}
-
-
-if (!hm_exists('get_classic_filter_modal_content')) {
-    function get_classic_filter_modal_content()
-    {
-            return '<div id="edit_filter_modal" class="d-none">
-            <div class="mb-2">
-                <h3 class="mb-1">General</h3>
-                <small>Input a name and order for your filter. In filters, the order of execution is important. You can define an order value (or priority value) for your filter. Filters will run from lowest to highest priority value.</small>
-            </div>
-            <div class="mb-2 mt-4">
-                <label for="sieve-filter-name" class="form-label fw-bold">Filter Name:</label>
-                <input type="text" class="modal_sieve_filter_name form-control" placeholder="Your filter name" id="sieve-filter-name" />
-            </div>
-            <div class="mb-2">
-                <label for="sieve-filter-priority" class="form-label fw-bold">Priority:</label>
-                <input class="modal_sieve_filter_priority form-control" type="number" placeholder="0" id="sieve-filter-priority" /> 
-            </div>
-            <div class="mb-2">
-                <label for="sieve-filter-test" class="form-label fw-bold">Test:</label>
-                <select class="modal_sieve_filter_test form-control" name="test_type" placeholder="0" id="sieve-filter-test"> 
-                    <option value="ANYOF">ANYOF (OR)</option>
-                    <option value="ALLOF" selected>ALLOF (AND)</option>
-                </select>
-            </div>
-            <div class="d-block mb-2 mt-4">
-                <h3 class="mb-1">Conditions & Actions</h3>
-                <small>Filters must have at least one action and one condition</small>
-            </div>
-            <div style="background-color: #f7f2ef;" class="mt-2 rounded">
-                <div class="p-2">
-                    <div class="d-flex">
-                        <div class="col-sm-10">
-                            <h5 class="mt-0">Conditions</h5>
-                        </div>
-                        <div class="flex-grow-1 text-end">
-                            <button class="sieve_add_condition_modal_button btn btn-sm border bg-white">Add Condition</button>
-                        </div>
-                    </div>
-                    <div class="d-block mt-3">
-                        <table class="sieve_list_conditions_modal">
-                        </table>
-                    </div>
-                </div>
-                <hr/>
-                <div class="p-2">
-                    <div class="d-flex">
-                        <div class="col-sm-10">
-                            <h5 class="mt-0">Actions</h5>
-                        </div>
-                        <div class="flex-grow-1 text-end">
-                            <button class="filter_modal_add_action_btn btn btn-sm  border bg-white">Add Action</button>
-                        </div>
-                    </div>
-                    <div class="d-block mt-3">
-                        <table class="filter_actions_modal_table">
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>';
-    }
-}
-
-if (!hm_exists('get_mailbox_filters')) {
-    function get_mailbox_filters($mailbox, $site_config, $user_config, $html=false)
-    {
-        $factory = get_sieve_client_factory($site_config);
-        try {
-            $client = $factory->init($user_config, $mailbox);
-            $scripts = [];
-            foreach ($client->listScripts() as $script) {
-                if (strstr($script, 'cypht')) {
-                    $scripts[] = $script;
-                }
-            }
-        } catch (Exception $e) {
-            Hm_Msgs::add("ERRSieve: {$e->getMessage()}");
-            return !$html ? []: '';
-        }
-
-        if ($html == false) {
-            return $scripts;
-        }
-
-        $scripts_sorted = [];
-        foreach ($scripts as $script_name) {
-            $exp_name = explode('-', $script_name);
-            if (end($exp_name) == 'cypht') {
-                $base_class = 'script';
-            }
-            else if (end($exp_name) == 'cyphtfilter') {
-                $base_class = 'filter';
-            }
-            else {
-                continue;
-            }
-            $parsed_name = str_replace('_', ' ', $exp_name[0]);
-            $scripts_sorted[$script_name] = $exp_name[sizeof($exp_name) - 2];
-        }
-        asort($scripts_sorted);
-
-        $script_list = '';
-        foreach ($scripts_sorted as $script_name => $sc) {
-            $exp_name = explode('-', $script_name);
-            $parsed_name = str_replace('_', ' ', $exp_name[0]);
-            $script_list .= '
-            <tr>
-                <td>'. $exp_name[sizeof($exp_name) - 2] .'</td>
-                <td>' . str_replace('_', ' ', implode('-', array_slice($exp_name, 0, count($exp_name) - 2))) . '</td>
-                <td>
-                    <a href="#" script_name_parsed="'.$parsed_name.'"  priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'"  class="edit_'.$base_class.'">
-                        <i class="bi bi-pencil-fill"></i>
-                    </a>
-                    <a href="#" script_name_parsed="'.$parsed_name.'" priority="'.$exp_name[sizeof($exp_name) - 2].'" imap_account="'.$mailbox['name'].'" script_name="'.$script_name.'" class="delete_'.$base_class.' ps-2">
-                        <i class="bi bi-trash3 text-danger"></i>
-                    </a>
-                </td>
-            </tr>
-            ';
-        }
-        return $script_list;
-    }
-}
-
-if (!hm_exists('generate_main_script')) {
-    function generate_main_script($script_list)
-    {
-        $sorted_list = [];
-        foreach ($script_list as $script_name) {
-            if ($script_name == 'main_script') {
-                continue;
-            }
-
-            if (strstr($script_name, 'cypht')) {
-                $ex_name = explode('-', $script_name);
-                $sorted_list[$script_name] = $ex_name[1];
-            }
-        }
-        asort($sorted_list);
-        $include_header = 'require ["include"];'."\n\n";
-        $include_body = '';
-
-        // Block List MUST be the first script executed
-        $include_body .= 'include :personal "blocked_senders";'."\n";
-
-        foreach ($sorted_list as $script_name => $include_script) {
-            $include_body .= 'include :personal "'.$script_name.'";'."\n";
-        }
-        return $include_header.$include_body;
-    }
-}
-
-if (!hm_exists('generate_script_name')) {
-    function generate_script_name($name, $priority)
-    {
-        return str_replace(' ', '_', strtolower($name)).'-'.$priority.'-cypht';
-    }
-}
-
-if (!hm_exists('generate_filter_name')) {
-    function generate_filter_name($name, $priority)
-    {
-        return str_replace(' ', '_', strtolower($name)).'-'.$priority.'-cyphtfilter';
-    }
-}
-
-if (!hm_exists('get_sieve_client_factory')) {
-    function get_sieve_client_factory($site_config)
-    {
-        if ($factory_class = $site_config->get('sieve_client_factory')) {
-            return new $factory_class;
-        } else {
-            return new Hm_Sieve_Client_Factory;
-        }
-    }
-}
-
-if (!hm_exists('get_domain')) {
-    function get_domain($email)
-    {
-        $domain = explode('@', $email)[1];
-        if (preg_match('/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain, $regs)) {
-            return $regs['domain'];
-        }
-        return false;
-    }
-}
-
-if (!hm_exists('default_reject_message')) {
-    function default_reject_message($user_config, $imap_server_id)
-    {
-        $reject_message = '';
-        if ($user_config->get('sieve_block_default_reject_message')) {
-            if (array_key_exists($imap_server_id, $user_config->get('sieve_block_default_reject_message'))) {
-                $reject_message = $user_config->get('sieve_block_default_reject_message')[$imap_server_id];
-            }
-        }
-        return $reject_message;
-    }
-}
-
-if (!hm_exists('block_filter')) {
-    function block_filter($filter, $user_config, $action, $imap_server_id, $sender, $custom_reject_message = '')
-    {
-        $ret = ['action' => $action];
-
-        if (explode('@', $sender)[0] == '*') {
-            $filter->addRequirement('regex');
-        }
-        $custom_condition = new \PhpSieveManager\Filters\Condition(
-            "", 'anyof'
-        );
-        $cond = \PhpSieveManager\Filters\FilterCriteria::if('header');
-        $cond->contains('"From" ["'.$sender.'"]');
-
-        if ($action == 'default') {
-            $default_behaviour = 'Discard';
-            if ($user_config->get('sieve_block_default_behaviour')) {
-                if (array_key_exists($imap_server_id, $user_config->get('sieve_block_default_behaviour'))) {
-                    $default_behaviour = $user_config->get('sieve_block_default_behaviour')[$imap_server_id];
-                    if ($default_behaviour == 'Reject') {
-                        $reject_message = default_reject_message($user_config, $imap_server_id);
-                    }
-                }
-            }
-        } elseif ($action == 'discard') {
-            $default_behaviour = 'Discard';
-        } elseif ($action == 'reject_default') {
-            $default_behaviour = 'Reject';
-            $reject_message = default_reject_message($user_config, $imap_server_id);
-            $ret['reject_message'] = $reject_message;
-        } elseif ($action == 'reject_with_message') {
-            $default_behaviour = 'Reject';
-            $reject_message = $custom_reject_message;
-            $ret['reject_message'] = $custom_reject_message;
-        } elseif ($action == 'blocked') {
-            $default_behaviour = 'Move';
-        }
-
-        $custom_condition->addCriteria($cond);
-
-        if ($default_behaviour == 'Discard') {
-            $custom_condition->addAction(
-                new \PhpSieveManager\Filters\Actions\DiscardFilterAction()
-            );
-        }
-        elseif ($default_behaviour == 'Reject') {
-            $filter->addRequirement('reject');
-            $custom_condition->addAction(
-                new \PhpSieveManager\Filters\Actions\RejectFilterAction([$reject_message])
-            );
-        }
-        elseif ($default_behaviour == 'Move') {
-            $filter->addRequirement('fileinto');
-            $custom_condition->addAction(
-                new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['Blocked'])
-            );
-        }
-
-        $custom_condition->addAction(
-            new \PhpSieveManager\Filters\Actions\StopFilterAction()
-        );
-
-        $filter->setCondition($custom_condition);
-
-        return $ret;
-    }
-}
-
-if (!hm_exists('block_filter_dropdown')) {
-    function block_filter_dropdown($mod, $with_scope = true, $submit_id = 'block_sender', $submit_title = 'Block') {
-        $ret = '<div class="dropdown-menu p-3" id="dropdownMenuBlockSender">'
-        .'<form id="block_sender_form">';
-        if ($with_scope) {
-            $ret .= '<div class="mb-2">'
-            .   '<label for="blockSenderScope" class="form-label">'.$mod->trans('Who Is Blocked').'</label>'
-            .   '<select name="scope" class="form-select form-select-sm" id="blockSenderScope">'
-            .   '<option value="sender">'.$mod->trans('This Sender').'</option>'
-            .   '<option value="domain">'.$mod->trans('Whole domain').'</option></select>'
-            .'</div>';
-        }
-        $ret .= '<div class="mb-2">'
-        .   '<label for="block_action" class="form-label">'.$mod->trans('Action').'</label>'
-        .   '<select class="form-select form-select-sm" name="block_action" id="block_action">'
-        .       '<option value="default">'.$mod->trans('Default action').'</option>'
-        .       '<option value="discard">'.$mod->trans('Discard').'</option>'
-        .       '<option value="blocked">'.$mod->trans('Move To Blocked Folder').'</option>'
-        .       '<option value="reject_default">'.$mod->trans('Reject With Default Message').'</option>'
-        .       '<option value="reject_with_message">'.$mod->trans('Reject With Specific Message').'</option>'
-        .   '</select>'
-        .'</div>'
-        .'<div class="d-grid gap-1">'
-        .   '<button class="btn btn-danger btn-sm mt-2" type="submit" id="'.$submit_id.'">'
-        .       $mod->trans($submit_title)
-        .   '</button>'
-        .'</div>'
-        .'</form>'
-        .'</div>';
-        return $ret;
-    }
-}
-
-class Hm_Sieve_Client_Factory {
-    public function init($user_config = null, $imap_account = null)
-    {
-        if ($imap_account && ! empty($imap_account['sieve_config_host'])) {
-            list($sieve_host, $sieve_port, $sieve_tls) = parse_sieve_config_host($imap_account['sieve_config_host']);
-            $client = new PhpSieveManager\ManageSieve\Client($sieve_host, $sieve_port);
-            $client->connect($imap_account['user'], $imap_account['pass'], $sieve_tls, "", "PLAIN");
-            return $client;
-        } else {
-            $errorMsg = 'Invalid config host';
-            if (isset($imap_account['name'])) {
-                $errorMsg .= ' for ' . $imap_account['name'];
-            }
-            throw new Exception($errorMsg);
-        }
-    }
 }
\ No newline at end of file

From dcf1d5a41671cf33f90576dbd9f71bca00d845c8 Mon Sep 17 00:00:00 2001
From: Henock <multshibanda@gmail.com>
Date: Sat, 16 Mar 2024 21:53:28 +0100
Subject: [PATCH 55/55] Ref: hide loader on fail

---
 modules/core/site.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/core/site.js b/modules/core/site.js
index fc6adab870..5974feebfe 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -2186,6 +2186,9 @@ function submitSmtpImapServer() {
             Hm_Folders.reload_folders(true);
             location.reload();
         }
+    }, null, null, function (res) {
+        $('#srv_setup_stepper_form_loader').addClass('hide');
+        $('.step_config-actions').removeClass('hide');
     });
 }