diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 081e61a..2bb83d5 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -46,6 +46,10 @@ $routes->match(['get','post'],'/set_password/(:any)','Member_controller::set_pas $routes->match(['get','post'],'/update_password','Member_controller::update_password'); $routes->match(['get','post'],'/change_password','Member_controller::change_password'); $routes->match(['get','post'],'/change_password_form','Member_controller::change_password_form'); +$routes->match(['get','post'],'/member_deactivate/(:any)','Member_controller::member_deactivate/$1'); +$routes->match(['get','post'],'/member_activate/(:any)','Member_controller::member_activate/$1'); + + @@ -64,6 +68,8 @@ $routes->match(['get'],'/credits_pack_edit/(:any)','Admin_controller::credits_pa $routes->match(['post'],'/credits_pack_edit','Admin_controller::credits_pack_edit'); $routes->match(['get','post'],'/credits_pack_add','Admin_controller::credits_pack_add'); $routes->match(['get','post'],'/user_password_change','Admin_controller::user_password_change'); +$routes->match(['get','post'],'/user_deactivate/(:any)','Admin_controller::user_deactivate/$1'); +$routes->match(['get','post'],'/user_activate/(:any)','Admin_controller::user_activate/$1'); $routes->match(['get'],'/admin_home','Dashboard::admin_home'); $routes->match(['get'],'/member_home','Dashboard::member_home'); diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index afa5771..001a426 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -121,10 +121,21 @@ class Admin_controller extends BaseController if($this->request->getmethod() == 'post') { + $password = ''; + $characters = array_merge(range('A','Z'), range('a','z'), range('0','9'), array('!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '_', '+', '=')); + for($i = 0; $i < 8; $i++) { + $password .= $characters[array_rand($characters)]; + } //insert member details $userData = $this->request->getVar(); - $this->UserModel->save($userData); - return redirect()->to(base_url()."users_list"); + $userData['password'] = $password; + $userdata = $this->UserModel->save($userData); + if ($userdata) + { + $sendmail_controller = new Sendmail_controller(); + $get_data = $sendmail_controller->index($this->request->getVar('email') , $password , 3 ); + return redirect()->to(base_url()."users_list"); + } } @@ -136,6 +147,22 @@ class Admin_controller extends BaseController } + public function user_deactivate($id = null) + { + + $this->UserModel->where('md5(id)', $id )->set(array( 'is_active' => 0))->update(); + return redirect()->to(base_url()."users_list"); + + } + + public function user_activate($id = null) + { + + $this->UserModel->where('md5(id)', $id )->set(array( 'is_active' => 1))->update(); + return redirect()->to(base_url()."users_list"); + + } + public function admin_profile($user_id = null) { diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index f704050..e028cf1 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -53,13 +53,13 @@ class Member_controller extends BaseController } } else{ - $this->session->setTempdata('error','Sorry your mail does not verified.please check your mail',3); + $this->session->setTempdata('error','Sorry your mail is not verified.please check your mail',3); return redirect()->to(base_url()); } }else { - $this->session->setTempdata('error','sorry Email does not existe',3); + $this->session->setTempdata('error','sorry Email is not existe',3); return redirect()->to(base_url()); } } @@ -122,6 +122,22 @@ class Member_controller extends BaseController echo view('layout/footer'); } + public function member_deactivate($id = null) + { + + $this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 0))->update(); + return redirect()->to(base_url()."members_list"); + + } + + public function member_activate($id = null) + { + + $this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 1))->update(); + return redirect()->to(base_url()."members_list"); + + } + public function member_edit($member_id = null) { @@ -192,6 +208,8 @@ class Member_controller extends BaseController $email = $this->request->getVar('email'); $user_data = $this->MemberModel->where('email', $email)->find(); + echo $user_data; + // echo $user_data; if ($user_data) { $otp = rand(1000 , 9999 ); diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php index 2c504d8..a1f73d5 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,$return) { - $email = \Config\Services::email(); $email->setFrom('suseendhiran.1702117@srit.org', 'suseendhiran'); $email->setTo($to); @@ -22,6 +21,12 @@ class Sendmail_controller extends BaseController { $message = $code; } + if($return == 3) + { + $message = "

username : $to

"; + $message .= "

password : $code

"; + $message .= '

Login here

'; + } else { $message = '

Please click the following link to verify your email address

'; @@ -88,7 +93,7 @@ class Sendmail_controller extends BaseController { $email = $this->request->getVar('email'); - $user_data = $this->MemberModel->where('email', $email)->find(); + $user_data = $this->MemberModel->where('email', $email)->where('is_email_verified', 1 )->find(); if ($user_data) { $otp = rand(1000 , 9999); @@ -100,7 +105,7 @@ class Sendmail_controller extends BaseController else { $data['status'] = 'failed'; - echo $data; + echo json_encode($data); } } diff --git a/app/Models/Member_model.php b/app/Models/Member_model.php index e825081..c940801 100644 --- a/app/Models/Member_model.php +++ b/app/Models/Member_model.php @@ -7,7 +7,7 @@ class Member_model extends Model protected $table = 'member'; protected $primaryKey = 'id'; - protected $allowedFields = ['name', 'mobile','email','username', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_email_verified' , 'verification_code' , 'created_by','updated_by']; + protected $allowedFields = ['name', 'mobile','email','username', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_email_verified' , 'verification_code' , 'is_active' , 'created_by','updated_by']; protected $beforeInsert = ['beforeInsert']; protected $beforeUpdate = ['beforeUpdate']; diff --git a/app/Models/User_model.php b/app/Models/User_model.php index 4a37b41..31b5610 100644 --- a/app/Models/User_model.php +++ b/app/Models/User_model.php @@ -7,7 +7,7 @@ class User_model extends Model protected $table = 'users'; protected $primaryKey = 'id'; - protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' ,'created_at','updated_at']; + protected $allowedFields = ['role','name', 'mobile', 'profile' , 'email', 'password', 'address' , 'city' , 'state' , 'country' , 'pincode' , 'is_active' ,'created_at','updated_at']; protected $beforeInsert = ['beforeInsert']; protected $beforeUpdate = ['beforeUpdate']; diff --git a/app/Views/forgot_password.php b/app/Views/forgot_password.php index af4da2c..19d89fd 100644 --- a/app/Views/forgot_password.php +++ b/app/Views/forgot_password.php @@ -47,7 +47,9 @@
- +
+ + getTempdata('error')):?>
getTempdata('error'); ?> @@ -57,20 +59,20 @@
- +
- +

- +
@@ -106,8 +108,7 @@ $('#alert').delay(3000).fadeOut('slow'); // This will disable just the div $(".disable").hide(); -$(document).on('click','#submit',function(){ - alert("gaf") +$(document).on('click','#submit1',function(){ var email = $("#email").val(); $.ajax({ type: "post", @@ -116,13 +117,19 @@ $(document).on('click','#submit',function(){ json: true, success: function(response) { response = jQuery.parseJSON(response); - if (response.status == "success") { + if (response.status == "success") + { $(".disable").show(); $('#verify_otp').val(response.otp); - // $('#submit').html('Submit') $("#re-sub").html(''); - window.stop() + window.stop(); } + else + { + $('#alert1').addClass('alert alert-danger'); + $('#alert1').html('Email is not verified.please check your mail.') + + } }, error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 0ff400e..eac786f 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -108,7 +108,7 @@ $(document).ready(function(){ /assets/images/logo-sm.png" alt="" height="24"> - /assets/images/logo-light.png" alt="" height="20"> + /assets/images/company-logo/GolfEvolution_White.png" alt="" height="65">
@@ -238,7 +238,14 @@ $(document).ready(function(){
  • Edit + + + + + + + + diff --git a/app/Views/set_password.php b/app/Views/set_password.php index 2fea39f..e4a8b31 100644 --- a/app/Views/set_password.php +++ b/app/Views/set_password.php @@ -70,8 +70,10 @@
    - +
    diff --git a/app/Views/user_form.php b/app/Views/user_form.php index eff71e5..b74a36e 100644 --- a/app/Views/user_form.php +++ b/app/Views/user_form.php @@ -68,7 +68,7 @@
    - + -
    +
    @@ -119,21 +119,23 @@
    - +
    - +
    - +
    diff --git a/app/Views/users_list.php b/app/Views/users_list.php index 6ff85de..f589b08 100644 --- a/app/Views/users_list.php +++ b/app/Views/users_list.php @@ -53,8 +53,15 @@ - - Edit + + + + + + +