DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 025df86..db086dd 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -521,9 +521,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     function checkTwoFactorAuthentication($val)
     {
         // also used in login
-        
-        return true;
-        
         require_once 'System.php';
         
         if(
@@ -673,12 +670,17 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['dailykey'] = '';
         $aur['oath_key'] = '';
         
+        $aur['oath_key_enable'] = !empty($this->oath_key);
+        $aur['require_oath'] = 1;
+        
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
-        if(empty($oath_require) || $oath_require == 1) {
-            $aur['oath_key_enable'] = !empty($this->oath_key);
-        }
-        $aur['require_oath'] =  ? 1 : 0;
+        
+        if(!empty($oath_require)) {
+            if($oath_require->val == 0) {
+                $aur['require_oath'] = 0;
+            }
+        } 
         
         return $aur;
     }