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

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 025df86e..f2f2982c 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -673,12 +673,13 @@ 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;
+        
+        // $aur['require_oath'] =  !empty($oath_require) || $oath_require->val == 0 ? 0 : 1;
         
         return $aur;
     }