[php-blog-cvs] jBlog jBlog_admin_images.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.27,1.28

[<we...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv7406

Modified Files:
	jBlog_admin_images.inc.php jBlog_functions.inc.php 
Log Message:
Enable support for image manipulation using gd extension, where available.


Index: jBlog_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_images.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_admin_images.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_admin_images.inc.php	6 Mar 2003 21:11:38 -0000	1.2
@@ -46,9 +46,9 @@
         $i = getimagesize($jBlog["jBlogPath"].$jBlog["uploadPath"]."/".$files[$x]);
 
         // Display a thumbnail?
-        if ($jBlog["magick"]===true) {
+        if (file_exists($jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f[0] . "." . $jBlog["thumbSuffix"] . "." . $f[1])) {
         	echo "<td height='".$jBlog["thumbSize"]."' align='center' valign='middle'>";
-			echo "<img src='".$jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
+			echo "<img src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
         	echo "</td>";
         }
 
@@ -58,10 +58,10 @@
         echo $i[0]."x".$i[1]."<br>";
 
         // Display tools
-        echo "<img alt='Fullsize' src='".$jBlog["jBlogHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open(".
+        echo "<img class='jBlogImageButton' alt='Fullsize' src='".$jBlog["jBlogHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open(".
              "'".$jBlog["jBlogHTTPPath"].$jBlog["uploadHTTPPath"].$files[$x]."','Zoom','height=".($i[1]+20).",width=".($i[0]+20)."');\">";
-        echo "<img alt='Rename this image' src='".$jBlog["jBlogHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
-        echo "<img alt='Resize this image' src='".$jBlog["jBlogHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?jBlog[adminModule]=images&jBlog[adminAction]=scaleSelect&jBlog[fname]=".rawurlencode($files[$x])."\";'>";
+        echo "<img class='jBlogImageButton' alt='Rename this image' src='".$jBlog["jBlogHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
+        echo "<img class='jBlogImageButton' alt='Resize this image' src='".$jBlog["jBlogHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?jBlog[adminModule]=images&jBlog[adminAction]=scaleSelect&jBlog[fname]=".rawurlencode($files[$x])."\";'>";
         echo "</td>";
 
         // Linebreak?

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- jBlog_functions.inc.php	6 Mar 2003 20:16:31 -0000	1.27
+++ jBlog_functions.inc.php	6 Mar 2003 21:11:39 -0000	1.28
@@ -802,25 +802,72 @@
     return array($f, $suf);
 }
 
+function jBlog_resize_image_gd($infilename, $outfilename, $newwidth, $newheight)
+{
+	if (!function_exists("imagecopyresampled")) {
+		return false;
+	}
+
+	$inf = pathinfo(strtolower($infilename));
+	switch ($inf['extension']) {
+		case 'gif':
+			$loadfn = "imagecreatefromgif";
+			$savefn = "imagegif";
+			break;
+			
+		case 'jpeg':
+		case 'jpg':
+		case 'jfif':
+			$loadfn = "imagecreatefromjpeg";
+			$savefn = "imagejpeg";
+			break;
+			
+		case 'png':
+			$loadfn = "imagecreatefrompng";
+			$savefn = "imagepng";
+			break;
+			
+		default:
+			return false;
+	}
+
+	if (!function_exists($loadfn) && !function_exists($savefn)) {
+		return false;
+	}
+
+	$in = $loadfn($infilename);
+	$out = imagecreatetruecolor($newwidth, $newheight);
+	imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
+	$savefn($out, $outfilename);
+	$out = null;
+	$in = null;
+	return "OK!";
+}
+
 /**
 * Generate a thumbnail
 **/
 function jBlog_makeThumbnail($file, $size=false) {
 	global $jBlog;
 
-    if ($jBlog["magick"] !== true) return false;
 	if ($size===false) $size = $jBlog["thumbSize"];
 
     // Calculate name of thumbnail
 	$t = jBlog_parseFileName($file);
     $f = $t[0];
     $suf = $t[1];
+   
+	$infile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $file;
+	$outfile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f . "." . $jBlog["thumbSuffix"] . "." . $suf;
+   
+	if ($jBlog["magick"] !== true) {
+		return jBlog_resize_image_gd($infile, $outfile, $size, $size);
+	}
 
 	/*if ($jBlog["dim"] == "height") $newSize = "*x".$jBlog["thumbSize"];
     else $newSize = $jBlog["thumbSize"]."x*"; */
     $newSize = $size."x$size";
-    $cmd = $jBlog["convert"]." ".$jBlog["jBlogPath"].$jBlog["uploadPath"].$file." -sample $newSize -antialias ".
-    	   $jBlog["jBlogPath"].$jBlog["uploadPath"].$f.".".$jBlog["thumbSuffix"].".$suf  2>&1";
+    $cmd = $jBlog["convert"]." ".$infile." -sample $newSize -antialias $outfile  2>&1";
     $res = `$cmd`;
 	return $res;
 }
@@ -831,9 +878,13 @@
 function jBlog_scaleImg($file, $width, $height) {
 	global $jBlog;
 
-    if($jBlog["magick"] !== true) return false;
-	$cmd = $jBlog["convert"]." -scale ".$width."x$height ".$jBlog["jBlogPath"].$jBlog["uploadPath"]."$file ".
-    	   $jBlog["jBlogPath"].$jBlog["uploadPath"]."$file";
+	$infile = $outfile = $jBlog["jBlogPath"] . $jBlog["uploadPath"] . $file;
+
+    if($jBlog["magick"] !== true) {
+		return jBlog_resize_image_gd($infile, $outfile, $width, $height);
+	}
+	
+	$cmd = $jBlog["convert"]." -scale ".$width."x$height $infile $outfile";
     $res = `$cmd`;
     return $res;
 }