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
88e6ab8
..
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;
}
@@
-767,7
+771,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
{
//DB_DataObject::DebugLevel(1);
if(!empty($q['_to_qr_code'])){
{
//DB_DataObject::DebugLevel(1);
if(!empty($q['_to_qr_code'])){
-
$person = DB_DataObject::factory('Core_person');
$person->id = $q['id'];
$person = DB_DataObject::factory('Core_person');
$person->id = $q['id'];
@@
-778,9
+781,11
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$hash = $this->generateOathKey();
$_SESSION[__CLASS__] =
$hash = $this->generateOathKey();
$_SESSION[__CLASS__] =
- isset($_SESSION[__CLASS__]) ? $_SESSION[__CLASS__] : array();
+ isset($_SESSION[__CLASS__]) ?
+ $_SESSION[__CLASS__] : array();
$_SESSION[__CLASS__]['oath'] =
$_SESSION[__CLASS__]['oath'] =
- isset($_SESSION[__CLASS__]['oath']) ? $_SESSION[__CLASS__]['oath'] : array();
+ isset($_SESSION[__CLASS__]['oath']) ?
+ $_SESSION[__CLASS__]['oath'] : array();
$_SESSION[__CLASS__]['oath'][$person->id] = $hash;
$_SESSION[__CLASS__]['oath'][$person->id] = $hash;
@@
-794,7
+799,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
if(!empty($q['two_factor_auth_code'])) {
}
if(!empty($q['two_factor_auth_code'])) {
-
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$o = clone($person);
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$o = clone($person);
@@
-810,7
+814,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
if(!empty($q['oath_key_disable'])) {
}
if(!empty($q['oath_key_disable'])) {
-
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);