X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=e8682ac8f2cadde618b6512710cb4b1c744fc85e;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hp=084fd977d6dd495fb9f2201c496e21e872e93c29;hpb=43829c62f3bd46d0fc55bab57617768331385310;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 084fd977..e8682ac8 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -257,28 +257,6 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
-    function autojoin($cfg = array()){
-        /*$mt = DB_DataObject::factory('member_types');
-        $m->joinAdd($mt, 'LEFT');
-        
-        $t->joinAdd($m, 'LEFT');
-        $t->selectAs($m,'member_%s');
-        
-        $e = DB_DataObject::factory('Events');
-        
-        $cp = DB_DataObject::factory('core_person');
-        $e->joinAdd($cp, 'LEFT');
-        $t->joinAdd($e, 'LEFT');
-        
-        $t->selectAdd("member_types.charge_code as member_type_charge_code ");
-        $t->selectAdd("Events.action as evType, Events.event_when as eventWhen");
-        $t->selectAdd("core_person.name as personName");*/
-
-        $ret = parent::autoJoin($cfg);
-        return $ret;
-        
-    }
-    
     function applyPermissionFilters($q, $au ,$roo)
     {
         if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
@@ -369,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);
     }
     
@@ -535,8 +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))) {
-                print_r($this);
-                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!?
             }
             
         }
@@ -569,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'],
@@ -586,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));