X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=9fcf052ad2517dfd10db95a7e91a142664f674fa;hb=d3b46e2a074e27475cf0d7cd610f24a525b5af6a;hp=90f8fcc83a6928d827026a3e968157a2d3f11e7f;hpb=5cb2a1ee7d2a3cf9f42357042b0b4ecb32f376e2;p=Pman.Core

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 90f8fcc8..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";
         
@@ -1492,10 +1492,23 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         return "data:image/png;base64,{$base64}";
     }
     
-    static function test_ADMIN_PASSWORD_RESET()
+    static function test_ADMIN_PASSWORD_RESET($pg, $to)
     {
+        $ff = HTML_FlexyFramework::get();
+        $person = DB_DataObject::Factory('core_person');
+        $person->id = -1;
         
+        return array(
+            'HTTP_HOST' => $_SERVER['SERVER_NAME'],
+            'person' => $person,
+            'authFrom' => 'FAKE_LINK',
+            'authKey' => 'FAKE_KEY',
+
+            'rcpts' => $to->email,
+        );
         
+        return $content;
     }
     
+    
  }