X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person.php;h=0c17a7de131bef86ce0b67a908a533b55784f939;hb=89b7f2b7d9572a08b32450cb1604478ce066a064;hp=740fb5498e4a1cbe63b36b082c7073b61b97dced;hpb=2be150527d6ada3cea26eba761c642ce1f056ad4;p=Pman.Core

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 740fb549..0c17a7de 100644
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -251,7 +251,10 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     //   ---------------- authentication / passwords and keys stuff  ----------------
     function isAuth()
     {
-        @session_start();
+        // do not start a session if we are using http auth...
+        if (empty($_SERVER['PHP_AUTH_USER'])) {
+            @session_start();
+        }
        
         $ff= HTML_FlexyFramework::get();
        
@@ -602,6 +605,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function company()
     {
+        if (empty($this->company_id)) {
+            return false;
+        }
         $x = DB_DataObject::factory('core_company');
         $x->autoJoin();
         $x->get($this->company_id);
@@ -1146,9 +1152,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
             
             COALESCE((
                 SELECT
-                    GROUP_CONCAT( 
-                        core_group.name
-                    , '\n')
+                    GROUP_CONCAT(  core_group.name separator  '\n')
                 FROM
                     core_group_member
                 LEFT JOIN
@@ -1162,7 +1166,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function setFromRoo($ar, $roo)
     {
-        $this->setFrom($ar);
+        $this->setFrom($ar); 
         
         if(!empty($ar['_enable_oath_key'])){
             $oath_key = $this->generateOathKey();
@@ -1183,7 +1187,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         // this only applies to our owner company..
         $c = $this->company();
-        if (empty($c->comptype_name) || $c->comptype_name != 'OWNER') {
+        if (empty($c) || empty($c->comptype_name) || $c->comptype_name != 'OWNER') {
             return true;
         }