ADD configuration option to ImageMagick path and make it compatible w…

…ith subfolders install
PowerKiKi · Feb 1, 2011 · fcdbb9a · fcdbb9a
1 parent ba1be3e
commit fcdbb9a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/include/controller/photo.php b/include/controller/photo.php
@@ -775,13 +775,13 @@
 			$lienVignette = $photoManager->getLienPerso($imagePath);
 
 			if ($position=='d') {
-				$htmlImage = "'<a href=\"http://".$_SERVER["SERVER_NAME"]."/".$imagePath."\"><img src=\"http://".$_SERVER["SERVER_NAME"]."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"float:right; margin: 0 0 1em 1em;\" /></a>'";
+				$htmlImage = "'<a href=\"//".$serveur."/".$imagePath."\"><img src=\"//".$serveur."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"float:right; margin: 0 0 1em 1em;\" /></a>'";
 			}elseif ($position=='g') {
-				$htmlImage = "'<a href=\"http://".$_SERVER["SERVER_NAME"]."/".$imagePath."\"><img src=\"http://".$_SERVER["SERVER_NAME"]."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"float:left; margin: 0 1em 1em 0;\" /></a>'";
+				$htmlImage = "'<a href=\"//".$serveur."/".$imagePath."\"><img src=\"//".$serveur."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"float:left; margin: 0 1em 1em 0;\" /></a>'";
 			}elseif ($position=='c') {
-				$htmlImage = "'<a href=\"http://".$_SERVER["SERVER_NAME"]."/".$imagePath."\"><img src=\"http://".$_SERVER["SERVER_NAME"]."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"display:block; margin:0 auto;\" /></a>'";
+				$htmlImage = "'<a href=\"//".$serveur."/".$imagePath."\"><img src=\"//".$serveur."/".$lienVignette."\" alt=\"".$nomOriginal."\" style=\"display:block; margin:0 auto;\" /></a>'";
 			}else{
-				$htmlImage = "'<a href=\"http://".$_SERVER["SERVER_NAME"]."/".$imagePath."\"><img src=\"http://".$_SERVER["SERVER_NAME"]."/".$lienVignette."\" alt=\"".$nomOriginal."\"/></a>'";
+				$htmlImage = "'<a href=\"//".$serveur."/".$imagePath."\"><img src=\"//".$serveur."/".$lienVignette."\" alt=\"".$nomOriginal."\"/></a>'";
 			}
 
 

diff --git a/include/init/config-sample.php b/include/init/config-sample.php
@@ -27,4 +27,7 @@
 
 $theme = ''; // koudou, yop, girafe, menhir, chateau, basic, no
 
+// Path to image magick binary, eg: /usr/local/bin/convert or /usr/bin/convert
+$imageMagickPath = 'convert';
+
 ?>
diff --git a/include/lib/application.php b/include/lib/application.php
@@ -297,12 +297,12 @@ function createThumb($imgpath,$thpath,$new_w=160,$new_h=120,$quality=85){
 	}
 
 function creeVignette($imgpath, $thpath) {
-
+		global $imageMagickPath;
 		$quality=85;
 		$imageInfo = getimagesize($imgpath);
 		$width = $imageInfo[0] * THUMBNAIL_HEIGHT / $imageInfo[1];
 		$height = THUMBNAIL_HEIGHT;
-		$command = "/usr/local/bin/convert -thumbnail ".$width."x".$height." -quality $quality \"$imgpath\" \"$thpath\"";
+		$command = "$imageMagickPath -thumbnail ".$width."x".$height." -quality $quality \"$imgpath\" \"$thpath\"";
 		exec($command);
 	}
 

diff --git a/include/manager/photoManager.php b/include/manager/photoManager.php
@@ -404,7 +404,8 @@ function creeVignette($imagePath,$width=160, $height=120, $quality=85){
  		}
 		$thpath = $this->getLienVignette($imagePath);
 
-		$commande = "/usr/local/bin/convert -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
+		global $imageMagickPath;
+		$commande = "$imageMagickPath -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
 		exec($commande);
 	}
 
@@ -423,7 +424,8 @@ function creeMoyenne($imagePath,$width=640, $height=480, $quality=85){
  		}
 		$thpath = $this->getLienMoyenne($imagePath);
 
-		$commande = "/usr/local/bin/convert -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
+		global $imageMagickPath;
+		$commande = "$imageMagickPath -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
 		exec($commande);
 	}
 
@@ -446,7 +448,9 @@ function creePerso($imagePath,$width=320, $height=240, $quality=85){
 			$width=320;
 			$height=240;
 		}
-		$commande = "/usr/local/bin/convert -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
+
+		global $imageMagickPath;
+		$commande = "$imageMagickPath -thumbnail ".$width."x".$height." -quality ".$quality." \"".$imagePath."\" \"".$thpath."\"";
 		exec($commande);
 	}