$thumb = PhpThumbFactory::create('/path/to/file.png');
+ *
+ * Refer to the documentation for the create function for more information
+ *
+ * @package PhpThumb
+ * @subpackage Core
+ */
+class PhpThumbFactory
+{
+ /**
+ * Which implemenation of the class should be used by default
+ *
+ * Currently, valid options are:
+ * - imagick
+ * - gd
+ *
+ * These are defined in the implementation map variable, inside the create function
+ *
+ * @var string
+ */
+ public static $defaultImplemenation = DEFAULT_THUMBLIB_IMPLEMENTATION;
+ /**
+ * Where the plugins can be loaded from
+ *
+ * Note, it's important that this path is properly defined. It is very likely that you'll
+ * have to change this, as the assumption here is based on a relative path.
+ *
+ * @var string
+ */
+ public static $pluginPath = THUMBLIB_PLUGIN_PATH;
+
+ /**
+ * Factory Function
+ *
+ * This function returns the correct thumbnail object, augmented with any appropriate plugins.
+ * It does so by doing the following:
+ * - Getting an instance of PhpThumb
+ * - Loading plugins
+ * - Validating the default implemenation
+ * - Returning the desired default implementation if possible
+ * - Returning the GD implemenation if the default isn't available
+ * - Throwing an exception if no required libraries are present
+ *
+ * @return GdThumb
+ * @uses PhpThumb
+ * @param string $filename The path and file to load [optional]
+ */
+ public static function create ($filename = null, $options = array(), $isDataStream = false)
+ {
+ // map our implementation to their class names
+ $implementationMap = array
+ (
+ 'imagick' => 'ImagickThumb',
+ 'gd' => 'GdThumb'
+ );
+
+ // grab an instance of PhpThumb
+ $pt = PhpThumb::getInstance();
+ // load the plugins
+ $pt->loadPlugins(self::$pluginPath);
+
+ $toReturn = null;
+ $implementation = self::$defaultImplemenation;
+
+ // attempt to load the default implementation
+ if ($pt->isValidImplementation(self::$defaultImplemenation))
+ {
+ $imp = $implementationMap[self::$defaultImplemenation];
+ $toReturn = new $imp($filename, $options, $isDataStream);
+ }
+ // load the gd implementation if default failed
+ else if ($pt->isValidImplementation('gd'))
+ {
+ $imp = $implementationMap['gd'];
+ $implementation = 'gd';
+ $toReturn = new $imp($filename, $options, $isDataStream);
+ }
+ // throw an exception if we can't load
+ else
+ {
+ throw new Exception('You must have either the GD or iMagick extension loaded to use this library');
+ }
+
+ $registry = $pt->getPluginRegistry($implementation);
+ $toReturn->importPlugins($registry);
+ return $toReturn;
+ }
+}
\ No newline at end of file
Property changes on: branches/2.8.x/wb/admin/media/inc/ThumbLib.inc.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/media/inc/PhpThumb.inc.php
===================================================================
--- branches/2.8.x/wb/admin/media/inc/PhpThumb.inc.php (nonexistent)
+++ branches/2.8.x/wb/admin/media/inc/PhpThumb.inc.php (revision 1797)
@@ -0,0 +1,247 @@
+
+ * Copyright (c) 2009, Ian Selby/Gen X Design
+ *
+ * Author(s): Ian Selby $pt = PhpThumb::getInstance();
+ *
+ * It's that simple! Outside of that, there's no need to modify anything within this class, unless you're doing
+ * some crazy customization... then knock yourself out! :)
+ *
+ * @package PhpThumb
+ * @subpackage Core
+ */
+class PhpThumb
+{
+ /**
+ * Instance of self
+ *
+ * @var object PhpThumb
+ */
+ protected static $_instance;
+ /**
+ * The plugin registry
+ *
+ * This is where all plugins to be loaded are stored. Data about the plugin is
+ * provided, and currently consists of:
+ * - loaded: true/false
+ * - implementation: gd/imagick/both
+ *
+ * @var array
+ */
+ protected $_registry;
+ /**
+ * What implementations are available
+ *
+ * This stores what implementations are available based on the loaded
+ * extensions in PHP, NOT whether or not the class files are present.
+ *
+ * @var array
+ */
+ protected $_implementations;
+
+ /**
+ * Returns an instance of self
+ *
+ * This is the usual singleton function that returns / instantiates the object
+ *
+ * @return PhpThumb
+ */
+ public static function getInstance ()
+ {
+ if(!(self::$_instance instanceof self))
+ {
+ self::$_instance = new self();
+ }
+
+ return self::$_instance;
+ }
+
+ /**
+ * Class constructor
+ *
+ * Initializes all the variables, and does some preliminary validation / checking of stuff
+ *
+ */
+ private function __construct ()
+ {
+ $this->_registry = array();
+ $this->_implementations = array('gd' => false, 'imagick' => false);
+
+ $this->getImplementations();
+ }
+
+ /**
+ * Finds out what implementations are available
+ *
+ * This function loops over $this->_implementations and validates that the required extensions are loaded.
+ *
+ * I had planned on attempting to load them dynamically via dl(), but that would provide more overhead than I
+ * was comfortable with (and would probably fail 99% of the time anyway)
+ *
+ */
+ private function getImplementations ()
+ {
+ foreach($this->_implementations as $extension => $loaded)
+ {
+ if($loaded)
+ {
+ continue;
+ }
+
+ if(extension_loaded($extension))
+ {
+ $this->_implementations[$extension] = true;
+ }
+ }
+ }
+
+ /**
+ * Returns whether or not $implementation is valid (available)
+ *
+ * If 'all' is passed, true is only returned if ALL implementations are available.
+ *
+ * You can also pass 'n/a', which always returns true
+ *
+ * @return bool
+ * @param string $implementation
+ */
+ public function isValidImplementation ($implementation)
+ {
+ if ($implementation == 'n/a')
+ {
+ return true;
+ }
+
+ if ($implementation == 'all')
+ {
+ foreach ($this->_implementations as $imp => $value)
+ {
+ if ($value == false)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ if (array_key_exists($implementation, $this->_implementations))
+ {
+ return $this->_implementations[$implementation];
+ }
+
+ return false;
+ }
+
+ /**
+ * Registers a plugin in the registry
+ *
+ * Adds a plugin to the registry if it isn't already loaded, and if the provided
+ * implementation is valid. Note that you can pass the following special keywords
+ * for implementation:
+ * - all - Requires that all implementations be available
+ * - n/a - Doesn't require any implementation
+ *
+ * When a plugin is added to the registry, it's added as a key on $this->_registry with the value
+ * being an array containing the following keys:
+ * - loaded - whether or not the plugin has been "loaded" into the core class
+ * - implementation - what implementation this plugin is valid for
+ *
+ * @return bool
+ * @param string $pluginName
+ * @param string $implementation
+ */
+ public function registerPlugin ($pluginName, $implementation)
+ {
+ if (!array_key_exists($pluginName, $this->_registry) && $this->isValidImplementation($implementation))
+ {
+ $this->_registry[$pluginName] = array('loaded' => false, 'implementation' => $implementation);
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Loads all the plugins in $pluginPath
+ *
+ * All this function does is include all files inside the $pluginPath directory. The plugins themselves
+ * will not be added to the registry unless you've properly added the code to do so inside your plugin file.
+ *
+ * @param string $pluginPath
+ */
+ public function loadPlugins ($pluginPath)
+ {
+ // strip the trailing slash if present
+ if (substr($pluginPath, strlen($pluginPath) - 1, 1) == '/')
+ {
+ $pluginPath = substr($pluginPath, 0, strlen($pluginPath) - 1);
+ }
+
+ if ($handle = opendir($pluginPath))
+ {
+ while (false !== ($file = readdir($handle)))
+ {
+ if ($file == '.' || $file == '..' || $file == '.svn')
+ {
+ continue;
+ }
+
+ include_once($pluginPath . '/' . $file);
+ }
+ }
+ }
+
+ /**
+ * Returns the plugin registry for the supplied implementation
+ *
+ * @return array
+ * @param string $implementation
+ */
+ public function getPluginRegistry ($implementation)
+ {
+ $returnArray = array();
+
+ foreach ($this->_registry as $plugin => $meta)
+ {
+ if ($meta['implementation'] == 'n/a' || $meta['implementation'] == $implementation)
+ {
+ $returnArray[$plugin] = $meta;
+ }
+ }
+
+ return $returnArray;
+ }
+}
Property changes on: branches/2.8.x/wb/admin/media/inc/PhpThumb.inc.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/media/inc/GdThumb.inc.php
===================================================================
--- branches/2.8.x/wb/admin/media/inc/GdThumb.inc.php (nonexistent)
+++ branches/2.8.x/wb/admin/media/inc/GdThumb.inc.php (revision 1797)
@@ -0,0 +1,1185 @@
+
+ * Copyright (c) 2009, Ian Selby/Gen X Design
+ *
+ * Author(s): Ian Selby |
- |
- {NAME} + {NAME} |
{IMAGEDETAIL} {DATE} Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1796) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1797) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1796'); +if(!defined('REVISION')) define('REVISION', '1797'); if(!defined('SP')) define('SP', ''); |