DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Person.php

diff --git a/DataObjects/Person.php b/DataObjects/Person.php
index 840ec60..8b16e61 100644 (file)
--- a/DataObjects/Person.php
+++ b/DataObjects/Person.php
@@ -217,6 +217,9 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
     
     function getEmailFrom()
     {
+        if (empty($this->name)) {
+            return $this->email;
+        }
         return '"' . addslashes($this->name) . '" <' . $this->email . '>';
     }
     function toEventString() 
@@ -284,7 +287,11 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             $group->get('name', 'Administrators');
             
             $member = DB_DataObject::factory('group_members');
+            $member->autoJoin();
             $member->group_id = $group->id;
+            $member->whereAdd("
+                join_user_id_id.id IS NOT NULL
+            ");
             if($member->find(true)){
                 $default_admin = DB_DataObject::factory('Person');
                 if(!$default_admin->get($member->user_id)){
@@ -333,7 +340,6 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
         $n = $u->count();
         $_SESSION[__CLASS__][$sesPrefix .'-empty']  = $n;
         $error =  PEAR::getStaticProperty('DB_DataObject','lastError');
-        print_r($n);exit;
         if ($error) {
             die($error->toString()); // not really a good thing to do...
         }
@@ -789,6 +795,12 @@ class Pman_Core_DataObjects_Person extends DB_DataObject
             
         }
         
+        if(!empty($q['query']['name'])){
+            $this->whereAdd("
+                Person.name LIKE '%{$this->escape($q['query']['name'])}%'
+            ");
+        }
+        
         if (!empty($q['query']['search'])) {
             
             // use our magic search builder...