X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=bd048ea6300f9df30b4145ddd91144afdc09b9e2;hb=44ea2abaa18195fe3703f5308d83877432472ffb;hp=6fdda46808c992cd23fca2e51c46e4572ec6eeb6;hpb=96c20b7808cc745fce3bf909fef3d6ff0bb02caf;p=Pman.Core diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 6fdda468..bd048ea6 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -2,7 +2,7 @@ /** * Table Definition for Images */ -require_once 'DB/DataObject.php'; +class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php'; class Pman_Core_DataObjects_Images extends DB_DataObject { @@ -106,6 +106,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject { // copy the file into the storage area.. if (!file_exists($file) || !filesize($file)) { + $this->err = "File $file did not exist or is 0 size"; return false; } @@ -129,6 +130,35 @@ class Pman_Core_DataObjects_Images extends DB_DataObject list($this->width , $this->height) = $imgs; } } + print_r($this->mimetype);exit; + if($this->mimetype == 'application/pdf'){ + + require_once 'System.php'; + + $this->no_of_pages = 0; + + $pdfinfo = System::which('pdfinfo'); + + if (!empty($pdfinfo)) { + + $cmd = "{$pdfinfo} {$file}"; + + $ret = `$cmd`; + + $info = explode("\n", $ret); + + foreach ($info as $i){ + + if(!preg_match('/^Pages:[\s]?([0-9]+)/', $i, $matches)){ + continue; + } + print_R($matches);exit; + $ret = (empty($matches[1])) ? false : $matches[1]; + break; + } + } + + } $this->filesize = filesize($file); $this->created = date('Y-m-d H:i:s'); @@ -240,6 +270,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject return false; } if ($tbl->$fld) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $image = DB_DataObject::factory('Images'); $image->get($tbl->$fld); $image->beforeDelete(); @@ -270,11 +302,23 @@ class Pman_Core_DataObjects_Images extends DB_DataObject empty($_FILES['imageUpload']['name']) || empty($_FILES['imageUpload']['type']) ) { - $this->err = "Missing file details"; + + $emap = array( + 0=>"There is no error, the file uploaded with success", + 1=>"The uploaded file exceeds the upload_max_filesize directive in php.ini", + 2=>"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" , + 3=>"The uploaded file was only partially uploaded", + 4=>"No file was uploaded", + 6=>"Missing a temporary folder" + ); + $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]); + $this->err = "Missing file details : Error=". $estr; return false; } if ($this->id) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $this->beforeDelete(); } if ( empty($this->ontable)) { @@ -291,6 +335,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $img->find(); while ($img->fetch()) { + HTML_FlexyFramework::get()->page->jerr("updating images is disabled"); + exit; $img->beforeDelete(); $img->delete(); } @@ -322,8 +368,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext); - print_R($this);exit; + if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) { + $this->err = isset($this->err) ? $this->err : "createFrom Image failed"; return false; } return true; @@ -390,8 +437,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject } - function toRooArray($req = array()) { - // echo '
';print_r($req);exit;
+    function toRooArray($req) {
+        
         $ret= $this->toArray();
       
         static $ff = false;
@@ -403,7 +450,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                     $ff->Pman_Images['public_baseURL'] : $ff->baseURL;
         
         if (!empty($req['query']['imagesize'])) {
-             $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
+            // query/imageBaseURL ... depricated...? -- set it in config?
+            
+            $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : $ret['public_baseURL'];
             
             $ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
             
@@ -612,10 +661,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
 //        print_r(!$this->onUpload($this));
         
         if ( !$this->onUpload($this)) { 
-            $roo->jerr("File upload failed : ". (!empty($this->err) ? $this->err : ''));
+            $roo->jerr("File upload failed : error = ". (!empty($this->err) ? $this->err : ''));
         }
         
-        $roo->addEvent("ADD", $this, $this->toEventString());
+        $this->addEvent($ar, $roo);
         
         $r = DB_DataObject::factory($this->tableName());
         $r->id = $this->id;
@@ -626,6 +675,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -647,6 +701,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         if ($this->id) {
+            HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+            exit;
             $this->beforeDelete();
         }
         
@@ -664,6 +720,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $img->find();
             while ($img->fetch()) {
+                HTML_FlexyFramework::get()->page->jerr("updating images is disabled");
+                exit;
                 $img->beforeDelete();
                 $img->delete();
             }
@@ -742,4 +800,23 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
     }
     
+    function toBase64()
+    {
+        if(!preg_match('/^image\//', $this->mimetype)){
+            return false;
+        }
+        
+        $file = $this->getStoreName();
+        
+        if(!file_exists($file)){
+            return false;
+        }
+        
+        $data = file_get_contents($file);
+        
+        $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
+        
+        return $base64;
+    }
+    
  }