DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 88e6ab8..f2cb1fd 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -674,7 +674,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $aur['oath_key_enable'] = !empty($this->oath_key);
         
         $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['disable_oath'] = (bool)  ? 1 : 0;
         
         return $aur;
     }
@@ -767,7 +769,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']; 
             
@@ -778,9 +779,11 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $hash = $this->generateOathKey();
             
             $_SESSION[__CLASS__] = 
-                isset($_SESSION[__CLASS__]) ? $_SESSION[__CLASS__] : array();
+                isset($_SESSION[__CLASS__]) ? 
+                    $_SESSION[__CLASS__] : array();
             $_SESSION[__CLASS__]['oath'] = 
-                isset($_SESSION[__CLASS__]['oath']) ? $_SESSION[__CLASS__]['oath'] : array();
+                isset($_SESSION[__CLASS__]['oath']) ? 
+                    $_SESSION[__CLASS__]['oath'] : array();
                 
             $_SESSION[__CLASS__]['oath'][$person->id] = $hash;
 
@@ -794,7 +797,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         
         if(!empty($q['two_factor_auth_code'])) {
-            
             $person = DB_DataObject::factory('core_person');
             $person->get($q['id']);
             $o = clone($person);
@@ -810,7 +812,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']);