X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=ee2b3fafd7feee2a2f2c7d062ca5de4fe3148b70;hb=d552c93253e7851ca3082523a5122bbdcc44bfb7;hp=7b561b7d50cb0215b587f8e1381aa728358278fd;hpb=0b7522409eb5b230697f211c78aea8d820318471;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 7b561b7d..ee2b3faf 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -35,12 +35,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         if(!empty($q['search']['filename'])){
             $this->whereAdd("
-                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%' OR $tn.title LIKE '%{$this->escape($q['search']['filename'])}%'
             ");
         }
-        echo $this->whereAdd("
-                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%'
-            "); die;
+        
 
     }
     
@@ -757,7 +755,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
-        if(array_pop(explode('.', $this->filename)) != $ext){
+        $explode_filename = explode('.', $this->filename);
+        if(array_pop($explode_filename) != $ext){
             $this->filename = $this->filename .'.'. $ext; 
         }
         
@@ -774,7 +773,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $this->mimetype= strtolower($this->mimetype);
         
-        if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+        $explode_mimetype = explode('/', $this->mimetype);
+        
+        if (array_shift($explode_mimetype) == 'image') { 
         
             $imgs = @getimagesize($data);
             
@@ -815,7 +816,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
     }
     
-    function toBase64()
+    function toBase64($rotate = false, $scaleWidth = 0, $scaleHeight = 0)
     {
         if(!preg_match('/^image\//', $this->mimetype)){
             return false;
@@ -829,6 +830,50 @@ 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);
+//            }
+//            
+//        }
+        
+//        if(!empty($scaleWidth) || !empty($scaleHeight)){
+//            $data = $this->scale($scaleWidth, $scaleHeight);
+//        }
+        
+        if($rotate){
+            $data = $this->rotate($data);
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -864,4 +909,37 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
+    function rotate($imageBlob = false)
+    {
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
+        
+        $orientation = $imagick->getImageOrientation(); 
+        print_R($orientation);exit;
+        switch($orientation) { 
+            case Imagick::ORIENTATION_BOTTOMRIGHT: 
+                $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees 
+            break; 
+
+            case Imagick::ORIENTATION_RIGHTTOP: 
+                $imagick->rotateimage(new ImagickPixel('#00000000'), 90); // rotate 90 degrees CW 
+            break; 
+
+            case Imagick::ORIENTATION_LEFTBOTTOM: 
+                $imagick->rotateimage(new ImagickPixel('#00000000'), -90); // rotate 90 degrees CCW 
+            break; 
+        }
+        
+        return $imagick->getImageBlob();
+    }
+    
+    function scale($width, $height)
+    {
+        
+    }
+    
  }