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

Merge branch 'develop' of https://bitbucket.org/pensare/monpas into develop

Browse Source
This commit is contained in:
Liesbeth ter Schure
2024-08-25 16:24:42 +02:00
parent 3b9ed5f957 cb53785ae6
commit 1df1d51cb7
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Login.php
+5 -6
View File
@@ -134,8 +134,7 @@ class Login extends MY_Controller {
for ($i = 1; $i < 7; $i ++){
$code .= rand(1,9);
}
$dateTime = new DateTime();
$asString = $dateTime->format('Y-m-d H:i:s');
$asString = time();
$this->Users_model->update_record(['twofactorcode' =>$code, 'twofactortime'=>$asString ],$userID);
return $code;
@@ -146,7 +145,7 @@ class Login extends MY_Controller {
$tmpuserid = $this->session->userdata( 'tmpuserid' );
$code = $this->clean_input('code');
$hoe = $this->clean_input('hoe');
$user = $this->Users_model->get([],false,true);
$user = $this->Users_model->get($tmpuserid);
if ($hoe == "GOOGLE"){
$message = $this->checkTwoFactorGoogle($user, $code);
}
@@ -160,9 +159,9 @@ class Login extends MY_Controller {
function checkTwoFactorEmail($user,$code){
$message = false;
$now = strtotime('-10 minutes');
$test = strtotime($user->twofactortime);
if ($now > strtotime($user->twofactortime) )
$now = time() - (10 * 60);
$test = $user->twofactortime;
if ($now > $test )
$message = "U heeft te lang gewacht, de code is niet meer geldig.";
else
if ($user->twofactorcode !== $code) $message = "Code is incorrect.";
application/core/MY_Model.php
+1 -1
View File
@@ -176,7 +176,7 @@ class MY_Model extends CI_Model{
if ( $fieldname ) $this->db->select( $fieldname );
$query = $this->db->get( $this->tablename . ' AS T1' );
if ( $query->num_rows() == 0 ) return FALSE;
if ( ! $query || $query->num_rows() == 0 ) return FALSE;
if ( $row ){
$row = $query->row();