$tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
$u = DB_DataObject::factory($tbl);
+ $s = DB_DataObject::Factory('core_setting');
if (!$u->isAuth()) {
-
- $this->jok(array('id' => 0)); // not logged in..
- exit;
+ $this->jok(array(
+ 'id' => 0,
+ 'disable_oath' => (bool) $s->lookup('core', 'two_factor_authentication') ? 1 : 0
+ )); // not logged in..
+ exit;
}
//die("got here?");
$au = $u->getAuthUser();
exit;
}
- if(!empty($u->oath_key) && !$u->checkTwoFactorAuthentication(trim($_REQUEST['oath_password'],"\x10"))){
+ if(
+ !empty($u->oath_key) &&
+ !$u->checkTwoFactorAuthentication($_REQUEST['oath_password'], $u->oath_key)
+ ){
$this->jerror('LOGIN-BAD', 'You typed the wrong Username or Password (3)');
exit;
}