DataObjects/Core_group.php

[Pman.Core] / DataObjects / Core_person.php

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 11569cc..3fbf656 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -254,7 +254,6 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     //   ---------------- authentication / passwords and keys stuff  ----------------
     function isAuth()
     {
-        
         @session_start();
        
         $ff= HTML_FlexyFramework::get();
@@ -353,7 +352,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             ) &&
             ($default_admin ||  $u->get('email', $ff->Pman['local_autoauth']))
         ) {
-            print_r('this one???');exit;
+            
             $user = $default_admin ? $default_admin->toArray() : $u->toArray();
             
             $_SESSION[get_class($this)][$sesPrefix .'-auth'] = serialize((object) $user);
@@ -649,8 +648,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;
                 }
             }
@@ -1178,8 +1180,9 @@ 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");
         }
@@ -1344,7 +1347,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
                 $roo->jerr('Fail to generate QR Code');
             }
             
-            $roo->jdata($qrcode);
+            $roo->jok($qrcode);
         }
     }