Ref: Check the state after connection (#932)

Ref: check state after authentication
cypht-org · Apr 14, 2024 · 8409da5 · 8409da5
1 parent db406ba
commit 8409da5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
@@ -2182,7 +2182,7 @@ protected function output() {
                             <div>
                                 <form>
                                     <div class="form-floating mb-3">
-                                      <select class="form-select" id="srv_setup_stepper_provider" onchange="handleProviderChange(this) 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>

diff --git a/modules/core/site.js b/modules/core/site.js
@@ -2282,8 +2282,12 @@ function handleProviderChange(select) {
         $("#srv_setup_stepper_imap_port").val(993);
     }
 }
+
+function setDefaultReplyTo(val) {
+    $("#srv_setup_stepper_profile_reply_to").val(val);
+}
 function display_config_step(stepNumber) {
-    if(stepNumber == 2) {
+    if(stepNumber === 2) {
 
         var isValid = true;
 
@@ -2303,9 +2307,10 @@ function display_config_step(stepNumber) {
 
         let providerKey = getEmailProviderKey($('#srv_setup_stepper_email').val());
         getServiceDetails(providerKey);
+        setDefaultReplyTo($('#srv_setup_stepper_email').val());
     }
 
-    if(stepNumber == 3) {
+    if(stepNumber === 3) {
         var requiredFields = [];
         var isValid = true;
 

diff --git a/modules/imap/functions.php b/modules/imap/functions.php
@@ -1470,6 +1470,14 @@ 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);
+        $imap = Hm_IMAP_List::connect($imap_server_id, false);
+
+        if (imap_authed($imap)) {
+            return $imap_server_id;
+        }else {
+            Hm_IMAP_List::del($imap_server_id);
+            Hm_Msgs::add('ERRAuthentication failed');
+            return null;
+        }
     }
 }
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
@@ -1345,7 +1345,7 @@ protected function output() {
                       </div>
                    ';
 
-                     if (!$this->get('sieve_filters_enabled')) {
+                     if ($this->get('sieve_filters_enabled')) {
                          $default_value = '';
                              $res .=  '
                                         

diff --git a/modules/smtp/functions.php b/modules/smtp/functions.php
@@ -15,11 +15,16 @@ function connect_to_smtp_server($address, $name, $port, $user, $pass, $tls, $con
             'tls' => $tls);
 
         $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);
-
-        return $result;
+        $smtp = Hm_SMTP_List::connect($smtp_server_id, false);
+        if (smtp_authed($smtp)) {
+            return $smtp_server_id;
+        }
+        else {
+            Hm_SMTP_List::del($smtp_server_id);
+            Hm_Msgs::add('ERRAuthentication failed');
+            return null;
+        }
     }
 }