From 5eda2a1d5e81a9924ac3f35c9ce6aca32f0d2970 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Mon, 8 May 2023 11:10:23 +0530
Subject: [PATCH] mail :suseendhiran

---
 app/Controllers/Member_controller.php   | 19 ++++++++++++++-----
 app/Controllers/Sendmail_controller.php |  7 +++----
 app/Models/Member_model.php             |  2 +-
 app/Views/member_login.php              | 18 +++++++++++++++++-
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index df5388d..d671351 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -31,16 +31,25 @@ class Member_controller extends BaseController
 			
 			if($memberdata)
 			{
-				if (password_verify($password, $memberdata['password'])) 
+				if ($memberdata['is_email_verified']) 
 				{
-					
-					$this->session->set('logged_user',$memberdata['id']);
-					return redirect()->to(base_url().'member_home');
+						
+						if (password_verify($password, $memberdata['password'])) 
+					{
+						
+						$this->session->set('logged_user',$memberdata['id']);
+						return redirect()->to(base_url().'member_home');
+					}
+					else{
+						$this->session->setTempdata('error','sorry wrong password entered for the Email',3);
+						return redirect()->to(base_url());
+					}
 				}
 				else{
-					$this->session->setTempdata('error','sorry wrong password entered for the Email',3);
+					$this->session->setTempdata('error','Sorry your mail does not verified.please check your mail',3);
 					return redirect()->to(base_url());
 				}
+				
 			}else
 			{
 			  $this->session->setTempdata('error','sorry Email does not existe',3);
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 87a9fbb..cb7ec26 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -14,7 +14,6 @@ class Sendmail_controller extends BaseController
 	}
 	public function index($to,$code)
 	{
-        echo '<p>Please click your email address to verify</p>';
 		$email = \Config\Services::email();
 
         $email->setFrom('suseendhiran.1702117@srit.org', 'suseendhiran');
@@ -27,7 +26,8 @@ class Sendmail_controller extends BaseController
         $email->setSubject('Verify your email address');
         $email->setMessage($message);
         if ($email->send()) {
-            return 1;
+            $this->session->setTempdata('mail_success', "Please check your mail to verify",3);
+            return redirect()->to(base_url());	
         } else {
             return 0;
         }
@@ -47,8 +47,7 @@ class Sendmail_controller extends BaseController
             if($update_data)
             {
                 // Show success message
-                $this->session->set_flashdata('mail_success', "Your email has been verified. Please login to continue.");
-                return redirect()->to(base_url());	
+                echo 'Email verification sucessfully.';
             }
             else 
             {
diff --git a/app/Models/Member_model.php b/app/Models/Member_model.php
index 0d8e850..e825081 100644
--- a/app/Models/Member_model.php
+++ b/app/Models/Member_model.php
@@ -32,7 +32,7 @@ class Member_model extends Model
 	{
 		
 		$builder = $this->db->table('member');
-		$builder -> select("id,mobile,email,password");
+		$builder -> select("id,mobile,email,password,is_email_verified");
 		$builder -> where('email',$email);
 		$result = $builder->get();
 		if(count($result->getResultArray()) ==1)
diff --git a/app/Views/member_login.php b/app/Views/member_login.php
index 15613de..d54efda 100644
--- a/app/Views/member_login.php
+++ b/app/Views/member_login.php
@@ -42,7 +42,23 @@
                                 </div>
                                 </br>
                                 <form method="post" action="<?= base_url(); ?>">
-<h1><?php echo $this->session->flashdata('mail_success'); ?></h1>
+
+                                
+                                   <?php if(session()->getTempdata('mail_success')):?>
+                                   <div class="alert alert-success" >
+                                   <?= session()->getTempdata('mail_success'); ?>
+                                   </div>
+                                   <?php endif;?>
+                                   
+                                   
+                                   <?php if(session()->getTempdata('error')):?>
+                                   <div class="alert alert-danger" >
+                                   <?= session()->getTempdata('error'); ?>
+                                   </div>
+                                   <?php endif;?>
+
+
+
                                     <div class="form-group mb-3">
                                         <label for="emailaddress">Email address</label>
                                         <input class="form-control" type="email" name="email" id="emailaddress" required="" value="gwm@gmail.com" placeholder="Enter your email">