projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
531f125
)
DataObjects/Core_person.php
author
john
<john@roojs.com>
Thu, 11 Oct 2018 03:49:34 +0000
(11:49 +0800)
committer
john
<john@roojs.com>
Thu, 11 Oct 2018 03:49:34 +0000
(11:49 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
7e15e84
..
f0c839b
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-537,7
+537,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
return false;
}
return false;
}
- $cmd = "{$oathtool} --totp --base32 {$oath_key}";
+ $cmd = "{$oathtool} --totp --base32 {$
this->
oath_key}";
$password = exec($cmd);
$password = exec($cmd);
@@
-794,11
+794,12
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
$person = DB_DataObject::factory('core_person');
$person->get($q['id']);
+ $o = clone($person);
$person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
$person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
- $o = clone($person);
+
$person->update($o);
unset($_SESSION[__CLASS__]['oath'][$person->id]);
$person->update($o);
unset($_SESSION[__CLASS__]['oath'][$person->id]);