projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa2c49d
)
DataObjects/Core_person.php
author
john
<john@roojs.com>
Wed, 10 Oct 2018 04:27:34 +0000
(12:27 +0800)
committer
john
<john@roojs.com>
Wed, 10 Oct 2018 04:27:34 +0000
(12:27 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
05e6020
..
bd50fc6
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-1453,7
+1453,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
{
if(
empty($this->email) &&
- empty($
this->oath_key
)
+ empty($
hash
)
){
return false;
}
@@
-1461,7
+1461,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$issuer = (empty($this->name)) ?
rawurlencode('ROOJS') : rawurlencode($this->name);
- $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$
this->oath_key
}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
+ $uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$
hash
}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
require_once 'Image/QRCode.php';