DataObjects/Core_project.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 34bc7be..064cc35 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -57,7 +57,6 @@ class Pman_Core_Images extends Pman
     
     function get($s) // determin what to serve!!!!
     {
-        print_r('test');exit;
         // for testing only.
         //if (!empty($_GET['_post'])) {
         //   return $this->post();
@@ -222,7 +221,6 @@ class Pman_Core_Images extends Pman
  
     function serve($img)
     {
-        print_f("test??");exit;
         $this->sessionState(0); // turn off session... - locking...
         
         require_once 'File/Convert.php';
@@ -237,7 +235,6 @@ class Pman_Core_Images extends Pman
         if (empty($this->as_mimetype) || $img->mimetype == 'image/gif') {
             $this->as_mimetype  = $img->mimetype;
         }
-        
         if (!$this->thumb) {
             $x->convert( $this->as_mimetype);
             $x->serve($this->method);
@@ -246,16 +243,14 @@ class Pman_Core_Images extends Pman
         //echo "SKALING?  $this->size";
         // acutally if we generated the image, then we do not need to validate the size..
         
-        require_once 'File/MimeType.php';
-        $y = new File_MimeType();
-        $ext = $y->toExt(trim((string) $this->as_mimetype ));
-        
-        print_r($ext);exit;
-        
         // if the mimetype is not converted..
         // then the filename should be original.{size}.jpeg
         $fn = $img->getStoreName() . '.'. $this->size . '.jpeg'; // thumbs are currenly all jpeg.!???
         
+        if($img->mimetype == 'image/gif'){
+            $fn = $img->getStoreName() . '.'. $this->size . '.gif';
+        }
+        
         if (!file_exists($fn)) {
             $fn = $img->getStoreName()  . '.'. $this->size . '.'. $img->fileExt();
             // if it's an image, convert into the same type for thumbnail..
@@ -278,7 +273,8 @@ class Pman_Core_Images extends Pman
     }
     function validateSize()
     {
-        if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER') || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
+        if (($this->authUser && !empty($this->authUser->company_id) && $this->authUser->company()->comptype=='OWNER')
+            || $_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR']) {
             return true;
         }
         
@@ -309,10 +305,15 @@ class Pman_Core_Images extends Pman
         
         require_once $ff->project . '.php';
         
-        $project = new $ff->project();
-        
-        if(isset($project::$Pman_Core_Images_Size)){
-            $sizes = $project::$Pman_Core_Images_Size;
+        $project = str_replace('/', '_', $project);
+         
+        $pr_obj = new $project;
+         
+       // var_dump($pr_obj->Pman_Core_Images_Size);
+        if(isset($pr_obj->Pman_Core_Images_Size)){
+            $sizes = $pr_obj->Pman_Core_Images_Size;
+            
+            
         }
         
         if (!in_array($this->size, $sizes)) {