Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for sending user credentials

Browse Source
This commit is contained in:
theo
2024-09-16 15:40:39 +02:00
parent b02875543f
commit b02eae9515
1 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/shared/Users.php
+51 -51
View File
@@ -165,31 +165,31 @@ class Users extends MY_Controller{
$html = $this->load->view('emails/newuser_mail', $data, TRUE); $html = $this->load->view('emails/newuser_mail', $data, TRUE);
if( $_ENV['ENVIRONMENT'] == 'production') // if( $_ENV['ENVIRONMENT'] == 'production')
{ // {
//Deze code wordt alleen op produktie gebruikt en stuurt de mail // //Deze code wordt alleen op produktie gebruikt en stuurt de mail
//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt // //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); // $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
//
$mailData = [ // $mailData = [
'from' => 'info@monpas.nl', // 'from' => 'info@monpas.nl',
'to' => $user->email, // 'to' => $user->email,
'cc' => 'rfranke@framework-ed.nl', // 'cc' => 'rfranke@framework-ed.nl',
'subject' => 'Inloggegevens MonPas', // 'subject' => 'Inloggegevens MonPas',
'html' => $html, // 'html' => $html,
'inline' => [ // 'inline' => [
[ // [
'filename' => 'monpasklein.png', // 'filename' => 'monpasklein.png',
'filePath' => FCPATH . 'css/images/monpasklein.png'] // 'filePath' => FCPATH . 'css/images/monpasklein.png']
] // ]
]; // ];
//
if( $org->randomname ) $mailData['attachment'][0] = [ // if( $org->randomname ) $mailData['attachment'][0] = [
'filename' => $org->bijlagefile, // 'filename' => $org->bijlagefile,
'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; // 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ];
//
$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); // $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData );
}else{ // }else{
$this->load->library('email'); $this->load->library('email');
$this->email->from('noreply@framework.nl', 'Framework+ MonPas'); $this->email->from('noreply@framework.nl', 'Framework+ MonPas');
@@ -200,7 +200,7 @@ class Users extends MY_Controller{
if ($org->randomname) if ($org->randomname)
$this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile); $this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile);
$this->email->send(); $this->email->send();
} // }
} }
function updateuser2(){ function updateuser2(){
@@ -326,30 +326,30 @@ class Users extends MY_Controller{
$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE ); $html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
$org = $this->getBijlage($orgid); $org = $this->getBijlage($orgid);
if( $_ENV['ENVIRONMENT'] == 'production') // if( $_ENV['ENVIRONMENT'] == 'production')
{ // {
//Deze code wordt alleen op produktie gebruikt en stuurt de mail // //Deze code wordt alleen op produktie gebruikt en stuurt de mail
//naar Mailgun via een API (Codeigniter email library wordt niet gebruikt // //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt
$mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); // $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] );
$mailData = [ // $mailData = [
'from' => 'info@monpas.nl', // 'from' => 'info@monpas.nl',
'to' => $user->email, // 'to' => $user->email,
'cc' => 'rfranke@framework-ed.nl', // 'cc' => 'rfranke@framework-ed.nl',
'subject' => 'Inloggegevens MonPas', // 'subject' => 'Inloggegevens MonPas',
'html' => $html, // 'html' => $html,
'inline' => [ // 'inline' => [
[ // [
'filename' => 'monpasklein.png', // 'filename' => 'monpasklein.png',
'filePath' => FCPATH . 'css/images/monpasklein.png'] // 'filePath' => FCPATH . 'css/images/monpasklein.png']
] // ]
]; // ];
if( $org->randomname ) $mailData['attachment'][0] = [ // if( $org->randomname ) $mailData['attachment'][0] = [
'filename' => $org->bijlagefile, // 'filename' => $org->bijlagefile,
'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; // 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ];
//
$mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); // $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData );
}else // }else
{ // {
$this->load->library( 'email' ); $this->load->library( 'email' );
$this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' ); $this->email->from( 'noreply@framework.nl', 'Framework+ MonPas' );
@@ -361,7 +361,7 @@ class Users extends MY_Controller{
$this->email->attach(MYROOTPATH. 'docs/'.$org->randomname,'attachment', $org->bijlagefile); $this->email->attach(MYROOTPATH. 'docs/'.$org->randomname,'attachment', $org->bijlagefile);
$this->email->send(); $this->email->send();
$result = $this->email->print_debugger(); $result = $this->email->print_debugger();
} // }
echo json_encode(array('ok'=>$ok, 'errortekst'=>$errortekst)); echo json_encode(array('ok'=>$ok, 'errortekst'=>$errortekst));
} }