projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5774 - City / Province...
[Pman.Core]
/
DataObjects
/
Core_person.php
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
9fcf052
..
12a9793
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-812,7
+812,11
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$roo->jerr('Fail to generate QR Code');
}
$roo->jerr('Fail to generate QR Code');
}
- $roo->jok($qrcode);
+ $roo->jdata(array(
+ 'secret' => $hash,
+ 'image' => $qrcode,
+ 'issuer' => $person->qrCodeIssuer()
+ ));
}
if(!empty($q['two_factor_auth_code'])) {
}
if(!empty($q['two_factor_auth_code'])) {
@@
-1470,9
+1474,8
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
){
return false;
}
){
return false;
}
- $pg= HTML_FlexyFramework::get()->page;
- $issuer =
(empty($pg->company->name)) ? rawurlencode('ROOJS') : rawurlencode($pg->company->name
);
+ $issuer =
rawurlencode($this->qrCodeIssuer()
);
$uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
$uri = "otpauth://totp/{$issuer}:{$this->email}?secret={$hash}&issuer={$issuer}&algorithm=SHA1&digits=6&period=30";
@@
-1492,6
+1495,15
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
return "data:image/png;base64,{$base64}";
}
return "data:image/png;base64,{$base64}";
}
+ function qrCodeIssuer()
+ {
+ $pg= HTML_FlexyFramework::get()->page;
+
+ $issuer = (empty($pg->company->name)) ? 'ROOJS' : "{$pg->company->name}";
+
+ return $issuer;
+ }
+
static function test_ADMIN_PASSWORD_RESET($pg, $to)
{
$ff = HTML_FlexyFramework::get();
static function test_ADMIN_PASSWORD_RESET($pg, $to)
{
$ff = HTML_FlexyFramework::get();