Changeset 1013

Timestamp:

07/11/08 18:38:57 (2 months ago)

Author:

bibo

Message:

#628: preserve aspectratio with maxwidth and maxheight attributes (plugin image)

Files:

• trunk/lib/jelix/plugins/tpl/html/function.image.php (modified) (22 diffs)

trunk/lib/jelix/plugins/tpl/html/function.image.php

@@ -1 +1 @@
-<?php
-/**
-
-
-
-
-
-
+
+
+
+
+
+
+
- */
-
-/**
- * image plugin :  write the url corresponding to the image
- 
+
- * Add a link to the image,
- * The image is resized, and cached
@@ -51 +52 @@
- */
-function jtpl_function_html_image($tpl, $src, $params=array()) {
-
+
-    // Extension
-    if( empty($params['ext']) ) {
@@ -57 +58 @@
-        $ext = strtolower($path_parts['extension']);
-    } else $ext = strtolower($params['ext']);
-
+
-    // White background for IE
-    if (   empty($params['background'])
@@ -64 +65 @@
-        $params['background'] = '#ffffff';
-    }
-
+
-    // Name of the file cache
-    $chaine = $src;
@@ -71 +72 @@
-            $chaine .= $key.$value;
-    $cachename = md5($chaine).'.'.$ext;
-
+
-    // Path
-    $cache_path = JELIX_APP_WWW_PATH.'cache/images/'.$cachename;
-    $origine_path = JELIX_APP_WWW_PATH.$src;
-
+
-    global $gJConfig;
-    $www = 'http'.(empty($_SERVER['HTTPS'])?'':'s').'://'.$_SERVER['HTTP_HOST'].$gJConfig->urlengine['basePath'];
-    $cache_www = $www.'cache/images/'.$cachename;
-    $origine_www = $www.$src;
-
+
-    // Cache and make changes if necessary
-    if( is_file($origine_path) && !is_file($cache_path) ) {
@@ -87 +88 @@
-            jtpl_function_html_image_inCache($src, $cachename, $params);
-    }
-
+
-    // Attributes
-    $att = array('alt'=>'', 'id'=>'', 'class'=>'', 'style'=>'', 'longdesc'=>'', 'name'=>'', 'ismap'=>'', 'usemap'=>'', 'title'=>'', 'dir'=>'', 'lang'=>'', 'onclick'=>'', 'ondblclick'=>'', 'onmousedown'=>'', 'onmouseup'=>'', 'onmouseover'=>'', 'onmousemove'=>'', 'onmouseout'=>'', 'onkeypress'=>'', 'onkeydown'=>'', 'onkeyup'=>'');
-    $att = array_intersect_key($params, $att);
-
+
-    // If the image does not undergo transformation
-    if( !is_file($cache_path) ) {
@@ -102 +103 @@
-    } else
-        $att['src'] = $cache_www;
-
+
-    // Tag image
-    echo '<img';
@@ -109 +110 @@
-            echo ' '.$key.'="'.$val.'"';
-    echo '/>';
-
+
-    }
-
-function jtpl_function_html_image_inCache($src, $cachename, $array) {
-
- 
- 
+
+
+
-                   'xpm'=>'image/x-xpixmap', 'xbm'=>'image/x-xbitmap', 'wbmp'=>'image/vnd.wap.wbmp');
-
+
-    global $gJConfig;
-    $origine_www = 'http'.(empty($_SERVER['HTTPS'])?'':'s').'://'.$_SERVER['HTTP_HOST'].$gJConfig->urlengine['basePath'].$src;
-
+
-    $path_parts = pathinfo($origine_www);
-    $ext = $mimes[strtolower($path_parts['extension'])];
-    $quality = (!empty($array['quality']))?  $array['quality'] : 100;
-
+
-    // Creating an image
-    switch ( $ext ) {
@@ -135 +136 @@
-        default                      : return ;
-    }
-
+
-    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (!empty($array['width']) || !empty($array['height'])) {
-
+
-        $ancienimage = $image;
-        $resampleheight = imagesy($ancienimage);
@@ -157 +169 @@
-        $posx = 0;
-        $posy = 0;
-
+
-        if(empty($array['width'])) {
-            $finalheight = $array['height'];
@@ -175 +187 @@
-            }
-        }
-
+
-        if(!empty($array['zoom'])) {
-            $resampleheight /= 100/$array['zoom'];
-            $resamplewidth /= 100/$array['zoom'];
-        }
-
+
-        $posx = imagesx($ancienimage)/2 -$resamplewidth/2;
-        $posy = imagesy($ancienimage)/2 -$resampleheight/2;
-
+
-        if(!empty($array['alignh'])) {
-            if($array['alignh'] == 'left')            $posx = 0;
@@ -189 +201 @@
-            else if($array['alignh'] != 'center')    $posx = -$array['alignh'];
-        }
-
+
-        if(!empty($array['alignv'])) {
-            if($array['alignv'] == 'top')            $posy = 0;
@@ -195 +207 @@
-            else if($array['alignv'] != 'center')    $posy = -$array['alignv'];
-        }
-
+
-        $image = imagecreatetruecolor($finalwidth, $finalheight);
-        imagesavealpha($image, true);
-        $tp = imagecolorallocatealpha($image,0,0,0,127);
-        imagefill($image,0,0,$tp);
-
+
-        imagecopyresampled($image, $ancienimage, 0, 0, $posx, $posy, imagesx($image), imagesy($image), $resamplewidth, $resampleheight);
-    }
-
+
-    // The shadow cast adds to the dimension of the image chooses
-    if( !empty($array['shadow']) )
-       $image = jtpl_function_html_image_ombre ($image, $array);
-
+
-    // Background
-    if( !empty($array['background']) ) {
@@ -218 +230 @@
-        $image = $fond;
-    }
-
-
+
+
-    $ext = empty($array['ext'])?$ext:$mimes[$array['ext']];
-    $cache_path = JELIX_APP_WWW_PATH.'cache/images/';
-    jFile::createDir($cache_path);
-
-
+
+
-    // Register
-    switch ( $ext ) {
@@ -231 +243 @@
-        default           : imagepng($image, $cache_path.$cachename);
-    }
-
+
-    // Destruction
-    @imagedestroy($image);
@@ -237 +249 @@
-
-function jtpl_function_html_image_ombre ( $image, $array) {
-
+
-    // Default
-    $leng = isset($array['soffset'])?$array['soffset']:10;
@@ -244 +256 @@
-    $opac = isset($array['sopacity'])?$array['sopacity']:20;
-    $color = isset($array['scolor'])?$array['scolor']:'#000000';
-
+
-    // Color of the shadow
-    $color = str_replace('#', '', $color);
@@ -254 +266 @@
-        for ($x=0;$x<3;$x++)
-            $rgb[$x] = hexdec(substr($color,(2*$x),1));
-
+
-    // Gaussian blur parameter
-    $coeffs = array (array ( 1),
- 
+
-                     array ( 1, 2, 1),
-                     array ( 1, 3, 3, 1),
@@ -270 +282 @@
-    $sum = pow (2, $flou);
-    $demi = $flou/2;
-
-
+
+
-    // Horizontal blur and blur margin
-    $temp1 = imagecreatetruecolor(imagesx($image)+$flou, imagesy($image)+$flou);
@@ -277 +289 @@
-    $tp = imagecolorallocatealpha($temp1,0,0,0,127);
-    imagefill($temp1,0,0,$tp);
-
+
-    for ( $i=0 ; $i < imagesx($temp1) ; $i++ )
-    for ( $j=0 ; $j < imagesy($temp1) ; $j++ ) {
@@ -291 +303 @@
-        imagesetpixel($temp1,$i,$j,$c);
-    }
-
+
-    // Vertical blur, a shift of the angle, opacity and color
-
+
-    $x = cos(deg2rad($angle))*$leng;
-    $y = sin(deg2rad($angle))*$leng;
-
+
-    $temp2 = imagecreatetruecolor(imagesx($temp1)+abs($x), imagesy($temp1)+abs($y));
-    imagesavealpha($temp2, true);
-    $tp = imagecolorallocatealpha($temp2,0,0,0,127);
-    imagefill($temp2,0,0,$tp);
-
+
-    $x1 = $x<0?0:$x;
-    $y1 = $y<0?0:$y;
-
+
-    for ( $i=0 ; $i < imagesx($temp1) ; $i++ )
-    for ( $j=0 ; $j < imagesy($temp1) ; $j++ ) {
@@ -319 +331 @@
-    }
-    imagedestroy($temp1);
-
+
-    // Merge of the image and are shade
-    $x = $x>0?0:$x;
-    $y = $y>0?0:$y;
-    imagecopy( $temp2, $image, $demi-$x, $demi-$y, 0, 0, imagesx($image), imagesy($image));
-
+
-    return $temp2;
-