DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index f2cb1fd..429ad62 100644 (file)
--- 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(
@@ -671,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);
-        
         $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;
+        }
         
-        $aur['disable_oath'] = (bool)  ? 1 : 0;
         
         return $aur;
     }