From 87646f444cbe0b02ed4a0d640a67f5ebc745f912 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 26 Jul 2011 18:31:40 +0200
Subject: [PATCH] Implemented image adapters for GD and ImageMagick (2/2)

Introduced IMAGE_ADAPTER_TYPE to switch between available backends. Additionally inserted a static method isSupported() to ensure library is available, if not fallback to GD.

Usage: wcf\system\image\ImageHandler::getInstance()->getAdapter()
---
 com.woltlab.wcf/options.xml                   | 17 +++++-
 .../lib/system/image/ImageHandler.class.php   | 60 +++++++++++++++++++
 .../image/adapter/GDImageAdapter.class.php    |  7 +++
 .../image/adapter/IImageAdapter.class.php     |  7 +++
 .../image/adapter/ImageAdapter.class.php      |  7 +++
 .../adapter/ImagickImageAdapter.class.php     |  7 +++
 6 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/options.xml b/com.woltlab.wcf/options.xml
index d44d0ade02..090bf9f06b 100644
--- a/com.woltlab.wcf/options.xml
+++ b/com.woltlab.wcf/options.xml
@@ -33,6 +33,9 @@
 				<category name="general.page">
 					<parent>general</parent>
 				</category>
+					<category name="general.image">
+						<parent>general</parent>
+					</category>
 				<category name="general.offline">
 					<parent>general</parent>
 				</category>
@@ -133,6 +136,18 @@
 			</option>
 			<!-- /general.page -->
 			
+			<!-- general.image -->
+			<option name="image_adapter_type">
+				<categoryname>general.image</categoryname>
+				<optiontype>radiobuttons</optiontype>
+				<defaultvalue><![CDATA[gd]]></defaultvalue>
+				<selectoptions>
+					<![CDATA[gd:wcf.acp.option.image_adapter_type.gd
+imagick:wcf.acp.option.image_adapter_type.imagick]]>
+				</selectoptions>
+			</option>
+			<!-- /general.image -->
+			
 			<!-- general.http.cookie -->
 			<option name="cookie_prefix">
 				<categoryname>general.http.cookie</categoryname>
@@ -325,4 +340,4 @@ apc:!cache_source_memcache_host,!cache_source_memcache_use_pconnect,!enable_sess
 			<!-- /general.cache -->
 		</options>
 	</import>
-</data>
\ No newline at end of file
+</data>
diff --git a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
index e69de29bb2..f45998a9f2 100644
--- a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
@@ -0,0 +1,60 @@
+<?php
+namespace wcf\system\image;
+use wcf\system\exception\SystemException;
+use wcf\system\image\adapter\ImageAdapter;
+use wcf\system\SingletonFactory;
+
+/**
+ * Handler for all available image adapters.
+ * 
+ * @author 	Alexander Ebert
+ * @copyright	2001-2011 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.image
+ * @category 	Community Framework
+ */
+class ImageHandler extends SingletonFactory {
+	/**
+	 * list of valid image adapters.
+	 * @var	array<string>
+	 */
+	protected $imageAdapters = array(
+		'gd' => 'wcf\system\image\adapter\GDImageAdapter',
+		'imagick' => 'wcf\system\image\adapter\ImagickImageAdapter'
+	);
+	
+	/**
+	 * image adapter class name
+	 * @var	string
+	 */
+	protected $adapterClassName = '';
+	
+	/**
+	 * @see	wcf\system\SingletonFactory::init()
+	 */
+	protected function init() {
+		if (!isset($this->imageAdapters[IMAGE_ADAPTER_TYPE])) {
+			throw new SystemException("Image adapter referred as '". IMAGE_ADAPTER_TYPE . "' is unknown.");
+		}
+		
+		$imageAdapter = $this->imageAdapters[IMAGE_ADAPTER_TYPE];
+		$isSupported = call_user_func(array($imageAdapter, 'isSupported'));
+		
+		// fallback to GD if image adapter is not available
+		if (!$isSupported) {
+			$imageAdapter = $this->imageAdapters['gd'];
+		}
+		
+		$this->adapterClassName = $imageAdapter;
+	}
+	
+	/**
+	 * Returns a new ImageAdapter instance.
+	 * 
+	 * @return	wcf\system\image\adapter\ImageAdapter;
+	 */	
+	public function getAdapter() {
+		return new ImageAdapter($this->adapterClassName);
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
index 64e077205c..1cb1658526 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
@@ -206,4 +206,11 @@ class GDImageAdapter implements IImageAdapter {
 	public function getImage() {
 		return $this->image;
 	}
+	
+	/**
+	 * @see	wcf\system\image\adapter\IImageAdapter::isSupported()
+	 */	
+	public static function isSupported() {
+		return true;
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
index fcf235a489..9abcfc142c 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/IImageAdapter.class.php
@@ -130,4 +130,11 @@ interface IImageAdapter {
 	 * @return	integer
 	 */
 	public function getHeight();
+	
+	/**
+	 * Determines if an image adapter is supported.
+	 * 
+	 * @return	boolean
+	 */
+	public static function isSupported();
 }
diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
index b2173f6ab8..626d0a785d 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php
@@ -152,4 +152,11 @@ class ImageAdapter implements IImageAdapter {
 	public function getHeight() {
 		return $this->adapter->getHeight();
 	}
+	
+	/**
+	 * @see	wcf\system\image\adapter\IImageAdapter::isSupported()
+	 */
+	public static function isSupported() {
+		return false;
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
index 2398ad349f..d11ad04cd9 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
@@ -163,4 +163,11 @@ class ImagickImageAdapter implements IImageAdapter {
 	public function getWidth() {
 		return $this->width;
 	}
+	
+	/**
+	 * @see	wcf\system\image\adapter\IImageAdapter::isSupported()
+	 */
+	public static function isSupported() {
+		return class_exists('\Imagick', false);
+	}
 }
-- 
2.20.1