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
f797d8d
..
9fcf052
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-327,7
+327,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
}
- if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') {
+ if (empty($_SERVER['PATH_INFO']) ||
$_SERVER['PATH_INFO'] == '/Login') {
$auto_auth_allow = false;
}
//var_dump($auto_auth_allow);
$auto_auth_allow = false;
}
//var_dump($auto_auth_allow);
@@
-1470,9
+1470,9
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
){
return false;
}
){
return false;
}
+ $pg= HTML_FlexyFramework::get()->page;
- $issuer = (empty($this->name)) ?
- rawurlencode('ROOJS') : rawurlencode($this->name);
+ $issuer = (empty($pg->company->name)) ? rawurlencode('ROOJS') : rawurlencode($pg->company->name);
$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";