Images.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 13ba397..07c9350 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -232,7 +232,7 @@ class Pman_Core_Images extends Pman
         }
 //        print_r($img);exit;
         $x = $img->toFileConvert();
-        if (empty($this->as_mimetype)) {
+        if (empty($this->as_mimetype) || $img->mimetype == 'image/gif') {
             $this->as_mimetype  = $img->mimetype;
         }
         if (!$this->thumb) {
@@ -243,12 +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..
         
-        
-        
         // 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..
@@ -271,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;
         }
         
@@ -302,10 +305,14 @@ class Pman_Core_Images extends Pman
         
         require_once $ff->project . '.php';
         
-        $project = new $ff->project();
+        $project = str_replace('/', '_', $project);
+         
+         var_dump($project::$Pman_Core_Images_Size);
         
         if(isset($project::$Pman_Core_Images_Size)){
             $sizes = $project::$Pman_Core_Images_Size;
+            
+            
         }
         
         if (!in_array($this->size, $sizes)) {
@@ -360,7 +367,7 @@ class Pman_Core_Images extends Pman
                 $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
                 continue;
             }
-            if (false !== strpos($attr['src'], '//')) {
+            if (false !== strpos($attr['src'], '//') && false === strpos($attr['src'], $baseURL)) {
                 // contains an absolute path.. that is probably not us...
                 continue;
             }
@@ -368,8 +375,6 @@ class Pman_Core_Images extends Pman
             
             $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
             
-            
-            
         }