gdlib fixes

conlite/includes/functions.api.images.php

@@ -149,25 +149,23 @@ function capiImgScaleLQ($img, $maxX, $maxY, $crop = false, $expand = false, $cac
         }
     }
 
-    /* Get out which file we have */
+    $imageHandle = null;
+
     switch (strtolower($filetype)) {
-        case ".gif": $function = "imagecreatefromgif";
+        case ".gif":
+            $imageHandle = imagecreatefromgif($filename);
             break;
-        case ".png": $function = "imagecreatefrompng";
+        case ".png":
+            $imageHandle = imagecreatefrompng($filename);
             break;
-        case ".jpg": $function = "imagecreatefromjpeg";
+        case ".jpeg":
-            break;
+        case "jpg":
-        case "jpeg": $function = "imagecreatefromjpeg";
+            $imageHandle = imagecreatefromjpeg($filename);
             break;
         default: return false;
     }
 
-    if (function_exists($function)) {
+    if((gettype($imageHandle) == "object" && get_class($imageHandle) == "GdImage") !== true) {
-        $imageHandle = @$function($filename);
-    }
-
-    /* If we can't open the image, return false */
-    if (!$imageHandle) {
         return false;
     }
 
@@ -696,7 +694,7 @@ function checkImageEditingPosibility() {
             if (function_exists('gd_info')) {
                 $arrGDInformations = gd_info();
 
-                if (preg_match('#([0-9\.])+#', $arrGDInformations['GD Version'], $strGDVersion)) {
+                if (preg_match('#([0-9.])+#', $arrGDInformations['GD Version'], $strGDVersion)) {
                     if ($strGDVersion[0] >= '2') {
                         return '2';
                     }
@@ -708,6 +706,4 @@ function checkImageEditingPosibility() {
         }
         return '0';
     }
-}
+}
-
-?>