X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=de8fe6a5062b1d858f249314c98372ac4e830066;hb=a3aee94f26d113c118d2fc75eea8a75fa99d8098;hp=8deafa529bfcc159afbdc69ca4cb789fbf5c7d07;hpb=c3efa61e0b8ab30df1cb8ab53490786d26abeac2;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 8deafa52..de8fe6a5 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -257,14 +257,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         
     }
     
-    function applyPermissionFilters()
+    function applyPermissionFilters($q, $au ,$roo)
     {
-        if (!$au->hasPerm("Admin.Admin_Tab", 'S') &&  !$au->hasPerm("BAdmin.BAdmin", 'S')) {
+        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;
-            
         }
     }
     
@@ -309,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;
@@ -484,14 +483,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;
     }
     
@@ -500,6 +501,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     function writeEventLog($extra_data  = false)
     {
         $logdir = $this->logDir();
+        
         if (!$logdir) {
             return false;
         }
@@ -511,7 +513,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!?
             }
             
         }
@@ -614,7 +617,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     
     function retrieveEventLog()
     {
-        
+
         $logdir = $this->logDir();
         if (!$logdir) {
             return false;