diff --git a/.gitignore b/.gitignore index e2dc2b2..2e8490a 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,6 @@ documents/compactsops/ /public/css/images/samenGroen.png /public/css/images/samenOranje.png /public/css/images/samenRood.png +/public/openbaredocs/handleidingdubbeleautheticatie_2024.pdf +/public/openbaredocs/Googleauthenticator.docx +/public/openbaredocs/Googleauthenticator.pdf diff --git a/application/controllers/Login.php b/application/controllers/Login.php index 1a92820..5989fef 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -218,33 +218,36 @@ class Login extends MY_Controller { $data = ['username' => $username, 'password' => $password, 'fullname' => $this->Users_model->get_fullname( $userid )]; $html = $this->load->view( 'emails/newpassword_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'] ); - $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [ - 'from' => 'info@monpas.nl', - 'to' => $email, - 'cc' => 'rfranke@framework-ed.nl', - 'subject' => 'Inloggegevens MonPas', - 'html' => $html, - 'inline' => [ - [ - 'filename' => 'monpasklein.png', - 'filePath' => FCPATH . 'css/images/monpasklein.png'] - ] - ] ); - }else{ - $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(); - } + $this->Mail_model->sendTheEmail($email, 'Inloggegevens MonPas', $html, "rfranke@framework-ed.nl"); + +// 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'] ); +// $mg->messages()->send( $_ENV['MAIL']['DOMAIN'], [ +// 'from' => 'info@monpas.nl', +// 'to' => $email, +// 'cc' => 'rfranke@framework-ed.nl', +// 'subject' => 'Inloggegevens MonPas', +// 'html' => $html, +// 'inline' => [ +// [ +// 'filename' => 'monpasklein.png', +// 'filePath' => FCPATH . 'css/images/monpasklein.png'] +// ] +// ] ); +// }else{ +// $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; diff --git a/application/controllers/shared/Users.php b/application/controllers/shared/Users.php index 9c0583b..98296f8 100644 --- a/application/controllers/shared/Users.php +++ b/application/controllers/shared/Users.php @@ -165,34 +165,34 @@ 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'); + $this->email->from('info@monpas.nl', 'Framework+ MonPas'); $this->email->to($user->email); $this->email->subject('Inloggegevens MonPas'); $this->email->message($this->load->view('emails/newuser_mail', $data, TRUE)); @@ -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,42 +326,42 @@ 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' ); + $this->email->from( 'info@monpas.nl', 'Framework+ MonPas' ); $this->email->to( $user->email ); $this->email->subject( 'Inloggegevens MonPas' ); $this->email->message( $html ); $this->email->bcc( "rfranke@framework-ed.nl" ); - $this->email->attach(MYROOTPATH. 'docs/'.$org->randomname,'attachment', $org->bijlagefile); + // $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)); } diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index b5671d8..5f7afba 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -96,7 +96,10 @@ class MY_Controller extends CI_Controller{ // public $version = '1.20.23';// bugetsom gebudgeteerde bedragen in plaats van budget in totaal // public $version = '1.20.24';// foutje in afvangen te vroeg aanroepen jaarbudget in callback // public $version = '1.20.26';//gebudgetterde bedragen ipv toegekende budgtten in overzicht monfin, analoog aan bestemmingen - public $version = '1.20.27';//dingen +// public $version = '1.20.27';//dingen + // public $version = '1.21.00';//2factor +// public $version = '1.21.00L'; //2factor -twee + public $version = '1.21.01M'; //verbeteringen compact sop diff --git a/application/models/shared/Mail_model.php b/application/models/shared/Mail_model.php index a5450b3..da15424 100644 --- a/application/models/shared/Mail_model.php +++ b/application/models/shared/Mail_model.php @@ -22,22 +22,22 @@ class Mail_model extends MY_Model{ if ( ! is_array( $to ) ) $to = (array) $to; foreach ( $to as $receiver ){ - - $mailParts = explode( '@', $receiver ); - if (! $mailParts || count($mailParts) < 2) return $result="Er gaat iets fout met e-mail adres ".$receiver; + $mailParts = explode( '@', $receiver ); + if (! $mailParts || count($mailParts) < 2) + return $result="Er gaat iets fout met e-mail adres ".$receiver; - // moet dit gebeuren? $this->setmail(); + $this->email->to( $receiver ); + $this->email->from( 'info@monpas.nl', 'Framework MonPas' ); + if ( $cc ) $this->email->bcc( $cc ); - $this->email->to( $receiver ); - $this->email->from( 'info@monpas.nl', 'Framework MonPas' ); - if ( $cc ) $this->email->bcc( $cc ); + $this->email->subject( $subject ); + $this->email->message( $html ); - $this->email->subject( $subject ); - $this->email->message( $html ); + $sendResult = $this->email->send(); - if ( ! $this->email->send() ){ - $result = $this->email->print_debugger(); - }; + if ( ! $sendResult ){ + $result = $this->email->print_debugger(); + }; } return $result; diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php index 099eb43..d4bedbe 100644 --- a/application/views/monpas/compactsop/ijktabelcompact.php +++ b/application/views/monpas/compactsop/ijktabelcompact.php @@ -269,11 +269,12 @@ - - Scores in procenten - + + + + + scores in procenten diff --git a/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php b/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php index 401953d..5ef4818 100644 --- a/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php +++ b/application/views/monpas/compactsop/maaksoponderdelen/blokvorm.php @@ -3,7 +3,7 @@ data-bind=" css{ geenrand: selected} ">

