projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_person.php
[Pman.Core]
/
DataObjects
/
Core_person.php
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
5b8c314
..
025df86
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-522,6
+522,8
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
{
// also used in login
{
// also used in login
+ return true;
+
require_once 'System.php';
if(
require_once 'System.php';
if(
@@
-671,10
+673,12
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$aur['dailykey'] = '';
$aur['oath_key'] = '';
$aur['dailykey'] = '';
$aur['oath_key'] = '';
- $aur['oath_key_enable'] = !empty($this->oath_key);
-
$s = DB_DataObject::Factory('core_setting');
$s = DB_DataObject::Factory('core_setting');
- $aur['disable_oath'] = (bool) $s->lookup('core', 'two_factor_authentication') ? 1 : 0;
+ $oath_require = $s->lookup('core', 'two_factor_authentication_requirement');
+ if(empty($oath_require) || $oath_require == 1) {
+ $aur['oath_key_enable'] = !empty($this->oath_key);
+ }
+ $aur['require_oath'] = ? 1 : 0;
return $aur;
}
return $aur;
}