X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=f2f2982c618e60443638744c8d926a0a031e4633;hb=59171aab7dcdb554ab334e2a07a1c34875439326;hp=7b71f3c5612d8c6db097595d929fecadbe76c473;hpb=5dece2fe4c72ca53e8feaac1e3025f3778132ecc;p=Pman.Core

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 7b71f3c5..f2f2982c 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -522,6 +522,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     {
         // also used in login
         
+        return true;
+        
         require_once 'System.php';
         
         if(
@@ -672,9 +674,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['oath_key'] = '';
         
         $aur['oath_key_enable'] = !empty($this->oath_key);
+        $aur['require_oath'] = 1;
         
         $s = DB_DataObject::Factory('core_setting');
-        $aur['disable_oath'] = (bool) $s->lookup('core', 'two_factor_authentication') ? 1 : 0;
+        $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
+        
+        // $aur['require_oath'] =  !empty($oath_require) || $oath_require->val == 0 ? 0 : 1;
         
         return $aur;
     }
@@ -767,7 +772,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     {
         //DB_DataObject::DebugLevel(1);
         if(!empty($q['_to_qr_code'])){
-            
             $person = DB_DataObject::factory('Core_person');
             $person->id = $q['id']; 
             
@@ -811,7 +815,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         if(!empty($q['oath_key_disable'])) {
-            
             $person = DB_DataObject::factory('core_person');
             $person->get($q['id']);