DataObjects/core.sql

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index ac5ce61..b9fae2a 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -57,10 +57,24 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     function beforeInsert($q, $roo) 
     {
         if (isset($q['_remote_upload'])) {
-            //$fn = $this->remoteUpload($roo, $q['_remote_upload']);
+            require_once 'System.php';
+            $tmpdir  = System::mktemp("-d remote_upload");
             
-            // load the file..
-            $this->createFrom($fn);
+            $path = $tmpdir . '/' . basename($q['_remote_upload']);
+            if(!file_exists($path)){
+               file_put_contents($path, file_get_contents($q['_remote_upload'])); 
+            }
+            
+            $imageInfo = getimagesize($path);
+            require_once 'File/MimeType.php';
+            $y = new File_MimeType();
+            $ext = $y->toExt(trim((string) $imageInfo['mime'] ));
+            
+            if (!preg_match("/\." . $ext."$/", $path, $matches)) {
+                rename($path,$path.$ext);
+            }
+            
+            $this->createFrom($path);
             
             $roo->addEvent("ADD", $this, $this->toEventString());
         
@@ -69,7 +83,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->loadMap($r);
             $r->limit(1);
             $r->find(true);
-            $roo->jok($r->toArray());
+            $roo->jok($r->URL(-1,'/Images') . '#attachment-'.  $r->id);
         }
         
     }
@@ -281,7 +295,15 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         require_once 'File/MimeType.php';
         $y = new File_MimeType();
         $this->mimetype = $_FILES['imageUpload']['type'];
-        if (in_array($this->mimetype, array('text/application', 'application/octet-stream'))) { // weird tyeps..
+        if (in_array($this->mimetype, array(
+                        'text/application',
+                        'application/octet-stream',
+                        'image/x-png',  // WTF does this?
+                        'image/pjpeg',  // WTF does this?
+                        'application/x-apple-msg-attachment', /// apple doing it's magic...
+                        'application/vnd.ms-excel',   /// sometimes windows reports csv as excel???
+                        'application/csv-tab-delimited-table', // windows again!!?
+                ))) { // weird tyeps..
             $inf = pathinfo($_FILES['imageUpload']['name']);
             $this->mimetype  = $y->fromExt($inf['extension']);
         }
@@ -417,6 +439,17 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         //-- max?
         //$size = max(100, (int) $size);
         //$size = min(1024, (int) $size);
+        // the size should 200x150 to convert
+        $sizear = preg_split('/(x|c)/', $size);
+        if(empty($sizear[1])){
+            $sizear[1] = 0;
+        }
+        $size = implode(strpos($size,'c') > -1 ? 'c' : 'x', $sizear);
+//        print_r($size);
+        $fc = $this->toFileConvert();
+//        print_r($size);
+//        exit;
+        $fc->convert($this->mimetype, $size);
         
         
         return $baseURL . $provider . "/$size/{$this->id}/{$this->filename}";