DataObjects/core.sql

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index 289f43e..fcae94e 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -14,7 +14,7 @@
  *      ontable (req) tablename.
  *      filename
  *      (other table args)
- *      as (serve as a type) = eg. mimetype.
+ *      as (serve as a type) = eg. ?as=audio/mpeg 
  * 
  * args: generic
  *     as :(serve as a type) = eg. mimetype.
@@ -140,6 +140,57 @@ class Pman_Core_Images extends Pman
         $this->serve($img);
         exit;
     }
+    
+    
+    function post()
+    {
+        
+        if (!$this->authUser) {
+            $this->jerr("image conversion only allowed by registered users");
+        }
+        // converts a posted string (eg.svg)
+        // into another type..
+        if (empty($_REQUEST['as'])) {
+           $this->jerr("missing target type");
+        }
+        if (empty($_REQUEST['mimetype'])) {
+            $this->jerr("missing mimetype");
+        }
+        if (empty($_REQUEST['data'])) {
+            $this->jerr("missing data");
+        }
+        
+        
+        $this->as_mimetype = $_REQUEST['as'];
+        $this->mimetype = $_REQUEST['mimetype'];
+        require_once 'File/MimeType.php';
+        $y = new File_MimeType();
+        $src_ext = $y->toExt( $this->mimetype );
+        
+        
+        $tmp = $this->tempName($src_ext);
+        file_put_contents($tmp, $_REQUEST['data']);
+        
+        require_once 'File/Convert.php';
+        $cv = new File_Convert($tmp, $this->mimetype);
+        
+        $fn = $cv->convert(
+                $this->as_mimetype ,
+                empty($_REQUEST['width']) ? 0 : $_REQUEST['width'],
+                empty($_REQUEST['height']) ? 0 : $_REQUEST['height']
+        );
+        if (!empty($_REQUEST['as_data'])) {
+            $this->jok(base64_encode(file_get_contents($fn)));
+        }
+        
+        $cv->serve('attachment');
+        exit;
+        
+        
+        
+    }
+    
+    
  
     function serve($img)
     {
@@ -162,7 +213,14 @@ class Pman_Core_Images extends Pman
         }
         //echo "SKALING?  $this->size";
         // acutally if we generated the image, then we do not need to validate the size..
-        $this->validateSize();
+        
+        // if the mimetype is not converted..
+        // then the filename should be original.{size}.jpeg
+        $fn = $img->getStoreName() . '.'. $this->size . '.jpeg'; // thumbs are currenly all jpeg.!???
+      // var_dump($fn);
+        if (!file_exists($fn)) {
+            $this->validateSize();
+        }
         
         $x->convert( $this->as_mimetype, $this->size);
         $x->serve();
@@ -221,17 +279,18 @@ class Pman_Core_Images extends Pman
      */
     
     
-    static function replaceImgURLS($html)
+    static function replaceImageURLS($html)
     {
         
         $ff = HTML_FlexyFramework::get();
-        if (!isset($ff->Pman_Image['public_baseURL'])) {
+        if (!isset($ff->Pman_Images['public_baseURL'])) {
             return $html;
         }
-        $baseURL = $ff->Pman_Image['public_baseURL'];
+        //var_dump($ff->Pman_Images['public_baseURL']);
+        $baseURL = $ff->Pman_Images['public_baseURL'];
         
-        preg_match_all('/<img\w[^>]+>/i',$html, $result); 
-
+        preg_match_all('/<img\s+[^>]+>/i',$html, $result); 
+        //print_r($result);
         $matches = array_unique($result[0]);
         foreach($matches as $img) {
             $imatch = array();
@@ -249,7 +308,7 @@ class Pman_Core_Images extends Pman
         }
         
         $result = array();
-        preg_match_all('/<a\w[^>]+>/i',$html, $result); 
+        preg_match_all('/<a\s+[^>]+>/i',$html, $result); 
 
         $matches = array_unique($result[0]);
         foreach($matches as $img) {
@@ -277,6 +336,8 @@ class Pman_Core_Images extends Pman
         // Images/{ID}/fullname.xxxx
         // Images/Thumb/200/{ID}/fullname.xxxx
         // Images/Download/{ID}/fullname.xxxx
+        
+        $attr_url = $attr[$attr_name];
         $umatch  = false;
         if(!preg_match('#/(Images|Images/Thumb/[a-z0-9]+|Images/Download)/([0-9]+)/(.*)$#', $attr_url, $umatch))  {
             continue;
@@ -291,9 +352,9 @@ class Pman_Core_Images extends Pman
          
         if (count($type) > 2 && $type[1] == 'Thumb') {
             $thumbsize = $type[2];
-            $provider = 'Images/Thumb';
+            $provider = '/Images/Thumb';
         } else {
-            $provider = $umatch[1];
+            $provider = '/'.$umatch[1];
         }
         
         if (!empty($attr['width']) || !empty($attr['height']) )
@@ -303,7 +364,7 @@ class Pman_Core_Images extends Pman
                 (empty($attr['width']) ? '0' : $attr['width'] * 1) .
                 'x' .
                 (empty($attr['height']) ? '0' : $attr['height'] * 1);
-            
+             $provider = '/Images/Thumb';
             
         }
         
@@ -326,8 +387,8 @@ class Pman_Core_Images extends Pman
         // finally replace the original TAG with the new version..
         
         $new_tag = str_replace(
-            'src="'. $attr['src'] . '"',
-            'src="'. htmlspecialchars($img->URL($thumbsize, $provider, $baseURL)) . '"',
+            $attr_name. '="'. $attr_url . '"',
+            $attr_name .'="'. htmlspecialchars($img->URL($thumbsize, $provider, $baseURL)) . '"',
             $tag
         );