X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=9fcf052ad2517dfd10db95a7e91a142664f674fa;hb=d3b46e2a074e27475cf0d7cd610f24a525b5af6a;hp=f797d8d97676c4f8a426cd604a0a28ec18f1af90;hpb=d507b3cd08f2b34c802050cc8bea81a046741bb8;p=Pman.Core diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index f797d8d9..9fcf052a 100644 --- 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); @@ -1470,9 +1470,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject ){ 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";