From e226cca142f986a3df378c884dcadc61082e63a6 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 8 Apr 2024 09:19:27 +0000 Subject: [PATCH] Bug Fixes 7 : Forgot password : ps --- application/config/development/autoload.php | 8 ++++++-- application/config/production/autoload.php | 2 +- application/config/production/config.php | 2 +- application/config/testing/autoload.php | 3 ++- application/config/testing/config.php | 2 +- application/helpers/mail_helper.php | 17 ++++++++--------- application/modules/Auth/controllers/Auth.php | 16 +++++++++------- .../modules/Auth/views/otp_verification.php | 4 ++-- 8 files changed, 30 insertions(+), 24 deletions(-) diff --git a/application/config/development/autoload.php b/application/config/development/autoload.php index a94516f..34b9861 100644 --- a/application/config/development/autoload.php +++ b/application/config/development/autoload.php @@ -58,7 +58,8 @@ | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array('session','database','email'); + +$autoload['libraries'] = array('session','database','email','security'); /* | ------------------------------------------------------------------- @@ -131,4 +132,7 @@ | | $autoload['model'] = array('first_model' => 'first'); */ -$autoload['model'] = array('auth/auth_model'); \ No newline at end of file +$autoload['model'] = array('auth/auth_model'); +// $autoload['model'] = array('Auth/Auth_model'); +// $autoload['model'] = array('auth_model' => 'auth/auth_model'); +// $autoload['model'] = array('auth_model' => 'Auth/Auth_model'); \ No newline at end of file diff --git a/application/config/production/autoload.php b/application/config/production/autoload.php index 79ae9a6..e34c74f 100644 --- a/application/config/production/autoload.php +++ b/application/config/production/autoload.php @@ -58,7 +58,7 @@ | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array('session','database','email'); +$autoload['libraries'] = array('session','database','email','security'); /* | ------------------------------------------------------------------- diff --git a/application/config/production/config.php b/application/config/production/config.php index f1fdc08..59d7c58 100644 --- a/application/config/production/config.php +++ b/application/config/production/config.php @@ -23,7 +23,7 @@ | a PHP script and you can easily do that on your own. | */ -$base = "http://".$_SERVER['HTTP_HOST']; +$base = "https://".$_SERVER['HTTP_HOST']; $base .= str_replace(basename($_SERVER['SCRIPT_NAME']),"",$_SERVER['SCRIPT_NAME']); $config['base_url'] = $base; diff --git a/application/config/testing/autoload.php b/application/config/testing/autoload.php index 6cafc14..9a05c74 100644 --- a/application/config/testing/autoload.php +++ b/application/config/testing/autoload.php @@ -58,7 +58,8 @@ | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array('session','database','email'); + +$autoload['libraries'] = array('session','database','email','security'); /* | ------------------------------------------------------------------- diff --git a/application/config/testing/config.php b/application/config/testing/config.php index 78200a7..20165f3 100644 --- a/application/config/testing/config.php +++ b/application/config/testing/config.php @@ -224,7 +224,7 @@ | your log files will fill up very fast. | */ -$config['log_threshold'] = 0; +$config['log_threshold'] = 4; /* |-------------------------------------------------------------------------- diff --git a/application/helpers/mail_helper.php b/application/helpers/mail_helper.php index 65fb189..75100c5 100644 --- a/application/helpers/mail_helper.php +++ b/application/helpers/mail_helper.php @@ -77,13 +77,12 @@ function send_emails($to, $subject, $body, $aliasName = '', $cc = null, $bcc = n if (!function_exists('send_emails_forgot_password')) { - function send_emails_forgot_password($to, $subject, $body, $aliasName = '', $cc = null, $bcc = null, $receipt = null) + function send_emails_forgot_password($to, $subject, $body, $mailCredentials = null, $aliasName = '', $cc = null, $bcc = null, $receipt = null) { log_message('error', 'send_mail_helper_loadded'); log_message('error', 'Receiptent mail - ' . $to . ' - subject - ' . $subject . ' - body - ' . $body); - log_message('error', 'Sender mail ' . business()->sender_mail); - + log_message('error', 'Sender mail ' . $mailCredentials->sender_mail); try { $mailer = new PHPMailer(true); @@ -91,14 +90,14 @@ function send_emails_forgot_password($to, $subject, $body, $aliasName = '', $cc $mailer->isSMTP(); $mailer->CharSet = 'utf-8'; - $mailer->Host = business()->mail_hostname; - $mailer->SMTPSecure = business()->mail_security; + $mailer->Host = $mailCredentials->mail_hostname; + $mailer->SMTPSecure = $mailCredentials->mail_security; $mailer->SMTPAuth = true; $mailer->SMTPDebug = false; - $mailer->Username = business()->mail_username; - $mailer->Password = business()->mail_password; - $mailer->Port = business()->mail_port_no; - $mailer->setFrom(business()->sender_mail, $aliasName); + $mailer->Username = $mailCredentials->mail_username; + $mailer->Password = $mailCredentials->mail_password; + $mailer->Port = $mailCredentials->mail_port_no; + $mailer->setFrom($mailCredentials->sender_mail, $aliasName); $mailer->addAddress($to); // Add CC recipients diff --git a/application/modules/Auth/controllers/Auth.php b/application/modules/Auth/controllers/Auth.php index 23284ca..ae704b0 100644 --- a/application/modules/Auth/controllers/Auth.php +++ b/application/modules/Auth/controllers/Auth.php @@ -150,13 +150,15 @@ public function sendOTP(){ $otp = $this->input->get('otp'); $where = 'email'; $user = $this->auth_model->validateUserForOtp($mail, $where); + $mailCredentials = $this->auth_model->validateBusiness($user->business_id); + $id = $user->id; $data['csrf_hash'] = $this->security->get_csrf_hash(); $data['id'] = $id; $data['email'] = $mail; - $body =` + $body = <<
@@ -164,27 +166,27 @@ public function sendOTP(){

Hello,

Your One-Time Password (OTP) for verification is:

- `. $otp .` + $otp

This OTP is valid for a short period. Please do not share it with anyone.

If you did not request this OTP, please ignore this email.

Thank you!

-

© 2023

- +

© 2023 $mailCredentials->business_name

- - `; + + EOD; $subject = 'Forgot Password OTP Send'; - $result = send_emails_forgot_password($mail, $subject, $body); + $result = send_emails_forgot_password($mail, $subject, $body,$mailCredentials); if($result){ $data['csrf_hash'] = $this->security->get_csrf_hash(); $data['status'] = "success"; $data['id'] = $id; $data['email'] = $mail; + $data['result'] = $result; echo json_encode($data); }else{ diff --git a/application/modules/Auth/views/otp_verification.php b/application/modules/Auth/views/otp_verification.php index 802d029..c05c1c7 100644 --- a/application/modules/Auth/views/otp_verification.php +++ b/application/modules/Auth/views/otp_verification.php @@ -60,7 +60,7 @@