DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 187ab75..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);
@@ -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";
         
@@ -1498,11 +1498,11 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         $person = DB_DataObject::Factory('core_person');
         $person->id = -1;
         
-        $content = array(
+        return array(
             'HTTP_HOST' => $_SERVER['SERVER_NAME'],
             'person' => $person,
             'authFrom' => 'FAKE_LINK',
-            'authKey' -> 'FAKE_KEY',
+            'authKey' => 'FAKE_KEY',
 
             'rcpts' => $to->email,
         );