X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=blobdiff_plain;f=EventView.php;h=bf0d1a4305043147216ab614df11b490634d89c0;hp=a194e7fdbda124158598d145c2f2fca47c9c879a;hb=HEAD;hpb=740bf3e59d2f7c92d4806599a6916d80c512e18b

diff --git a/EventView.php b/EventView.php
index a194e7f..bf0d1a4 100644
--- a/EventView.php
+++ b/EventView.php
@@ -14,23 +14,18 @@ class Pman_Admin_EventView extends Pman
             $this->jerrAuth();
         }
         return true;
-        
-        
+         
     }
     
-    function get($id)
-    {
-        $test = json_decode('{"action":"test"}');
-        
-        print_R(JSON_ERROR_NONE);exit;
-        
+    function get($id, $opts = Array())
+    {   
         $ev = DB_DataObject::Factory('Events');
         if (!$ev->get((int)$id)) {
             $this->jerr("invalid id");
         }
         
         // 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);
@@ -47,52 +42,62 @@ class Pman_Admin_EventView extends Pman
         // core_event_audit
         // the event file..
         $d= DB_DataObject::factory('core_event_audit');
-        if (is_a($d,'DB_DataObject')) {
+        $d->event_id = $ev->id; // we can set that as the above returns error or dataobject..
+        if (is_a($d,'DB_DataObject') && $d->count()) {
             echo "<H2>Changed Data:</H2>";
-            $d->event_id = $ev->id;
+            
             foreach($d->fetchAll() as $d) {
                 echo "{$d->name} SET TO: " . htmlspecialchars($d->newvalue) . "<br/>\n";
             }
         }
         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;
         }
+        
         echo '<PRE>' . htmlspecialchars(print_r(json_decode(file_get_contents($file)), true)) . '</PRE>';
         
-        echo '<BR/><PRE>'. htmlspecialchars($ev->remarks) . '</PRE>';
+        if (!empty($ev->remarks)) {
+            echo "<HR><H2>Remarks:</H2>";
+            echo '<PRE>'. htmlspecialchars($ev->remarks) . '</PRE>';
+        }
         
-        $filesJ = json_decode(file_get_contents($file));
-        echo '<br /><PRE>Download files</PRE>';
         
+        $json = json_decode($ev->remarks, JSON_PRETTY_PRINT);
         
-        foreach($filesJ->FILES as $k=>$f){
-            $ip = $ff->baseURL."/Images/events/". $ev->id . '/'. $f->tmp_name;
-            echo '<a href="'.$ip.'/download">' . htmlspecialchars( $k . ' - ' . $f->name ) . '</a><br/>';
+        if(json_last_error() == JSON_ERROR_NONE){
+            echo "<HR><H2>JSON DECODE Data:</H2>";
+            echo '<PRE>' . print_r($json, true) . '</PRE>';
+        }
+        $filesJ = json_decode(file_get_contents($file));
+        if (!empty($filesJ->FILES )) {
+             echo "<HR><H2>Download files:</H2><ul>";
+            
+            
+            foreach($filesJ->FILES as $k=>$f){
+                $ip = $this->baseURL."/Images/events/". $ev->id . '/'. $f->tmp_name;
+                
+                echo '<li><a target="_new" href="'.$ip.'/download">' . htmlspecialchars( $k . ' - ' . $f->name ) . '</a><br/>';
+            }
+            echo "</ul>";
+            
         }
-        
         
         
         exit;