DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 8285350..afb90eb 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -265,6 +265,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             // in session...
             $a = unserialize($_SESSION[get_class($this)][$sesPrefix .'-auth']);
             $u = DB_DataObject::factory($this->tableName());
+            $u->autoJoin();
             if ($a->id && $u->get($a->id)) { //&& strlen($u->passwd)) {
                 if ($u->verifyAuth()) {
                     self::$authUser = $u;
@@ -411,9 +412,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $u = DB_DataObject::factory($this->tableName()); // allow extending this ...
             $u->autoJoin();
             if ($u->get($a->id)) { /// && strlen($u->passwd)) {  // should work out the pid .. really..
-                
-                $_SESSION[get_class($this)][$sesPrefix .'-auth-timeout'] = time() + (30*60); // eg. 30 minutes
-                setcookie('Pman.timeout', time() + (30*60), time() + (30*60), '/');
+                if (isset($_SESSION[get_class($this)][$sesPrefix .'-auth'])) {
+                    $_SESSION[get_class($this)][$sesPrefix .'-auth-timeout'] = time() + (30*60); // eg. 30 minutes
+                    setcookie('Pman.timeout', time() + (30*60), time() + (30*60), '/');
+                }
                 
                 $user = clone ($u);
                 return clone($user);