X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=446c246be5be10f472b82bc8c327d36d95375a78;hb=921e80faa46ea5b70ad2eef7f61be3dae69fdde9;hp=f0bdb2b7900a700c589b6bba282e2c7cabd4b40e;hpb=6910eadd02ac70007ccbd92a76d2acd4c93f1a0d;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index f0bdb2b7..446c246b 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -74,12 +74,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             }
             
             $jt = DB_DataObject::factory($person);
-            $this->whereAdd("
-                    person_table  = '{$jt->tableName()}'
-                    OR
-                    person_table = ''
-                    OR person_table IS NULL"
-            ); // default to  our standard.. - unless otherwise requested..
+            //$this->whereAdd("
+            //        person_table  = '{$jt->tableName()}'
+            //        OR
+            //        person_table = ''
+            //        OR person_table IS NULL"
+            //); // default to  our standard.. - unless otherwise requested..
         }
         
         
@@ -217,6 +217,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!$obj) {
                 $roo->jerr("ontable is invalid");
             }
+            /*
             if (!method_exists($obj,'relatedWhere')) {
                 $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
                            implode(',', get_class_methods($obj)));
@@ -240,7 +241,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     
                 }
                 $this->whereAdd(implode(' OR ' , $w));
-            }
+            }*/
             if ($obj && method_exists($obj,'relatedEventsWhere')) {
                 $a = $obj->relatedEventsWhere($q,$roo);
                 if($a){
@@ -320,6 +321,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
           
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
+        //print_r($au);
+        //exit;
+        //$this->who = $au && !empty($au->name) ? $au->name : '';
         if (empty($au) || (isset($au->id) && empty($au->id))) {
             // not authenticated - and a standard id based object
             $this->person_id = 0;
@@ -330,6 +334,20 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
             $this->{$col} = $au->pid();
             //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
+            
+            $this->who = $au->name;
+            
+            if($au->tableName() == "modx_users"){
+            	$e = PDO_DataObject::factory('ext_data');
+               $e->setFrom(array(            
+                  'userdata_id' => $au->pid(),            
+               ));                  
+               if($e->find(true)){               	
+                   $this->who = $e->getUserName();
+                   print_r($this);
+                   exit;
+               }               
+            }
         }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';