handle empty companies

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 34d2591..03b9072 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -363,7 +363,8 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['bcc']) && empty($contents['rcpts_group'])) {
             $admin_grp = DB_DAtaObject::Factory('core_group')->load($this->bcc_group_id);
         
         if (!empty($this->bcc_group_id) && $this->bcc_group_id > 0 && empty($contents['bcc']) && empty($contents['rcpts_group'])) {
             $admin_grp = DB_DAtaObject::Factory('core_group')->load($this->bcc_group_id);

-           $admin = $admin_grp->members('email');
+           
+           $admin = $admin_grp ?  $admin_grp->members('email') : false;

             
             if (empty($admin) && $admin_grp->name != 'Empty Group') { // allow 'empty group mname'
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
             
             if (empty($admin) && $admin_grp->name != 'Empty Group') { // allow 'empty group mname'
                 return $p->raiseError("template [{$contents['template']}] - bcc group is empty");

diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php
index 30b72af..5160b4e 100644 (file)
--- a/DataObjects/Core_person.php
+++ b/DataObjects/Core_person.php
@@ -602,6 +602,9 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function company()
     {
     
     function company()
     {

+        if (empty($this->company_id)) {
+            return false;
+        }

         $x = DB_DataObject::factory('core_company');
         $x->autoJoin();
         $x->get($this->company_id);
         $x = DB_DataObject::factory('core_company');
         $x->autoJoin();
         $x->get($this->company_id);


@@ -1160,7 +1163,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
     
     function setFromRoo($ar, $roo)
     {
     
     function setFromRoo($ar, $roo)
     {

-        $this->setFrom($ar);
+        $this->setFrom($ar); 

         
         if(!empty($ar['_enable_oath_key'])){
             $oath_key = $this->generateOathKey();
         
         if(!empty($ar['_enable_oath_key'])){
             $oath_key = $this->generateOathKey();


@@ -1181,7 +1184,7 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject
         }
         // this only applies to our owner company..
         $c = $this->company();
         }
         // 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;
         }
         
             return true;
         }