Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -249,6 +249,7 @@
   is done
 - fix sorting in search result
 - import of users can handle hidden and disabled flag
+- image conversion falls back to gd library if imagick extension is not loaded
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.26

inc/inc.ClassConversionServiceImageToImage.php

@@ -28,15 +28,15 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
 	 */
 	public $timeout;
 
-	public function __construct($from, $to) {
+	public function __construct($from, $to) { /* {{{ */
 		$this->from = $from;
 		$this->to = $to;
 		$this->timeout = 5;
-	}
+	} /* }}} */
 
-	public function getInfo() {
+	public function getInfo() { /* {{{ */
-		return "Convert with imagick php functions";
+		return "Convert with imagick or gd php functions";
-	}
+	} /* }}} */
 
 	public function getAdditionalParams() { /* {{{ */
 		return [
@@ -44,28 +44,68 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
 		];
 	} /* }}} */
 
-	public function convert($infile, $target = null, $params = array()) {
+	/**
+	 * Convert a pixel image into png and scale it
+	 *
+	 * This method uses imagick and if not available falls back to the gd library.
+	 */
+	public function convert($infile, $target = null, $params = array()) { /* {{{ */
 		$start = microtime(true);
-		$imagick = new Imagick();
+		if(extension_loaded('imagick')) {
-		try {
+			$imagick = new Imagick();
-			if($imagick->readImage($infile)) {
+			try {
+				if($imagick->readImage($infile)) {
+					if(!empty($params['width']))
+						$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
+					$end = microtime(true);
+					if($this->logger) {
+						$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with imagick service took '.($end-$start).' sec.', PEAR_LOG_INFO);
+					}
+					if($target) {
+						return $imagick->writeImage($target);
+					} else {
+						return $imagick->getImageBlob();
+					}
+				}
+			} catch (ImagickException $e) {
+				return false;
+			}
+		} elseif(extension_loaded('gd')) {
+			$im = null;
+			switch($this->from) {
+			case 'image/jpeg':
+			case 'image/jpg':
+				$im = @imagecreatefromjpeg($infile);
+				break;
+			case 'image/png':
+				$im = @imagecreatefrompng($infile);
+				break;
+			case 'image/gif':
+				$im = @imagecreatefromgif($infile);
+				break;
+			}
+			if($im) {
+				$size = getimagesize($infile);
 				if(!empty($params['width']))
-					$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
+					$im = imagescale($im, min((int) $params['width'], $size[0]));
 				$end = microtime(true);
 				if($this->logger) {
-					$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with image service took '.($end-$start).' sec.', PEAR_LOG_INFO);
+					$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with gd image service took '.($end-$start).' sec.', PEAR_LOG_INFO);
 				}
 				if($target) {
-					return $imagick->writeImage($target);
+					return imagepng($im, $target);
 				} else {
-					return $imagick->getImageBlob();
+					ob_start();
+					var_dump(imagepng($im));
+					$image = ob_get_clean();
+					return $image;
 				}
+			} else {
+				return false;
 			}
-		} catch (ImagickException $e) {
-			return false;
 		}
 		return false;
-	}
+	} /* }}} */
 }
 
 

inc/inc.ConversionInit.php

@@ -23,13 +23,15 @@ if(!empty($settings->_converters['fulltext'])) {
 
 if(extension_loaded('imagick')) {
 	$conversionmgr->addService(new SeedDMS_ConversionServicePdfToImage('application/pdf', 'image/png'))->setLogger($logger);
+	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/tiff', 'image/png'))->setLogger($logger);
+	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/svg+xml', 'image/png'))->setLogger($logger);
+}
 
+if(extension_loaded('gd') || extension_loaded('imagick')) {
 	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/jpeg', 'image/png'))->setLogger($logger);
 	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/png', 'image/png'))->setLogger($logger);
 	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/jpg', 'image/png'))->setLogger($logger);
 	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/gif', 'image/png'))->setLogger($logger);
-	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/tiff', 'image/png'))->setLogger($logger);
-	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/svg+xml', 'image/png'))->setLogger($logger);
 }
 
 $conversionmgr->addService(new SeedDMS_ConversionServiceTextToText('text/plain', 'text/plain'))->setLogger($logger);

out/out.Search.php

@@ -97,7 +97,7 @@ if($fullsearch) {
 		if (is_numeric($_GET["pg"]) && $_GET["pg"]>0) {
 			$pageNumber = (integer)$_GET["pg"];
 		}
-		else if (!strcasecmp($_GET["pg"], "all")) {
+		elseif (!strcasecmp($_GET["pg"], "all")) {
 			$pageNumber = "all";
 		}
 	}
@@ -218,7 +218,7 @@ if($fullsearch) {
 						$dcount = isset($facets['record_type']['document']) ? $facets['record_type']['document'] : 0 ;
 					}
 				}
-				if($pageNumber != 'all' && $searchresult['count'] > $limit) {
+				if(/* $pageNumber != 'all' && */$searchresult['count'] > $limit) {
 					$totalPages = (int) ($searchresult['count']/$limit);
 					if($searchresult['count']%$limit)
 						$totalPages++;
@@ -564,11 +564,12 @@ if($fullsearch) {
 		}
 	}
 	$totalPages = 1;
-	if ((!isset($_GET['action']) || $_GET['action'] != 'export') && (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))) {
+	if ((!isset($_GET['action']) || $_GET['action'] != 'export') /*&& (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))*/) {
 		$totalPages = (int) (count($entries)/$limit);
 		if(count($entries)%$limit)
 			$totalPages++;
-		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+		if($pageNumber != 'all')
+			$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 	} else
 		$totalPages = 1;
 	$facets = array();

views/bootstrap/class.Search.php

@@ -956,7 +956,7 @@ function typeahead() { /* {{{ */
 			}
 			 */
 			echo $this->infoMsg(getMLText("search_report", array("count"=>$total, "doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime)));
-			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
+			$this->pageList((int) $pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
 			$txt = $this->callHook('searchListHeader', $orderby, 'asc');
@@ -1068,7 +1068,7 @@ function typeahead() { /* {{{ */
 			}
 			print "</tbody></table>\n";
 //			$this->contentContainerEnd();
-			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $_GET);
+			$this->pageList((int) $pageNumber, $totalpages, "../out/out.Search.php", $_GET);
 		} else {
 			$numResults = $totaldocs + $totalfolders;
 			if ($numResults == 0) {