diff --git a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php index 2555a74..71fd7db 100644 --- a/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php +++ b/application/views/monpas/compactsop/maaksoponderdelen/kiesonderdelen.php @@ -34,9 +34,16 @@ style="background-color:#930f50; color: white; padding: 10px; margin: 5px; margin-right: 15px; height: 150px; "> - + + + + + + + + +

@@ -44,9 +51,15 @@ data-bind="click: $root.fAnnuleerOnderdeel" style="background-color:#930f50; color: white; margin: 5px; padding: 10px; height: 150px; "> - + + + + + + + + +
diff --git a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php index 1c0b84f..79f5de0 100644 --- a/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php +++ b/application/views/monpas/compactsop/maaksoponderdelen/maaklayout.php @@ -23,8 +23,16 @@
-
-
+ + + + + + + +
+
@@ -78,8 +86,15 @@
-
-
+ + + + + + + +
@@ -125,9 +140,16 @@ style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}" style =" color: white; padding: 10px; margin: 5px; margin-right: 15px; height: 150px; "> - + + + + + + + + +
@@ -137,9 +159,15 @@ style: {backgroundColor: $root.tobemovedOnderdeel() && $root.tobemovedOnderdeel().modulenr == modulenr ? '#69970f' : '#930f50'}," style="color: white; margin: 5px; padding: 10px; height: 150px; "> - + + + + + + + + +
diff --git a/application/views/start.php b/application/views/start.php index 44d5602..dfa32c5 100644 --- a/application/views/start.php +++ b/application/views/start.php @@ -72,6 +72,9 @@

Terug naar inlogscherm? Klik hier.

+
+

Vanaf 26 augustus is MonPas extra beveiligd met twee-factor authenticatie.
Nadat u uw gebruikersnaam en wachtwoord hebt opgegeven, wordt u gevraagd om een 6-cijferige code. Deze code krijgt u toegestuurd op uw e-mailadres. +

load->view('twofactor_dialog'); ?> diff --git a/public/css/monpas/main.css b/public/css/monpas/main.css index b1cc238..820aa03 100644 --- a/public/css/monpas/main.css +++ b/public/css/monpas/main.css @@ -1658,7 +1658,7 @@ z-index: 50; /*.randinactief{*/ /* border: 1px solid #bfbfbf;*/ /*}*/ -.geenrand{ +.vergeenrand{ border: none; box-shadow: none; } diff --git a/public/js/monpas/models/compactsopmodel.js b/public/js/monpas/models/compactsopmodel.js index fe6fa6c..9d6ad8d 100644 --- a/public/js/monpas/models/compactsopmodel.js +++ b/public/js/monpas/models/compactsopmodel.js @@ -361,7 +361,13 @@ mh.initCompactSopModel = function(){ });//each if (self.schooljaren() ) self.selectedSchooljaar(self.schooljaren()[0]); self.organisaties(data.organisaties); - self.selectedOrganisatie(self.organisaties()[0]); + if(self.organisaties().length === 1)self.selectedOrganisatie(self.organisaties()[0]) + else{ + $.each(self.organisaties(), function(i,o){ + if(o.soort === self.toporgnr()) + self.selectedOrganisatie(self.organisaties()[i]) + }) + } } // if self.druk(false); if (typeof callback == "function") callback() @@ -374,6 +380,8 @@ mh.initCompactSopModel = function(){ if(self.selectedSchooljaar() === undefined || self.selectedOrganisatie === undefined){ return; } + console.log(self.selectedOrganisatie().soort, 'orgsoort') + switch(self.selectedOrganisatie().soort){ case '1': diff --git a/public/openbaredocs/Googleauthenticator.docx b/public/openbaredocs/Googleauthenticator.docx deleted file mode 100644 index d67866e..0000000 Binary files a/public/openbaredocs/Googleauthenticator.docx and /dev/null differ diff --git a/public/openbaredocs/Googleauthenticator.pdf b/public/openbaredocs/Googleauthenticator.pdf deleted file mode 100644 index 23f6d4e..0000000 Binary files a/public/openbaredocs/Googleauthenticator.pdf and /dev/null differ