X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FImages.php;h=5478f16adb78ef3869c5741f85146105573f2b48;hp=5576072914ea02c5dbc0e89ef5787277a388b861;hb=967904efd6ed4fbaa3c16c0872b9248e632b3108;hpb=bf91e41fbad83cbe12470ca712c2d6d7940ae5dd

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 55760729..5478f16a 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -470,10 +470,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             if (!empty($req['query']['imagesize'])) {
                 $ret['url_thumb'] = $this->URL($req['query']['imagesize'], '/Images/Thumb',$baseURL);
             }
+            
+            $ret['shorten_name'] = $this->shorten_name();
         }
         
-         
-         
         return $ret;
     }
     
@@ -488,9 +488,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     {
         if (!$this->id) {
             return 'about:blank';
-            
         }
-
+        
+        $shorten_name = $this->shorten_name();
+        
         $ff = HTML_FlexyFramework::get();
         $baseURL = $baseURL ? $baseURL : $ff->baseURL ;
         if (preg_match('#^http[s]*://#', $provider)) {
@@ -500,7 +501,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if ($size < 0) {
             $provider = preg_replace('#/Thumb$#', '', $provider);
             
-            return $baseURL . $provider . "/{$this->id}/{$this->filename}";
+            return $baseURL . $provider . "/{$this->id}/{$shorten_name}";
         }
         //-- max?
         //$size = max(100, (int) $size);
@@ -522,7 +523,26 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $fc->convert($mt, $size);
         
-        return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";
+        return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}";
+    }
+    
+    function shorten_name()
+    {
+        if(empty($this->filename)) {
+            return;
+        }
+        
+        $filename = explode('.', $this->filename);
+        $ext = array_pop($filename);
+        $name = preg_replace("/[^A-Za-z0-9.]+/", '-', implode('-', $filename)) ;
+        
+        if(strlen($name) > 32) {
+            $name = substr($name, 0, 32);
+        }
+        
+        $shorten_name = "{$name}.{$ext}";
+        
+        return $shorten_name;
     }
     /**
      * size could be 123x345
@@ -831,44 +851,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $data = file_get_contents($file);
         
         if(!empty($scaleWidth) || !empty($scaleHeight)){
-            
-            $width = $this->width;
-            $height = $this->height;
-            
-            if(!empty($scaleWidth)){
-                $width = $scaleWidth;
-
-                if(empty($scaleHeight)){
-                    $height = $this->height * $scaleWidth / $this->width;
-                }
-            }
-            
-            
-
-            if(!empty($scaleHeight)){
-                $height = $scaleHeight;
-
-                if(empty($scaleWidth)){
-                    $width = $this->width * $scaleHeight / $this->height;
-                }
-            }
-            
-            $im = imagecreatefromstring($data);
-            
-            if (($scaled = imagescale($im, $width, $height)) != false) {
-                ob_start();
-                imagejpeg($scaled);
-                $data = ob_get_contents();
-                ob_end_clean();
-                imagedestroy($im);
-                imagedestroy($scaled);
-            }
-            
+            $data = $this->scale(false, $scaleWidth, $scaleHeight);
         }
         
-//        if($rotate){
-//            $data = $this->rotate($data);
-//        }
+        if($rotate){
+            $data = $this->rotate($data);
+        }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
@@ -915,7 +903,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         $orientation = $imagick->getImageOrientation(); 
-
+        
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees 
@@ -933,4 +921,19 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $imagick->getImageBlob();
     }
     
+    function scale($imageBlob = false, $width = 0, $height = 0)
+    {
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
+        
+        $imagick->resizeimage($width, $height, Imagick::FILTER_LANCZOS, true, true);
+        
+        return $imagick->getImageBlob();
+        
+    }
+    
  }