DataObjects/core.sql

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 76a551c..65266fc 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -59,7 +59,7 @@ class Pman_Core_Images extends Pman
         
         $bits= explode('/', $s);
         $id = 0;
-        
+//        var_dump($bits);die('in');
         // without id as first part...
         if (!empty($bits[0]) && $bits[0] == 'Thumb') {
             $this->thumb = true;
@@ -78,6 +78,7 @@ class Pman_Core_Images extends Pman
             $id = empty($bits[3]) ? 0 :   $bits[3];
             
         } else if (!empty($bits[0]) && $bits[0] == 'events') {
+            
             $popts = PEAR::getStaticProperty('Pman','options');
             $ev = DB_DAtaObject::Factory('events');
             if (!$ev->get($bits[1])) {
@@ -86,29 +87,29 @@ class Pman_Core_Images extends Pman
             // 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.
             }
-            $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $this->id . ".json";
+            $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]) {
+                if ($f->tmp_name != $bits[2]) {
                     continue;
                 }
                 
-                $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/').  $f->tmp_name ;
+                $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->mimetype);
+                header ('Content-Type: ' . $f->type);
             
-                header("Content-Disposition: attachment; filename=\"".basename($f->filename)."\";" );
-                ob_clean();
+                header("Content-Disposition: attachment; filename=\"".basename($f->name)."\";" );
+                @ob_clean();
                 flush();
                 readfile($src);
                 exit;
@@ -171,10 +172,12 @@ 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=' .
                 urlencode("image has been removed or deleted."));
+            
         }
         $this->serve($img);
         exit;
@@ -233,14 +236,16 @@ class Pman_Core_Images extends Pman
  
     function serve($img)
     {
+        $this->sessionState(0); // turn off session... - locking...
+        
         require_once 'File/Convert.php';
         if (!file_exists($img->getStoreName())) {
-            //print_r($img);exit;
+//            print_r($img);exit;
             header('Location: ' . $this->rootURL . '/Pman/templates/images/file-broken.png?reason=' .
                 urlencode("Original file was missing : " . $img->getStoreName()));
     
         }
-        
+//        print_r($img);exit;
         $x = $img->toFileConvert();
         if (empty($this->as_mimetype)) {
             $this->as_mimetype  = $img->mimetype;
@@ -283,6 +288,10 @@ class Pman_Core_Images extends Pman
     function validateSize()
     {
         
+        if ($this->authUser && $this->authUser->company_id && $this->authUser->company()->comptype=='OWNER') {
+            return true;
+        }
+        
         // DEFAULT allowed - override with $cfg['sizes'];
         
         $sizes = array(