DataObjects/Core_group_right.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 929119e..8ab5357 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..
@@ -338,9 +340,8 @@ class Pman_Core_Images extends Pman
         $baseURL = $ff->Pman_Images['public_baseURL'];
         
         preg_match_all('/<img\s+[^>]+>/i',$html, $result); 
-        
+        //print_r($result);
         $matches = array_unique($result[0]);
-        
         foreach($matches as $img) {
             $imatch = array();
             preg_match_all('/(width|height|src)="([^"]*)"/i',$img, $imatch);
@@ -356,13 +357,12 @@ class Pman_Core_Images extends Pman
             if (empty($attr['src'])) {
                 continue;
             }
-            
             if (0 !== strpos($attr['src'], $baseURL)) {
                 // it starts with our 'new' baseURL?
                 $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;
             }
@@ -370,8 +370,6 @@ class Pman_Core_Images extends Pman
             
             $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
             
-            
-            
         }