DataObjects/Core_email.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 945b2fc..092d95c 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -222,6 +222,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         if (empty($this->name)) {
             return $this->email;
         }
+        
         return '"' . addslashes($this->name) . '" <' . $this->email . '>';
     }
     
@@ -301,7 +302,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         
         // local auth - 
         $default_admin = false;
-        
         if (!empty($ff->Pman['local_autoauth']) && 
             ($ff->Pman['local_autoauth'] === true) &&
             (!empty($_SERVER['SERVER_ADDR'])) &&
@@ -326,7 +326,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $member->whereAdd("
                 join_user_id_id.id IS NOT NULL
             ");
-            
             if($member->find(true)){
                 $default_admin = DB_DataObject::factory($this->tableName());
                 if(!$default_admin->get($member->user_id)){
@@ -354,7 +353,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             ) &&
             ($default_admin ||  $u->get('email', $ff->Pman['local_autoauth']))
         ) {
-            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize($default_admin ? $default_admin : $u);
+            
+            $user = $default_admin ? $default_admin->toArray() : $u->toArray();
+            
+            $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user);
             return true;
         }
         
@@ -647,8 +649,11 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             $im->selectAdd();
             $im->selectAs($im,  'company_id_logo_id_%s');
             if ($im->find(true)) {
-                    
+                
                 foreach($im->toArray() as $k=>$v) {
+                    if (!preg_match('/^company_id_logo_id_/', $k)) {
+                        continue;
+                    }
                     $aur[$k] = $v;
                 }
             }
@@ -1030,12 +1035,14 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
          * Seems we never expose oath_key / passwd, so...
          */
         
-        $this->_extra_cols = array('length_passwd', 'length_oath_key');
+        if($this->tableName() == 'core_person'){
+            $this->_extra_cols = array('length_passwd', 'length_oath_key');
         
-        $this->selectAdd("
-            LENGTH({$this->tableName()}.passwd) AS length_passwd,
-            LENGTH({$this->tableName()}.oath_key) AS length_oath_key
-        ");
+            $this->selectAdd("
+                LENGTH({$this->tableName()}.passwd) AS length_passwd,
+                LENGTH({$this->tableName()}.oath_key) AS length_oath_key
+            ");
+        }
         
     }
     
@@ -1174,8 +1181,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         if ($roo->authUser->id > -1 ||  $p->count() > 1) {
             return;
         }
-        $c = DB_DAtaObject::Factory('core_company');
-        $tc =$c->count();
+        $c = DB_DataObject::Factory('core_company');
+        $tc = $c->count();
         if (!$tc || $tc> 1) {
             $roo->jerr("can not create initial user as multiple companies already exist");
         }