Images.php

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 6d7b4f6..f02dfc5 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -232,9 +232,10 @@ 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) {
             $x->convert( $this->as_mimetype);
             $x->serve($this->method);
@@ -243,7 +244,9 @@ 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 ));
         
         // if the mimetype is not converted..
         // then the filename should be original.{size}.jpeg
@@ -355,24 +358,18 @@ 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;
             }
             // what about mailto or data... - just ignore?? for images...
-            print_r($baseURL);
-            echo "\n";
-            print_r($attr['src']);
-            exit;
-            $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
-            
             
+            $html = self::replaceImgUrl($html, $baseURL, $img, $attr,  'src' );
             
         }