X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=87f188944a3e9406752c24578f127f686b15b7dd;hb=2f05e281e57df70ead5aac9084df0dce8b3e3a4c;hp=a5b9b34af031cd17dfae01621ce892b4303d5ee8;hpb=076162183e89080ccfec643a12aaba8b2ce12ee7;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index a5b9b34a..87f18894 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -29,6 +29,18 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+    function applyFilters($q, $au, $roo)
+    {
+        $tn = $this->tableName();
+        
+        if(!empty($q['search']['filename'])){
+            $this->whereAdd("
+                $tn.filename LIKE '%{$this->escape($q['search']['filename'])}%' OR $tn.title LIKE '%{$this->escape($q['search']['filename'])}%'
+            ");
+        }
+        
+
+    }
     
     function checkPerm($lvl, $au)
     {
@@ -118,9 +130,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $this->mimetype = $y->fromFilename($filename);
         }
         
-        $this->mimetype= strtolower($this->mimetype);
+        $this->mimetype = strtolower($this->mimetype);
         
-        if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+        $mta = explode('/', $this->mimetype);
+        if (array_shift($mta) == 'image') { 
         
             $imgs = @getimagesize($file);
             
@@ -131,6 +144,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             }
         }
         
+        if($this->mimetype == 'application/pdf'){
+            $this->no_of_pages = $this->getPdfPages($file);
+        }
+        
         $this->filesize = filesize($file);
         $this->created = date('Y-m-d H:i:s');
          
@@ -192,21 +209,42 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      * 
      * 
      */
-    function beforeDelete()
+    function beforeDelete($dependants_array, $roo)
     {
+        
+        $opts = HTML_FlexyFramework::get()->Pman;
+        $deldir = $opts['storedir']. '/_deleted_images_';
+        if (!file_exists( $deldir )) {
+            mkdir($deldir, 0755);
+        }
+            
         $fn = $this->getStoreName();
+        $b = basename($fn);
         if (file_exists($fn)) {
-            unlink($fn);
+            
+            if (file_exists($deldir . '/'. $b)) {
+                unlink($fn);
+            } else {
+                rename($fn, $deldir .'/'. $b);
+            }
+            
+            
         }
         // delete thumbs..
-        $b = basename($fn);
+        
         $d = dirname($fn);
         if (file_exists($d)) {
                 
             $dh = opendir($d);
             while (false !== ($fn = readdir($dh))) {
                 if (substr($fn, 0, strlen($b)) == $b) {
-                    unlink($d. '/'. $fn);
+                    
+                    if (file_exists($deldir . '/'. $fn)) {
+                        unlink($d. '/'. $fn);
+                        continue;
+                    }
+                    rename($d. '/'. $fn, $deldir .'/'. $fn);
+                    
                 }
             }
         }
@@ -635,11 +673,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->jerr("File upload failed : error = ". (!empty($this->err) ? $this->err : ''));
         }
         
-        $roo->addEvent("ADD", $this, $this->toEventString());
-        
-        if(method_exists($this, 'addExtraLog')){
-            $this->addExtraLog($ar, $roo);
-        }
+        $this->addEvent($ar, $roo);
         
         $r = DB_DataObject::factory($this->tableName());
         $r->id = $this->id;
@@ -650,6 +684,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -716,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; 
         }
         
@@ -733,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);
             
@@ -764,6 +806,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $this->filesize = filesize($f);
         
+        if($this->mimetype == 'application/pdf'){
+            $this->no_of_pages = $this->getPdfPages($f);
+        }
+        
         $this->update($o);
         
         return true;
@@ -789,4 +835,58 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $base64;
     }
     
+    function getPdfPages($file)
+    {
+        require_once 'System.php';
+        
+        $page = 0;
+
+        $pdfinfo = System::which('pdfinfo');
+
+        if (!file_exists($file) || empty($pdfinfo)) {
+            return $page;
+        }
+        
+        $cmd = "{$pdfinfo} {$file}";
+
+        $ret = `$cmd`;
+
+        $info = explode("\n", $ret);
+
+        foreach ($info as $i){
+
+            if(!preg_match('/^Pages:[\s]*([0-9]+)/', $i, $matches)){
+                continue;
+            }
+            
+            $page = (empty($matches[1])) ? 0 : $matches[1];
+        }
+        
+        return $page;
+    }
+    
+    function rotate($blob)
+    {
+        $imagick = new Imagick();
+        $imagick->readImageBlob($blob);
+        
+        $orientation = $imagick->getImageOrientation(); 
+
+        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();
+    }
+    
  }