projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b6383cf
)
DataObjects/Core_person.php
author
john
<john@roojs.com>
Thu, 11 Oct 2018 03:49:05 +0000
(11:49 +0800)
committer
john
<john@roojs.com>
Thu, 11 Oct 2018 03:49:05 +0000
(11:49 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
488b06b
..
7e15e84
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-518,7
+518,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
return md5(implode(',' , array($month, $this->email , $this->passwd, $this->id)));
}
return md5(implode(',' , array($month, $this->email , $this->passwd, $this->id)));
}
- function checkTwoFactorAuthentication($val
, $oath_key
)
+ function checkTwoFactorAuthentication($val)
{
// also used in login
{
// also used in login
@@
-526,7
+526,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
if(
empty($this->id) ||
if(
empty($this->id) ||
- empty($oath_key)
+ empty($
this->
oath_key)
) {
return false;
}
) {
return false;
}
@@
-799,7
+799,6
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
$o = clone($person);
if($person->checkTwoFactorAuthentication($q['two_factor_auth_code'])) {
$o = clone($person);
- $person->oath_key = $_SESSION[__CLASS__]['oath'][$person->id];
$person->update($o);
unset($_SESSION[__CLASS__]['oath'][$person->id]);
$person->update($o);
unset($_SESSION[__CLASS__]['oath'][$person->id]);