X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;h=e8682ac8f2cadde618b6512710cb4b1c744fc85e;hp=213e22408f431cbb20bc2d1ff5045bd5d08c0d66;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=c78c59cea885484cb8e313fc7663fc18e4d81e6b

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 213e2240..e8682ac8 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -107,13 +107,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
         */
         
-        if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
-            //DB_DataObject::DebugLevel(1);
-            // they can only view their changes..
-            $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
-//            $this->person_id = $au->id;
-            
-        }
         // _join = tablename,tablename...
         
         /// on_table=cohead
@@ -217,9 +210,9 @@ 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 :" .
+                $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere  or relatedEventsWhere:" .
                            implode(',', get_class_methods($obj)));
             }
             if ($obj && method_exists($obj,'relatedWhere')) {
@@ -241,18 +234,12 @@ 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){
-                    $this->whereAdd($a);
-                }
             }
             
-            
-            
+         
             
         }
+        
         // since roo does not support autojoin yet..
         if (!isset($q['_distinct'])) {
             //$this->autoJoinExtra();
@@ -269,8 +256,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
         
     }
-      
     
+    function applyPermissionFilters($q, $au ,$roo)
+    {
+        if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
+            //DB_DataObject::DebugLevel(1);
+            // they can only view their changes..
+            $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
+//            $this->person_id = $au->id;
+        }
+    }
     
     /**
      * check who is trying to access this. false == access denied..
@@ -313,13 +308,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $ff = HTML_FlexyFramework::get();
         $pg = $ff->page;
         $au = $pg->getAuthUser();
-        
+
         if ($ff->cli) { // && empty($au) && isset($obj->person_id)) {
             $au = false;
            // $au = DB_DataObject::Factory('Person'); // not always a person..
            // $au->get($obj->person_id);
         } 
-          
+
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
         //print_r($au);
         //exit;
@@ -333,20 +328,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $cols = $this->tableColumns();
             $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;
-            print_r($au->tableName());
-            exit;
-            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();
-               }               
-            }
+            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;            
         }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
@@ -365,7 +347,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 $rem[] = $obj->toEventString();
             }
         }
-        $rem[] = $remarks;
+        
+        if(!empty($remarks)){
+            $rem[] = $remarks;
+        }
+        
         $this->remarks = implode(' : ', $rem);
     }
     
@@ -443,7 +429,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
             }
-        }
+        }        
     }
     
     function beforeUpdate($old, $request,$roo)
@@ -501,14 +487,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $user = getenv('USERNAME'); // windows.
         }
         
-        // DEPRICATED...
+        
+   
+        if (!empty($ff->Pman['storedir'])) {
+            return $ff->Pman['storedir'] .'/Events/'.$user;
+        }
+        // DEPRICATED... 
         if (!empty($ff->Pman['event_log_dir'])) {
             return $ff->Pman['event_log_dir'] . '/'.$user;
         }
-        if (!empty($ff->Pman['storedir'])) {
-            return $ff->Pman['storedir'] .'/Events/'.$user;
         
-        }
         return false;
     }
     
@@ -517,6 +505,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     function writeEventLog($extra_data  = false)
     {
         $logdir = $this->logDir();
+        
         if (!$logdir) {
             return false;
         }
@@ -528,7 +517,8 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             
             @mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
             if (!file_exists(dirname($file))) {
-                die("could not create $file - permissons are not correct"); // fatal, otherwise we loop!?
+                //print_r($this);
+                die("Events:: writeEventLog: could not create $file - permissons are not correct\n"); // fatal, otherwise we loop!?
             }
             
         }
@@ -561,6 +551,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                 print_r("failed to copy {$f['tmp_name']}...\n");
             }
         }
+        
+        
+        
         $out = array(
             'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'],
             'HTTP_USER_AGENT' => empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'],
@@ -578,6 +571,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if ( self::$extra_data !== false) {
             $out['EXTRA_DATA'] =  self::$extra_data;
         }
+        $total_data = 0;
+        foreach($out as $k=>$v) {
+            if (!empty($v) && $k != 'REQUEST_URI') {
+                $total_data++;
+            }
+        }
+        if (!$total_data) {
+            return; // do not write an empty file with no usefull info.
+        }
+        
         
         file_put_contents($file, json_encode($out));
         
@@ -631,7 +634,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function retrieveEventLog()
     {
-        
+
         $logdir = $this->logDir();
         if (!$logdir) {
             return false;
@@ -726,4 +729,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         $this->selectAdd('join_person_id_id.email as email');
         
     }
+    
+    
 }