DataObjects/Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 673c21c..025df86 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -673,17 +673,12 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['dailykey'] = '';
         $aur['oath_key'] = '';
         
         $aur['dailykey'] = '';
         $aur['oath_key'] = '';
         

-        $aur['oath_key_enable'] = !empty($this->oath_key);
-        

         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
         $s = DB_DataObject::Factory('core_setting');
         $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');

-        
-        if(!empty($oath_require)) {
-            
+        if(empty($oath_require) || $oath_require == 1) {
+            $aur['oath_key_enable'] = !empty($this->oath_key);

         }
         }

-        
-        
-        $aur['require_oath'] = empty($oath_require) || $oath_require == 1 ? 1 : 0;
+        $aur['require_oath'] =  ? 1 : 0;

         
         return $aur;
     }
         
         return $aur;
     }