DataObjects/Core_person.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index afb90eb..e34c24c 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -407,23 +407,15 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         //var_dump(array(get_class($this),$sesPrefix .'-auth'));
        
         if (self::$authUser) {
-            $a = unserialize($_SESSION[get_class($this)][$sesPrefix .'-auth']);
+             
+            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), '/');
+            }
             
-            $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..
-                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);
+            $user = clone (self::$authUser);
+            return clone($user);
             
-            }
-            unset($_SESSION[get_class($this)][$sesPrefix .'-auth']);
-            unset($_SESSION[get_class($this)][$sesPrefix .'-timeout']);
-            setcookie('Pman.timeout', -1, time() + (30*60), '/');
             
         }
         
@@ -503,6 +495,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         //var_dump(array(get_class($this),$sesPrefix .'-auth'));
         $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object)$d);
+        
+        self::$authUser = $p;
         // ensure it's written so that ajax calls can fetch it..
         
         
@@ -518,6 +512,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         $_SESSION[get_class($this)][$sesPrefix .'-auth'] = "";
         
+        self::$authUser = false;
+        
     }    
     function genPassKey ($t) 
     {
@@ -1420,7 +1416,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         return $sesPrefix;
     }
     
-    function loginPublic()
+    function loginPublic() // used where???
     {
         $this->isAuth(); // force session start..