From 52172f811648a25d438c1d31452d86a840ca69a1 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Fri, 16 Jul 2021 11:11:58 +0200 Subject: [PATCH] mailgun api --- application/controllers/Login.php | 254 +++++++++++------- application/views/emails/newpassword_mail.php | 4 +- composer.json | 5 +- 3 files changed, 160 insertions(+), 103 deletions(-) diff --git a/application/controllers/Login.php b/application/controllers/Login.php index 481389a..80b6d17 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -1,128 +1,182 @@ load->model($models); - $this->load->helper('string'); + $models = [ + "shared/Users_model", + 'shared/Session_model', + 'shared/Orgusers_model', + "shared/Autorisaties_model", + "shared/Autorisatienivos_model", + "shared/Licenties_model"]; // 'Pages_model', + $this->load->model( $models ); + $this->load->helper( 'string' ); } - function controlleergnaam(){ - $username = $this->db->escape_str($this->input->post('gebruikersnaam'), TRUE); - $userid = $this->Users_model->get_fieldvalue(array('lower(gnaam)'=> strtolower($username), - 'actief' => 1), 'id'); + function controlleergnaam() + { + $username = $this->db->escape_str( $this->input->post( 'gebruikersnaam' ), TRUE ); + $userid = $this->Users_model->get_fieldvalue( [ + 'lower(gnaam)' => strtolower( $username ), + 'actief' => 1], 'id' ); - if(!$userid){ - $zout = FALSE; - $challenge = FALSE; - }else{ - $this->Session_model->set_tmpuserid($userid); - $zout = $this->Users_model->get_record_by_id($userid, 'zout'); - - $challenge = random_string('alnum', 10); - $this->session->set_userdata('challenge', $challenge); + if ( ! $userid ) + { + $zout = FALSE; + $challenge = FALSE; } - $data = array('userid'=>$userid, 'salt'=>$zout, 'challenge'=>$challenge); - echo json_encode($data); + else + { + $this->Session_model->set_tmpuserid( $userid ); + $zout = $this->Users_model->get_record_by_id( $userid, 'zout' ); + + $challenge = random_string( 'alnum', 10 ); + $this->session->set_userdata( 'challenge', $challenge ); + } + $data = ['userid' => $userid, 'salt' => $zout, 'challenge' => $challenge]; + echo json_encode( $data ); } - function controleerwwoord(){ - $result = null; - $userrole = null; - $tmpuserid = $this->session->userdata('tmpuserid'); - $password = $this->Users_model->get_record_by_id($tmpuserid, 'wachtwoord'); - $salt = $this->Users_model->get_record_by_id($tmpuserid, 'zout'); - $challenge = $this->session->userdata('challenge'); - $masterpass = md5(md5($salt.'Mstr@p0m-mnbs_983').$challenge); - $saltedww = md5(md5($salt.$password).$challenge); - $challengedww = md5($password.$challenge); - $saltedchallenge= $this->db->escape_str($this->input->post('saltedchallenge', TRUE)); + function controleerwwoord() + { + $result = NULL; + $userrole = NULL; + $tmpuserid = $this->session->userdata( 'tmpuserid' ); + $password = $this->Users_model->get_record_by_id( $tmpuserid, 'wachtwoord' ); + $salt = $this->Users_model->get_record_by_id( $tmpuserid, 'zout' ); - if (($challengedww !==$saltedchallenge) && - ($masterpass !==$saltedchallenge)){ - $result = null; - }else{ - $orguser = $this->Orgusers_model->get_records_where(array('user_id'=>$tmpuserid), TRUE); - $orguser = $this->Orgusers_model->gethighestautorisatie($tmpuserid); + $challenge = $this->session->userdata( 'challenge' ); + $masterpass = md5( md5( $salt . 'Mstr@p0m-mnbs_983' ) . $challenge ); + $saltedww = md5( md5( $salt . $password ) . $challenge ); + $challengedww = md5( $password . $challenge ); + $saltedchallenge = $this->db->escape_str( $this->input->post( 'saltedchallenge', TRUE ) ); - if ($orguser) { - $userrole = $orguser->nivo; + if ( ( $challengedww !== $saltedchallenge ) && + ( $masterpass !== $saltedchallenge ) ) + { + $result = NULL; + } + else + { + $orguser = $this->Orgusers_model->get_records_where( ['user_id' => $tmpuserid], TRUE ); + $orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid ); + + if ( $orguser ) + { + $userrole = $orguser->nivo; } - - if ($userrole == null || !$orguser || $userrole ==0){ - $result="geen rechten"; + + if ( $userrole == NULL || ! $orguser || $userrole == 0 ) + { + $result = "geen rechten"; } - else { - $this->login_user($tmpuserid); - $result='ok'; + else + { + $this->login_user( $tmpuserid ); + $result = 'ok'; } - } - echo json_encode($result); + } + echo json_encode( $result ); } - - function login_user($tmpuserid){ - $orguser = $this->Orgusers_model->gethighestautorisatie($tmpuserid); - $orgid = $orguser->organisatie_id; - //$nivoid = $this->Autorisaties_model->get_fieldvalue(array('orguser_id'=>$orguser->id), 'nivo_id'); - //$userrole = $this->Autorisatienivos_model->get_fieldvalue(array('id'=>$nivoid), "nivo"); - $userrole = $orguser->nivo; - $modules = $this->Licenties_model->get_licentie($orgid); - $this->Session_model->set_userid($tmpuserid); - $this->Session_model->set_orgid($orgid); - $this->Session_model->set_role($userrole); - $this->session->set_userdata(array('language'=>'dutchijk')); - - if (!$modules) {$this->Session_model->set_module(-1);} - else { if (count($modules) == 1) {$this->Session_model->set_module($modules[0]->sysnr);} - else {$this->Session_model->set_module(0); } ; + function login_user( $tmpuserid ) + { + $orguser = $this->Orgusers_model->gethighestautorisatie( $tmpuserid ); + $orgid = $orguser->organisatie_id; + //$nivoid = $this->Autorisaties_model->get_fieldvalue(array('orguser_id'=>$orguser->id), 'nivo_id'); + //$userrole = $this->Autorisatienivos_model->get_fieldvalue(array('id'=>$nivoid), "nivo"); + $userrole = $orguser->nivo; + $modules = $this->Licenties_model->get_licentie( $orgid ); + + $this->Session_model->set_userid( $tmpuserid ); + $this->Session_model->set_orgid( $orgid ); + $this->Session_model->set_role( $userrole ); + $this->session->set_userdata( ['language' => 'dutchijk'] ); + + if ( ! $modules ) + { + $this->Session_model->set_module( - 1 ); + } + else + { + if ( count( $modules ) == 1 ) + { + $this->Session_model->set_module( $modules[0]->sysnr ); + } + else + { + $this->Session_model->set_module( 0 ); }; + }; } - function logout(){ + function logout() + { $this->session->sess_destroy(); - redirect(base_url().'index.php/toner'); + redirect( base_url() . 'index.php/toner' ); } - function nieuwwachtwoord(){ - $email = $this->db->escape_str($this->input->post('email')); - $username = $this->db->escape_str($this->input->post('gnaam')); - $result = array('errortekst'=>'', 'status'=>false); - if(!$this->Users_model->get_records_where(array('lower(email)'=> strtolower($email)))){ - $result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!'; - } - elseif(!$this->Users_model->get_records_where(array('lower(gnaam)'=> strtolower($username)))){ - $result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!'; - } - elseif(strtoupper($this->Users_model->get_fieldvalue(array('UCASE(gnaam)'=>strtoupper($username)), 'email'))!=strtoupper($email)){ - $result['errortekst']= 'Gebruikersnaam en e-mailadres komen niet overeen!'; - }else{ - $userid = $this->Users_model->get_fieldvalue(array('lower(gnaam)'=> strtolower($username)), 'id'); - $salt = $this->Users_model->get_record_by_id($userid, 'zout'); - $password = random_string('alnum', 8); - $this->Users_model->update_record(array('wachtwoord'=>md5($salt.$password)), $userid); - $data = array('username'=>$username, 'password'=>$password, 'fullname'=>$this->Users_model->get_fullname($userid)); + function nieuwwachtwoord() + { + $email = $this->db->escape_str( $this->input->post( 'email' ) ); + $username = $this->db->escape_str( $this->input->post( 'gnaam' ) ); + $result = ['errortekst' => '', 'status' => FALSE]; + if ( ! $this->Users_model->get_records_where( ['lower(email)' => strtolower( $email )] ) ) + { + $result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!'; + } + elseif ( ! $this->Users_model->get_records_where( ['lower(gnaam)' => strtolower( $username )] ) ) + { + $result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!'; + } + elseif ( strtoupper( $this->Users_model->get_fieldvalue( ['UCASE(gnaam)' => strtoupper( $username )], 'email' ) ) != strtoupper( $email ) ) + { + $result['errortekst'] = 'Gebruikersnaam en e-mailadres komen niet overeen!'; + } + else + { + $userid = $this->Users_model->get_fieldvalue( ['lower(gnaam)' => strtolower( $username )], 'id' ); - $this->load->library('email'); - - $this->email->from('noreply@framework.nl', 'Framework+ MonPas'); - $this->email->to($email); - $this->email->subject('Inloggegevens MonPas'); - $this->email->message($this->load->view('emails/newpassword_mail', $data, TRUE)); - $this->email->bcc("rfranke@framework-ed.nl"); + $salt = $this->Users_model->get_record_by_id( $userid, 'zout' ); + $password = random_string( 'alnum', 8 ); + $this->Users_model->update_record( ['wachtwoord' => md5( $salt . $password )], $userid ); + $data = ['username' => $username, 'password' => $password, 'fullname' => $this->Users_model->get_fullname( $userid )]; + + $html = $this->load->view( 'emails/newpassword_mail', $data, TRUE ); + $mg = Mailgun::create( '8d6b5f67d2eb98a75211e2557b00fbfb-e31dc3cc-046e9e0d' ); // For US servers + $mg->messages()->send( 'mg.monpas.nl', [ + 'from' => 'info@monpas.nl', + 'to' => 't.weijmer@pensare.nl', + 'subject' => 'Inloggegevens MonPas', + 'html' => $html, + 'inline' => [ + [ + 'filename' => 'monpasklein.png', + 'filePath' => '@css/images/'] + ] + ] ); + + return; + $this->load->library( 'email' ); + + $this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' ); + $this->email->to( $email ); + $this->email->subject( 'Inloggegevens MonPas' ); + $this->email->message( $this->load->view( 'emails/newpassword_mail', $data, TRUE ) ); + $this->email->bcc( "rfranke@framework-ed.nl" ); $this->email->send(); - $result['errortekst']= 'Er is een e-mail gestuurd naar '.$email.' met uw nieuwe wachtwoord.'; - $result['status']=true; - } - echo json_encode($result); + $result['errortekst'] = 'Er is een e-mail gestuurd naar ' . $email . ' met uw nieuwe wachtwoord.'; + $result['status'] = TRUE; + } + echo json_encode( $result ); } -} \ No newline at end of file +} diff --git a/application/views/emails/newpassword_mail.php b/application/views/emails/newpassword_mail.php index 1ecd257..301471a 100644 --- a/application/views/emails/newpassword_mail.php +++ b/application/views/emails/newpassword_mail.php @@ -10,7 +10,7 @@
- +

Beste ,

@@ -37,4 +37,4 @@

- \ No newline at end of file + diff --git a/composer.json b/composer.json index f1b994a..8f578e7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,10 @@ "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { - "php": ">=7.0" + "php": ">=7.0", + "mailgun/mailgun-php": "^3.5", + "kriswallsmith/buzz": "^1.2", + "nyholm/psr7": "^1.4" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x"