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

send bijlage ook bij new ww

Browse Source
This commit is contained in:
Liesbeth ter Schure
2022-03-22 10:05:04 +01:00
parent c7d3b41480
commit a7ca14bdc1
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/email.php
+3 -1
View File
@@ -24,4 +24,6 @@ $config['smtp_host'] = $_ENV['MAIL']['HOST'];
$config['smtp_user'] = $_ENV['MAIL']['SMTP_USER'];
$config['smtp_pass'] = $_ENV['MAIL']['SMTP_PASS'];
$config['smtp_port'] = $_ENV['MAIL']['SMTP_PORT'];
$config['mailtype']='html';
$config['crlf']="\r\n";
$config['newline']="\r\n";
application/controllers/shared/Organisaties.php
+2 -3
View File
@@ -463,13 +463,12 @@ class Organisaties extends MY_Controller{
$orgID = $_POST['orgID'];
$filename = $_FILES['file']['name'];
$this->deleteOldBijlage($orgID);
if ( ! $this->upload->do_upload('file')) $error = $this->upload->display_errors();
else {
$error = FALSE;
$randomname = $this->upload->data('file_name')['file_name'];
$this->deleteOldBijlage($orgID);
$randomname = $this->upload->data('file_name');
$this->setNieuweBijlage($orgID, $randomname, $filename);
}
$this->json($error);
application/controllers/shared/Users.php
+17 -6
View File
@@ -309,19 +309,22 @@ class Users extends MY_Controller{
}
function SendNewWW(){
//TODO sanitize input
$userid = $this->uri->segment(4);
$ok = true;
$userid = $this->clean_input('userid');
$orgid = $this->clean_input('orgid');
$ok = true;
$errortekst = '';
$user = $this->Users_model->get_record_by_id($userid);
$ww = random_string('alnum', 8);
$ww = random_string('alnum', 8);
$saltedww = md5($user->zout.$ww);
// update user
$this->Users_model->update_record(array('wachtwoord'=>$saltedww),$userid);
$data = array('username'=>$user->gnaam, 'password'=>$ww, 'fullname'=>$this->Users_model->get_fullname($userid));
$html = $this->load->view( 'emails/newpassword_mail', $data, TRUE );
if( $_ENV['ENVIRONMENT'] == 'production')
$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
@@ -338,6 +341,11 @@ class Users extends MY_Controller{
'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' );
@@ -347,7 +355,10 @@ class Users extends MY_Controller{
$this->email->subject( 'Inloggegevens MonPas' );
$this->email->message( $html );
$this->email->bcc( "rfranke@framework-ed.nl" );
$this->email->send();
$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));