EventView.php

[Pman.Admin] / EventView.php

diff --git a/EventView.php b/EventView.php
index f685909..8c636f9 100644 (file)
--- a/EventView.php
+++ b/EventView.php
@@ -18,7 +18,7 @@ class Pman_Admin_EventView extends Pman
         
     }
     
-    function get($id)
+    function get($id, $opts = Array())
     {   
         $ev = DB_DataObject::Factory('Events');
         if (!$ev->get((int)$id)) {
@@ -26,7 +26,7 @@ class Pman_Admin_EventView extends Pman
         }
         
         // verify if not admin, then they should 
-        $g = DB_DataObject::Factory('group_members');
+        $g = DB_DataObject::Factory('core_group_member');
         if (is_a($g, 'DB_DataObject')) {
             $grps = $g->listGroupMembership($this->authUser);
            //var_dump($grps);
@@ -52,26 +52,20 @@ class Pman_Admin_EventView extends Pman
         }
         echo "<HR><H2>Posted Data:</H2>";
         
-        $ff  = HTML_FlexyFramework::get();
-        if (empty($ff->Pman['event_log_dir'])) {
-            echo "not available (Pman[event_log_dir] not configured)";
+        $logdir = DB_DAtaObject::Factory('Events')->logDir();
+        
+        if (!$logdir) {
+            echo "not available (Pman[storedir] not configured)";
             exit;
         }
-        if (function_exists('posix_getpwuid')) {
-            $uinfo = posix_getpwuid( posix_getuid () ); 
-         
-            $user = $uinfo['name'];
-        } else {
-            $user = getenv('USERNAME'); // windows.
-        }
          
-        $file = $ff->Pman['event_log_dir']. "/{$user}" . date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".php"; 
+        $file = $logdir. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".php"; 
         if (file_exists($file)) {
             echo '<PRE>' . htmlspecialchars(file_get_contents($file)). '</PRE>';
             
         } 
           
-        $file = $ff->Pman['event_log_dir']. "/{$user}" . date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; 
+        $file = $logdir. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; 
         if (!file_exists($file)) {
             echo "not available (missing file) $file";
             exit;
@@ -92,7 +86,7 @@ class Pman_Admin_EventView extends Pman
         
         
         foreach($filesJ->FILES as $k=>$f){
-            $ip = $ff->baseURL."/Images/events/". $ev->id . '/'. $f->tmp_name;
+            $ip = $this->baseURL."/Images/events/". $ev->id . '/'. $f->tmp_name;
             echo '<a href="'.$ip.'/download">' . htmlspecialchars( $k . ' - ' . $f->name ) . '</a><br/>';
         }