From 105bc70ef0aafcafca7875d3812d8d3213761f8d Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 16 Mar 2020 12:28:22 +0530 Subject: [PATCH] Issue #2644 fixed --- public/installer/Email.php | 8 ++++---- public/installer/EmailConfig.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/installer/Email.php b/public/installer/Email.php index 5d535395e..a05ed1a67 100644 --- a/public/installer/Email.php +++ b/public/installer/Email.php @@ -90,10 +90,10 @@ $('#mail_port').append('
' + data.errors.mail_port + '
'); } - if (data.errors.mail_encryption) { - $('#mail_encryption').addClass('has-error'); - $('#mail_encryption').append('
' + data.errors.mail_encryption + '
'); - } + // if (data.errors.mail_encryption) { + // $('#mail_encryption').addClass('has-error'); + // $('#mail_encryption').append('
' + data.errors.mail_encryption + '
'); + // } if (data.errors.mail_from) { $('#mail_from').addClass('has-error'); diff --git a/public/installer/EmailConfig.php b/public/installer/EmailConfig.php index 3b81bd876..c1e43e8bf 100644 --- a/public/installer/EmailConfig.php +++ b/public/installer/EmailConfig.php @@ -11,16 +11,16 @@ $data = array(); if (empty($_POST['mail_driver'])) $errors['mail_driver'] = 'Please select the mail driver.'; - + if (empty($_POST['mail_host'])) $errors['mail_host'] = 'Please enter the hostname for this outgoing mail server.'; if (empty($_POST['mail_port'])) - $errors['mail_port'] = 'Please enter the port for this outgoing mail server.'; + $errors['mail_port'] = 'Please enter the port for this outgoing mail server.'; + + // if (empty($_POST['mail_encryption'])) + // $errors['mail_encryption'] = 'Please select the encryption method for this outgoing mail server.'; - if (empty($_POST['mail_encryption'])) - $errors['mail_encryption'] = 'Please select the encryption method for this outgoing mail server.'; - if (empty($_POST['mail_from'])) $errors['mail_from'] = 'Please enter the email address for this store.';