Pman/Login.php

[Pman.Base] / Pman / Login.php

diff --git a/Pman/Login.php b/Pman/Login.php
index 2b8b9b5..7266f02 100644 (file)
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -130,13 +130,22 @@ class Pman_Login extends Pman
         
         $u = DB_DataObject::factory($tbl);
         $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,
-                 'disable_oath' => (bool) $s->lookup('core', 'two_factor_authentication') ? 1 : 0
-             )); // not logged in..
+                'require_oath' => empty($oath_require) || $oath_require->val == 1 ? 1 : 0
+             ));
              exit;
         }
+        
         //die("got here?");
         $au = $u->getAuthUser();
         
@@ -319,7 +328,7 @@ class Pman_Login extends Pman
         
         if(
             !empty($u->oath_key) && 
-            !$u->checkTwoFactorAuthentication($_REQUEST['oath_password'], $u->oath_key)
+            !$u->checkTwoFactorAuthentication($_REQUEST['oath_password'])
         ){
             $this->jerror('LOGIN-BAD', 'You typed the wrong Username or Password  (3)');
             exit;