Changeset 10684 for trunk/admin/include

Timestamp:

Apr 29, 2011, 7:10:00 PM (13 years ago)

Author:

patdenice

Message:

feature:2284
Rename $confimage_library into $confgraphics_library
Display library used in admin intro page.

File:

• trunk/admin/include/image.class.php (modified) (4 diffs)

trunk/admin/include/image.class.php

@@ -58 +58 @@
   function __construct($source_filepath, $library=null)
   {
-    global $conf;
-
     $this->source_filepath = $source_filepath;
 
@@ -76 +74 @@
     }
 
-    if (is_null($library))
-    {
-      $library = $conf['image_library'];
-    }
-
-    // Choose image library
-    switch (strtolower($library))
-    {
-      case 'auto':
-      case 'imagick':
-        if ($extension != 'gif' and self::is_imagick())
-        {
-          $this->library = 'imagick';
-          break;
-        }
-      case 'ext_imagick':
-        if ($extension != 'gif' and self::is_ext_imagick())
-        {
-          $this->library = 'ext_imagick';
-          break;
-        }
-      case 'gd':
-        if (self::is_gd())
-        {
-          $this->library = 'gd';
-          break;
-        }
-      default:
-        if ($library != 'auto')
-        {
-          // Requested library not available. Try another library
-          return self::__construct($source_filepath, 'auto');
-        }
-        die('No image library available on your server.');
+    if (!($this->library = self::get_library($library, $extension)))
+    {
+      die('No image library available on your server.');
     }
 
@@ -305 +272 @@
       return false;
     }
-    @exec($conf['ext_imagick_dir'].'convert', $returnarray, $returnvalue);
+    @exec($conf['ext_imagick_dir'].'convert -version', $returnarray, $returnvalue);
     if (!$returnvalue and !empty($returnarray[0]) and preg_match('/ImageMagick/i', $returnarray[0]))
     {
@@ -316 +283 @@
   {
     return function_exists('gd_info');
+  }
+
+  static function get_library($library=null, $extension=null)
+  {
+    global $conf;
+
+    if (is_null($library))
+    {
+      $library = $conf['image_library'];
+    }
+
+    // Choose image library
+    switch (strtolower($library))
+    {
+      case 'auto':
+      case 'imagick':
+        if ($extension != 'gif' and self::is_imagick())
+        {
+          return 'imagick';
+        }
+      case 'ext_imagick':
+        if ($extension != 'gif' and self::is_ext_imagick())
+        {
+          return 'ext_imagick';
+        }
+      case 'gd':
+        if (self::is_gd())
+        {
+          return 'gd';
+        }
+      default:
+        if ($library != 'auto')
+        {
+          // Requested library not available. Try another library
+          return self::get_library('auto');
+        }
+    }
+    return false;
   }