diff --git a/application/controllers/shared/Users.php b/application/controllers/shared/Users.php index 9c0583b..94d67a3 100644 --- a/application/controllers/shared/Users.php +++ b/application/controllers/shared/Users.php @@ -165,31 +165,31 @@ class Users extends MY_Controller{ $html = $this->load->view('emails/newuser_mail', $data, TRUE); - if( $_ENV['ENVIRONMENT'] == 'production') - { - //Deze code wordt alleen op produktie gebruikt en stuurt de mail - //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt - $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); - - $mailData = [ - 'from' => 'info@monpas.nl', - 'to' => $user->email, - 'cc' => 'rfranke@framework-ed.nl', - 'subject' => 'Inloggegevens MonPas', - 'html' => $html, - 'inline' => [ - [ - 'filename' => 'monpasklein.png', - 'filePath' => FCPATH . 'css/images/monpasklein.png'] - ] - ]; - - if( $org->randomname ) $mailData['attachment'][0] = [ - 'filename' => $org->bijlagefile, - 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; - - $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); - }else{ +// if( $_ENV['ENVIRONMENT'] == 'production') +// { +// //Deze code wordt alleen op produktie gebruikt en stuurt de mail +// //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt +// $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); +// +// $mailData = [ +// 'from' => 'info@monpas.nl', +// 'to' => $user->email, +// 'cc' => 'rfranke@framework-ed.nl', +// 'subject' => 'Inloggegevens MonPas', +// 'html' => $html, +// 'inline' => [ +// [ +// 'filename' => 'monpasklein.png', +// 'filePath' => FCPATH . 'css/images/monpasklein.png'] +// ] +// ]; +// +// if( $org->randomname ) $mailData['attachment'][0] = [ +// 'filename' => $org->bijlagefile, +// 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; +// +// $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); +// }else{ $this->load->library('email'); $this->email->from('noreply@framework.nl', 'Framework+ MonPas'); @@ -200,7 +200,7 @@ class Users extends MY_Controller{ if ($org->randomname) $this->email->attach('./../docs/'.$org->randomname,'attachment', $org->bijlagefile); $this->email->send(); - } +// } } function updateuser2(){ @@ -326,30 +326,30 @@ class Users extends MY_Controller{ $html = $this->load->view( 'emails/newpassword_mail', $data, TRUE ); $org = $this->getBijlage($orgid); - if( $_ENV['ENVIRONMENT'] == 'production') - { - //Deze code wordt alleen op produktie gebruikt en stuurt de mail - //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt - $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); - $mailData = [ - 'from' => 'info@monpas.nl', - 'to' => $user->email, - 'cc' => 'rfranke@framework-ed.nl', - 'subject' => 'Inloggegevens MonPas', - 'html' => $html, - 'inline' => [ - [ - 'filename' => 'monpasklein.png', - 'filePath' => FCPATH . 'css/images/monpasklein.png'] - ] - ]; - if( $org->randomname ) $mailData['attachment'][0] = [ - 'filename' => $org->bijlagefile, - 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; - - $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); - }else - { +// if( $_ENV['ENVIRONMENT'] == 'production') +// { +// //Deze code wordt alleen op produktie gebruikt en stuurt de mail +// //naar Mailgun via een API (Codeigniter email library wordt niet gebruikt +// $mg = Mailgun::create( $_ENV['MAIL']['APIKEY'] ); +// $mailData = [ +// 'from' => 'info@monpas.nl', +// 'to' => $user->email, +// 'cc' => 'rfranke@framework-ed.nl', +// 'subject' => 'Inloggegevens MonPas', +// 'html' => $html, +// 'inline' => [ +// [ +// 'filename' => 'monpasklein.png', +// 'filePath' => FCPATH . 'css/images/monpasklein.png'] +// ] +// ]; +// if( $org->randomname ) $mailData['attachment'][0] = [ +// 'filename' => $org->bijlagefile, +// 'filePath' => MYROOTPATH. 'docs/'.$org->randomname ]; +// +// $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], $mailData ); +// }else +// { $this->load->library( 'email' ); $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->send(); $result = $this->email->print_debugger(); - } +// } echo json_encode(array('ok'=>$ok, 'errortekst'=>$errortekst)); }