Fix #5700 - Order Follow up Table

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 65a6537..68cc362 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -2,6 +2,9 @@
 /**
  * Deal with image delivery and HTML replacement of image links in body text.
  *
+ *
+ * NOTE THIS WAS NEVER INTENDED FOR PUBLIC IMAGE DISTRIBUTION - we need to create a seperate file for that...
+ *
  * $str = Pman_Core_Images::replaceImg($str); // < use with HTML
  *
  * or
@@ -38,8 +41,21 @@ require_once  'Pman.php';
 class Pman_Core_Images extends Pman
 {
     
-    var $public_image_table = array();
+    // tables that do not need authentication checks before serving.
+    var $public_image_tables = array();
     
+    var  $sizes = array(
+                '100', 
+                '100x100', 
+                '150', 
+                '150x150', 
+                '200', 
+                '200x0',
+                '200x200',  
+                '400x0',
+                '300x100',
+                '500'
+            );
     function getAuth()
     {
         parent::getAuth(); // load company!
@@ -58,6 +74,7 @@ class Pman_Core_Images extends Pman
     var $thumb = false;
     var $as_mimetype = false;
     var $method = 'inline';
+    var $page = false;
     
     function get($s, $opts=array()) // determin what to serve!!!!
     {
@@ -68,6 +85,8 @@ class Pman_Core_Images extends Pman
         
         $this->as_mimetype = empty($_REQUEST['as']) ? '' : $_REQUEST['as'];
         
+        $this->page = empty($_REQUEST['page']) ? false : (int) $_REQUEST['page'];
+        
         $bits= explode('/', $s);
         $id = 0;
 //        var_dump($bits);die('in');
@@ -157,12 +176,10 @@ class Pman_Core_Images extends Pman
             
         }
         
-        
-       
         $img = DB_DataObjecT::factory('Images');
          
         if (!$id || !$img->get($id)) {
-             $this->imgErr("image has been removed or deleted.",$s);
+            $this->imgErr("image has been removed or deleted.",$s);
         }
         
         if (!$this->authUser && !in_array($img->ontable,$this->public_image_tables)) {
@@ -177,15 +194,13 @@ class Pman_Core_Images extends Pman
             if ($comp->comptype != 'OWNER') {
                 $this->imgErr("not-owner-company",$s);
             }
+            
             return $this->serve($img);
-        
             
         }
         
-        
         if(!$this->hasPermission($img)){
             $this->imgErr("access to this image/file has been denied.",$s);
-            
         }
         
         $this->serve($img);
@@ -297,7 +312,12 @@ class Pman_Core_Images extends Pman
             $this->validateSize();
         }
         
-        $x->convert( $this->as_mimetype, $this->size);
+        if(!empty($this->page) && !is_nan($this->page * 1)){
+            $x->convert( $this->as_mimetype, $this->size, 0, $this->page);
+        } else {
+            $x->convert( $this->as_mimetype, $this->size);
+        }
+        
         $x->serve();
         exit;
         
@@ -315,18 +335,7 @@ class Pman_Core_Images extends Pman
         
         $ff = HTML_FlexyFramework::get();
         
-        $sizes = array(
-                '100', 
-                '100x100', 
-                '150', 
-                '150x150', 
-                '200', 
-                '200x0',
-                '200x200',  
-                '400x0',
-                '300x100',
-                '500'
-            );
+        $sizes= $this->sizes;
         
         $cfg = isset($ff->Pman_Images) ? $ff->Pman_Images :
                 (isset($ff->Pman_Core_Images) ? $ff->Pman_Core_Images : array());
@@ -452,7 +461,8 @@ class Pman_Core_Images extends Pman
         $id = $umatch[2];
         $hash = '';
         if (!empty($umatch[3]) && strpos($umatch[3],'#')) {
-            $hash = '#'. array_pop(explode('#',$umatch[3]));
+            $hh = explode('#',$umatch[3]);
+            $hash = '#'. array_pop($hh);
         }
         
         
@@ -512,7 +522,6 @@ 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");
@@ -525,18 +534,23 @@ class Pman_Core_Images extends Pman
             $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";
+        
+        $file = $ev->logDir() . date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json";
+        
+        if(!$file || !file_exists($file)){
+            die("file was not saved");
+        }
+        
         $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)) {
+            $src = $file = $ev->logDir() . date('/Y/m/d/', strtotime($ev->event_when)).  $f->tmp_name ;
+            
+            if (!$src || !file_exists($src)) {
                 die("file was not saved");
             }
             header ('Content-Type: ' . $f->type);