Pman/Login.php

[Pman.Base] / Pman / Login.php

diff --git a/Pman/Login.php b/Pman/Login.php
index 3936446..fae3e12 100644 (file)
--- a/Pman/Login.php
+++ b/Pman/Login.php
@@ -130,10 +130,11 @@ class Pman_Login extends Pman
         
         $u = DB_DataObject::factory($tbl);
         $s = DB_DataObject::Factory('core_setting');
+        $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
         if (!$u->isAuth()) {
             $this->jok(array(
                 'id' => 0,
-                 'disable_oath' => bool() $s->lookup('core', 'two_factor_authentication') ? 0 : 1
+                'oath_require' => (bool)  ? 1 : 0
              )); // not logged in..
              exit;
         }
@@ -319,7 +320,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;