$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');
+ $require_oath = 1;
+ $require_oath = $s->lookup('core', 'two_factor_authentication_requirement');
+ if(!empty($require_oath)) {
+ if($require_oath->val == 0) {
+ $oath_require_val = 0;
+ }
+ }
+
if (!$u->isAuth()) {
$this->jok(array(
'id' => 0,
- 'disable_oath' => empty($s->lookup('core', 'two_factor_authentication')) ? 0 : 1
- )); // not logged in..
- exit;
+ 'require_oath' => $oath_require_val
+ ));
+ exit;
}
+
//die("got here?");
$au = $u->getAuthUser();
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;