X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=4c4feed813aca2f3db53baf049b61a7866dc06f9;hb=b66a2cb9fd3ac855b09245f03d174c4eb93c20c1;hp=93d7f04efc149abd228a9daacb9210c99a1dce60;hpb=598540090788e2bc4c256c6403e65db6cc01f4a4;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 93d7f04e..4c4feed8 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -304,12 +304,22 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     
     // direct via roo...
     /// ctrl not used??
-    function onUpload($roo)
+    function onUpload($roo, $table = false, $file = false)
     {
+        
+        if ($table !== false) {
+            $this->ontable = $table->tableName();
+            $this->onid = $table->pid();
+        }
+        
+        if ($file === false) {
+            $file = isset($_FILES['imageUpload']) ? $_FILES['imageUpload'] : array();
+        }
+        
         //print_r($_FILES); echo $_FILES['imageUpload']['type'];exit;
-        if (empty($_FILES['imageUpload']['tmp_name']) || 
-            empty($_FILES['imageUpload']['name']) || 
-            empty($_FILES['imageUpload']['type'])
+        if (empty($file['tmp_name']) || 
+            empty($file['name']) || 
+            empty($file['type'])
         ) {
             
             $emap = array( 
@@ -320,7 +330,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 4=>"No file was uploaded",
                 6=>"Missing a temporary folder" 
             ); 
-            $estr = (empty($_FILES['imageUpload']['error']) ? '?': $emap[$_FILES['imageUpload']['error']]);
+            $estr = (empty($file['error']) ? '?': $emap[$file['error']]);
             $this->err = "Missing file details : Error=". $estr;
             return false;
         }
@@ -356,7 +366,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         require_once 'File/MimeType.php';
         $y = new File_MimeType();
-        $this->mimetype = $_FILES['imageUpload']['type'];
+        $this->mimetype = $file['type'];
         if (in_array($this->mimetype, array(
                         'text/application',
                         'application/octet-stream',
@@ -366,7 +376,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                         'application/vnd.ms-excel',   /// sometimes windows reports csv as excel???
                         'application/csv-tab-delimited-table', // windows again!!?
                 ))) { // weird tyeps..
-            $inf = pathinfo($_FILES['imageUpload']['name']);
+            $inf = pathinfo($file['name']);
             $this->mimetype  = $y->fromExt($inf['extension']);
         }
         
@@ -374,11 +384,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $ext = $y->toExt(trim((string) $this->mimetype ));
         
         $this->filename = empty($this->filename) ? 
-            $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext); 
+            $file['name'] : ($this->filename .'.'. $ext); 
         
         
         
-        if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+        if (!$this->createFrom($file['tmp_name'])) {
             $this->err  =  isset($this->err)  ?  $this->err  : "createFrom Image failed";
             return false;
         }
@@ -502,7 +512,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if ($size < 0) {
             $provider = preg_replace('#/Thumb$#', '', $provider);
             
-            return $baseURL . $provider . "/{$this->id}/{$shorten_name}";
+            return $baseURL . $provider . "/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
         }
         //-- max?
         //$size = max(100, (int) $size);
@@ -524,9 +534,32 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $fc->convert($mt, $size);
         
-        return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}";
+        return $baseURL . $provider . "/$size/{$this->id}/{$shorten_name}"; // -- this breaks the rss feed #image-{$this->id}";
+    }
+    
+    function getFromHashURL($url)
+    {
+        $id = false;
+        if (preg_match('/#image-([0-9]+)$/', $url, $matches)) {
+            $id = $matches[1];
+        } else if (preg_match('#Images/Thumb/[^/]+/([0-9]+)/#', $url, $matches)) {
+            $id = $matches[1];
+        } else if (preg_match('#Images/([0-9]+)/#', $url, $matches)) {
+            $id = $matches[1];
+        }
+        
+        if ($id === false ||  $id < 1) {
+            return false;
+        }
+        
+        $img = DB_DAtaObject::Factory('images');
+        if ($img->get($id)) {
+            return $img;
+        }
+        return false;
     }
     
+    
     function shorten_name()
     {
         if(empty($this->filename)) {
@@ -661,11 +694,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->addEvent("ADD", $this, $this->toEventString());
             
             $r = DB_DataObject::factory($this->tableName());
+            
             $r->id = $this->id;
             $roo->loadMap($r);
             $r->limit(1);
             $r->find(true);
-            $roo->jok($r->toArray());
+            $roo->jok($r->toRooArray($ar));
             
             
         }
@@ -680,8 +714,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (!$this->checkPerm($this->id ? 'A' : 'E', $roo->authUser))  {
             $roo->jerr("IMAGE UPLOAD PERMISSION DENIED");
         }
-        
-        
+         
         
         if (!isset($_FILES['imageUpload'])) {
             return; // standard update...
@@ -701,7 +734,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->toRooArray($ar));
          
     }