DataObjects/Core_watch.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 3e40fbc..62f917c 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -55,6 +55,11 @@ class Pman_Core_Images extends Pman
     
     function get($s) // determin what to serve!!!!
     {
+        // for testing only.
+        //if (!empty($_GET['_post'])) {
+        //   return $this->post();
+        //}
+        
         $this->as_mimetype = empty($_REQUEST['as']) ? '' : $_REQUEST['as'];
         
         $bits= explode('/', $s);
@@ -79,42 +84,10 @@ class Pman_Core_Images extends Pman
             
         } else if (!empty($bits[0]) && $bits[0] == 'events') {
             
-            $popts = PEAR::getStaticProperty('Pman','options');
-            $ev = DB_DAtaObject::Factory('events');
-            if (!$ev->get($bits[1])) {
-                die("could not find event id");
-            }
-            // technically same user only.. -- normally www-data..
-            if (function_exists('posix_getpwuid')) {
-                $uinfo = posix_getpwuid( posix_getuid () ); 
-                $user = $uinfo['name'];
-            } else {
-                $user = getenv('USERNAME'); // windows.
-            }
-            $ff = HTML_FlexyFramework::get();
-            $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
-            $filesJ = json_decode(file_get_contents($file));
-         
-            //print_r($filesJ);
-         
-            foreach($filesJ->FILES as $k=>$f){
-                if ($f->tmp_name != $bits[2]) {
-                    continue;
-                }
-                
-                $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
-                if (!file_exists($src)) {
-                    die("file was not saved");
-                }
-                header ('Content-Type: ' . $f->type);
+            $this->downloadEvent($bits);
             
-                header("Content-Disposition: attachment; filename=\"".basename($f->name)."\";" );
-                @ob_clean();
-                flush();
-                readfile($src);
-                exit;
-            }
             die ("unknown file?"); 
+            
         } else {
         
             $id = empty($bits[0]) ? 0 :  $bits[0];
@@ -172,7 +145,7 @@ class Pman_Core_Images extends Pman
         
        
         $img = DB_DataObjecT::factory('Images');
-        
+         
         if (!$id || !$img->get($id)) {
              
             header('Location: ' . $this->rootURL . '/Pman/templates/images/file-broken.png?reason=' .
@@ -186,7 +159,7 @@ class Pman_Core_Images extends Pman
     
     function post()
     {
-        $this->jerr("run");
+        
         if (!$this->authUser) {
             $this->jerr("image conversion only allowed by registered users");
         }
@@ -287,8 +260,7 @@ class Pman_Core_Images extends Pman
     }
     function validateSize()
     {
-        
-        if ($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') {
+        if (($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
             return true;
         }
         
@@ -456,4 +428,43 @@ class Pman_Core_Images extends Pman
          
     }
     
+    function downloadEvent($bits)
+    {
+        $popts = PEAR::getStaticProperty('Pman','options');
+        $ev = DB_DAtaObject::Factory('events');
+        if (!$ev->get($bits[1])) {
+            die("could not find event id");
+        }
+        // technically same user only.. -- normally www-data..
+        if (function_exists('posix_getpwuid')) {
+            $uinfo = posix_getpwuid( posix_getuid () ); 
+            $user = $uinfo['name'];
+        } else {
+            $user = getenv('USERNAME'); // windows.
+        }
+        $ff = HTML_FlexyFramework::get();
+        $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
+        $filesJ = json_decode(file_get_contents($file));
+
+        //print_r($filesJ);
+
+        foreach($filesJ->FILES as $k=>$f){
+            if ($f->tmp_name != $bits[2]) {
+                continue;
+            }
+
+            $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
+            if (!file_exists($src)) {
+                die("file was not saved");
+            }
+            header ('Content-Type: ' . $f->type);
+
+            header("Content-Disposition: attachment; filename=\"".basename($f->name)."\";" );
+            @ob_clean();
+            flush();
+            readfile($src);
+            exit;
+        }
+    }
+    
 }