X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=693da01521775c9bdb76190256de24b4966c23a8;hb=a5318fc09ab79ac5dc968b7557f934163a0762d6;hp=cdb37a06cf0b2328069ad3ced26e79b82d778f5f;hpb=ea8ee8e3c20d8e8c821395e2053ae152f93b4433;p=Pman.Core diff --git a/DataObjects/Events.php b/DataObjects/Events.php index cdb37a06..693da015 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -259,7 +259,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject 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)"); @@ -483,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; } @@ -510,6 +512,7 @@ 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!? }