Changeset 896

Timestamp:

04/24/08 10:22:17 (9 months ago)

Author:

bastnic

Message:

fixed #559 : parameter on background and #560 for max{width/heght}, p=Kevin Lepeltier

Files:

• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php (modified) (9 diffs)
• branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php (modified) (9 diffs)
• branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php (modified) (9 diffs)
• branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php (modified) (9 diffs)

branches/1.0.x/lib/jelix/CREDITS

@@ -93 +93 @@
-
-Kévin Lepeltier (aka Lipki)
-
+, #559, #560
- - bug fixed in firebug support (#500)
-

branches/1.0.x/lib/jelix/CREDITS

@@ -93 +93 @@
-
-Kévin Lepeltier (aka Lipki)
-
+, #559, #560
- - bug fixed in firebug support (#500)
-

branches/1.0.x/lib/jelix/CREDITS

@@ -93 +93 @@
-
-Kévin Lepeltier (aka Lipki)
-
+, #559, #560
- - bug fixed in firebug support (#500)
-

branches/1.0.x/lib/jelix/CREDITS

@@ -93 +93 @@
-
-Kévin Lepeltier (aka Lipki)
-
+, #559, #560
- - bug fixed in firebug support (#500)
-

branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php

@@ -10 +10 @@
-
-/**
+ * image plugin :  write the url corresponding to the image
+ * 
- * Add a link to the image,
- * The image is resized, and cached
@@ -18 +20 @@
- * width :uint
- * height :uint
+ * maxwidth :uint only with maxheight
+ * maxheight :uint only with maxwidth
- * zoom 1-100
- * omo :boolean
@@ -30 +34 @@
- * sopacity :uint
- * scolor #000000 :string
+ * background #000000 :string
- *
- * gif   -> image/gif
@@ -40 +45 @@
- * png   -> image/png
- * other -> image/png
- */
-
-/**
- * image plugin :  write the url corresponding to the image
- *
- * @param jTpl $tpl template engine
@@ -61 +62 @@
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE') !== false
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE 7') === false) {
-array(255, 255, 255)
+'#ffffff'
-    }
-    
@@ -82 +83 @@
-    // Cache and make changes if necessary.
-    if( is_file($origine_path) && !is_file($cache_path) ) {
-
+maxwidth'=>'', 'maxheight'=>'', '
-        if( count(array_intersect_key($params, $att)) )
-            jtpl_function_html_image_inCache($src, $cachename, $params);
@@ -95 +96 @@
-        $att['src'] = $origine_www;
-        $att['style'] = empty($att['style'])?'':$att['style'];
-
-
+
+
+
+
-    } else
-        $att['src'] = $cache_www;
@@ -131 +134 @@
-        case 'image/x-xpixmap'       : $image = imagecreatefromxpm($origine_www); break;
-        default                      : return ;
+    }
+    
+    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
+        
+        $rapy = imagesy($image)/$array['maxwidth'];
+        $rapx = imagesx($image)/$array['maxheight'];
+        
+        if( $rapy > $rapx ) {
+            $array['height'] = $array['maxheight'];
+            $array['width'] = imagesx($image)/$rapy;
+        } else {
+            $array['width'] = $array['maxwidth'];
+            $array['height'] = imagesy($image)/$rapx;
+        }
-    }
-    
@@ -193 +210 @@
-    // Background
-    if( !empty($array['background']) ) {
+        $array['background'] = str_replace('#', '', $array['background']);
+        $rgb = array(0,0,0);
+        for ($x=0;$x<3;$x++) $rgb[$x] = hexdec(substr($array['background'],(2*$x),2));
-        $fond = imagecreatetruecolor(imagesx($image), imagesy($image));
-255, 255, 255
+$rgb[0], $rgb[1], $rgb[2]
-        imagecopy( $fond, $image, 0, 0, 0, 0, imagesx($image), imagesy($image));
-        $image = $fond;

branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php

@@ -10 +10 @@
-
-/**
+ * image plugin :  write the url corresponding to the image
+ * 
- * Add a link to the image,
- * The image is resized, and cached
@@ -18 +20 @@
- * width :uint
- * height :uint
+ * maxwidth :uint only with maxheight
+ * maxheight :uint only with maxwidth
- * zoom 1-100
- * omo :boolean
@@ -30 +34 @@
- * sopacity :uint
- * scolor #000000 :string
+ * background #000000 :string
- *
- * gif   -> image/gif
@@ -40 +45 @@
- * png   -> image/png
- * other -> image/png
- */
-
-/**
- * image plugin :  write the url corresponding to the image
- *
- * @param jTpl $tpl template engine
@@ -61 +62 @@
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE') !== false
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE 7') === false) {
-array(255, 255, 255)
+'#ffffff'
-    }
-    
@@ -82 +83 @@
-    // Cache and make changes if necessary.
-    if( is_file($origine_path) && !is_file($cache_path) ) {
-
+maxwidth'=>'', 'maxheight'=>'', '
-        if( count(array_intersect_key($params, $att)) )
-            jtpl_function_html_image_inCache($src, $cachename, $params);
@@ -95 +96 @@
-        $att['src'] = $origine_www;
-        $att['style'] = empty($att['style'])?'':$att['style'];
-
-
+
+
+
+
-    } else
-        $att['src'] = $cache_www;
@@ -131 +134 @@
-        case 'image/x-xpixmap'       : $image = imagecreatefromxpm($origine_www); break;
-        default                      : return ;
+    }
+    
+    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
+        
+        $rapy = imagesy($image)/$array['maxwidth'];
+        $rapx = imagesx($image)/$array['maxheight'];
+        
+        if( $rapy > $rapx ) {
+            $array['height'] = $array['maxheight'];
+            $array['width'] = imagesx($image)/$rapy;
+        } else {
+            $array['width'] = $array['maxwidth'];
+            $array['height'] = imagesy($image)/$rapx;
+        }
-    }
-    
@@ -193 +210 @@
-    // Background
-    if( !empty($array['background']) ) {
+        $array['background'] = str_replace('#', '', $array['background']);
+        $rgb = array(0,0,0);
+        for ($x=0;$x<3;$x++) $rgb[$x] = hexdec(substr($array['background'],(2*$x),2));
-        $fond = imagecreatetruecolor(imagesx($image), imagesy($image));
-255, 255, 255
+$rgb[0], $rgb[1], $rgb[2]
-        imagecopy( $fond, $image, 0, 0, 0, 0, imagesx($image), imagesy($image));
-        $image = $fond;

branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php

@@ -10 +10 @@
-
-/**
+ * image plugin :  write the url corresponding to the image
+ * 
- * Add a link to the image,
- * The image is resized, and cached
@@ -18 +20 @@
- * width :uint
- * height :uint
+ * maxwidth :uint only with maxheight
+ * maxheight :uint only with maxwidth
- * zoom 1-100
- * omo :boolean
@@ -30 +34 @@
- * sopacity :uint
- * scolor #000000 :string
+ * background #000000 :string
- *
- * gif   -> image/gif
@@ -40 +45 @@
- * png   -> image/png
- * other -> image/png
- */
-
-/**
- * image plugin :  write the url corresponding to the image
- *
- * @param jTpl $tpl template engine
@@ -61 +62 @@
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE') !== false
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE 7') === false) {
-array(255, 255, 255)
+'#ffffff'
-    }
-    
@@ -82 +83 @@
-    // Cache and make changes if necessary.
-    if( is_file($origine_path) && !is_file($cache_path) ) {
-
+maxwidth'=>'', 'maxheight'=>'', '
-        if( count(array_intersect_key($params, $att)) )
-            jtpl_function_html_image_inCache($src, $cachename, $params);
@@ -95 +96 @@
-        $att['src'] = $origine_www;
-        $att['style'] = empty($att['style'])?'':$att['style'];
-
-
+
+
+
+
-    } else
-        $att['src'] = $cache_www;
@@ -131 +134 @@
-        case 'image/x-xpixmap'       : $image = imagecreatefromxpm($origine_www); break;
-        default                      : return ;
+    }
+    
+    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
+        
+        $rapy = imagesy($image)/$array['maxwidth'];
+        $rapx = imagesx($image)/$array['maxheight'];
+        
+        if( $rapy > $rapx ) {
+            $array['height'] = $array['maxheight'];
+            $array['width'] = imagesx($image)/$rapy;
+        } else {
+            $array['width'] = $array['maxwidth'];
+            $array['height'] = imagesy($image)/$rapx;
+        }
-    }
-    
@@ -193 +210 @@
-    // Background
-    if( !empty($array['background']) ) {
+        $array['background'] = str_replace('#', '', $array['background']);
+        $rgb = array(0,0,0);
+        for ($x=0;$x<3;$x++) $rgb[$x] = hexdec(substr($array['background'],(2*$x),2));
-        $fond = imagecreatetruecolor(imagesx($image), imagesy($image));
-255, 255, 255
+$rgb[0], $rgb[1], $rgb[2]
-        imagecopy( $fond, $image, 0, 0, 0, 0, imagesx($image), imagesy($image));
-        $image = $fond;

branches/1.0.x/lib/jelix/plugins/tpl/html/function.image.php

@@ -10 +10 @@
-
-/**
+ * image plugin :  write the url corresponding to the image
+ * 
- * Add a link to the image,
- * The image is resized, and cached
@@ -18 +20 @@
- * width :uint
- * height :uint
+ * maxwidth :uint only with maxheight
+ * maxheight :uint only with maxwidth
- * zoom 1-100
- * omo :boolean
@@ -30 +34 @@
- * sopacity :uint
- * scolor #000000 :string
+ * background #000000 :string
- *
- * gif   -> image/gif
@@ -40 +45 @@
- * png   -> image/png
- * other -> image/png
- */
-
-/**
- * image plugin :  write the url corresponding to the image
- *
- * @param jTpl $tpl template engine
@@ -61 +62 @@
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE') !== false
-        && strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE 7') === false) {
-array(255, 255, 255)
+'#ffffff'
-    }
-    
@@ -82 +83 @@
-    // Cache and make changes if necessary.
-    if( is_file($origine_path) && !is_file($cache_path) ) {
-
+maxwidth'=>'', 'maxheight'=>'', '
-        if( count(array_intersect_key($params, $att)) )
-            jtpl_function_html_image_inCache($src, $cachename, $params);
@@ -95 +96 @@
-        $att['src'] = $origine_www;
-        $att['style'] = empty($att['style'])?'':$att['style'];
-
-
+
+
+
+
-    } else
-        $att['src'] = $cache_www;
@@ -131 +134 @@
-        case 'image/x-xpixmap'       : $image = imagecreatefromxpm($origine_www); break;
-        default                      : return ;
+    }
+    
+    if(!empty($array['maxwidth']) && !empty($array['maxheight'])) {
+        
+        $rapy = imagesy($image)/$array['maxwidth'];
+        $rapx = imagesx($image)/$array['maxheight'];
+        
+        if( $rapy > $rapx ) {
+            $array['height'] = $array['maxheight'];
+            $array['width'] = imagesx($image)/$rapy;
+        } else {
+            $array['width'] = $array['maxwidth'];
+            $array['height'] = imagesy($image)/$rapx;
+        }
-    }
-    
@@ -193 +210 @@
-    // Background
-    if( !empty($array['background']) ) {
+        $array['background'] = str_replace('#', '', $array['background']);
+        $rgb = array(0,0,0);
+        for ($x=0;$x<3;$x++) $rgb[$x] = hexdec(substr($array['background'],(2*$x),2));
-        $fond = imagecreatetruecolor(imagesx($image), imagesy($image));
-255, 255, 255
+$rgb[0], $rgb[1], $rgb[2]
-        imagecopy( $fond, $image, 0, 0, 0, 0, imagesx($image), imagesy($image));
-        $image = $fond;