Pman/Login.php

[Pman.Base] / Pman / Login.php

diff --git a/Pman/Login.php b/Pman/Login.php
index 131e244..e822011 100644 (file)
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -129,14 +129,23 @@ class Pman_Login extends Pman
         $tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
         
         $u = DB_DataObject::factory($tbl);
-        $s = DB_DataObject::Factory('core_setting');
+        $s = DB_DataObject::factory('core_setting');
+        $oath_require_val = 1;
+        $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
+        if(!empty($oath_require)) {
+            if($oath_require->val == 0) {
+                $oath_require_val = 0;
+            }
+        } 
+        
         if (!$u->isAuth()) {
             $this->jok(array(
                 'id' => 0,
-                 'oath_require' => (bool) $s->lookup('core', 'two_factor_authentication_requirement') ? 1 : 0
-             )); // not logged in..
-             exit;
+                'require_oath' => $oath_require_val
+            ));
+            exit;
         }
+        
         //die("got here?");
         $au = $u->getAuthUser();