Changeset 2651

Timestamp:

06/30/08 02:26:07 (20 months ago)

Author:

takayama

Message:

Fixed BugId:80372
* Shows warning messages if GD-php was not available.

Location:

branches/release-41/php

Files:

• lib/MTUtil.php (modified) (2 diffs)
• lib/function.mtassetthumbnaillink.php (modified) (1 diff)
• lib/function.mtauthoruserpic.php (modified) (1 diff)
• lib/function.mtcommenteruserpic.php (modified) (1 diff)
• lib/function.mtentryauthoruserpic.php (modified) (1 diff)
• lib/thumbnail_lib.php (modified) (2 diffs)
• mt.php.pre (modified) (4 diffs)

branches/release-41/php/lib/MTUtil.php

@@ -1301 +1301 @@
     $dest;
     $thumb_name = $static_file_path.DIRECTORY_SEPARATOR.$image_path.DIRECTORY_SEPARATOR.$format;
-    $thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name, 'png');
+    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name, 'png')) {
+        return '';
+    }
     $basename = basename($dest);
 
@@ -1345 +1347 @@
     $thumb_h = $height;
     $dest;
-    $thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name);
+    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name)) {
+        return '';
+    }
 
     # make url

branches/release-41/php/lib/function.mtassetthumbnaillink.php

@@ -28 +28 @@
 
     list($thumb, $thumb_w, $thumb_h) = get_thumbnail_file($asset, $blog, $width, $height, $scale);
+    if (empty($thumb)) {
+        return '';
+    }
+
     $target = "";
     if (isset($args['new_window']))

branches/release-41/php/lib/function.mtauthoruserpic.php

@@ -26 +26 @@
     require_once("MTUtil.php");
     $userpic_url = userpic_url($asset[0], $blog, $author);
+    if (empty($userpic_url))
+        return '';
     $asset_path = asset_path($asset[0]['asset_file_path'], $blog);
     list($src_w, $src_h, $src_type, $src_attr) = getimagesize($asset_path);

branches/release-41/php/lib/function.mtcommenteruserpic.php

@@ -22 +22 @@
     require_once("MTUtil.php");
     $userpic_url = userpic_url($asset[0], $blog, $cmntr);
+    if (empty($userpic_url))
+        return '';
+
     $asset_path = asset_path($asset[0]['asset_file_path'], $blog);
     list($src_w, $src_h, $src_type, $src_attr) = getimagesize($asset_path);

branches/release-41/php/lib/function.mtentryauthoruserpic.php

@@ -23 +23 @@
     require_once("MTUtil.php");
     $userpic_url = userpic_url($asset[0], $blog, $author);
+    if (empty($userpic_url))
+        return '';
     $asset_path = asset_path($asset[0]['asset_file_path'], $blog);
     list($src_w, $src_h, $src_type, $src_attr) = getimagesize($asset_path);

branches/release-41/php/lib/thumbnail_lib.php

@@ -16 +16 @@
     function Thumbnail ($src) {
         $this->src_file = $src;
+    }
+
+    # Can we use function of GD?
+    function is_available () {
+        return extension_loaded('gd');
     }
 
@@ -90 +95 @@
         if (empty($this->src_file)) return false;
         if (!file_exists($this->src_file)) return false;
+        if (!$this->is_available()) {
+            global $mt;
+            $mt->warning_log($mt->translate('GD support has not been available. Please install GD support.'));
+            return false;
+        }
 
         # Get source image information

branches/release-41/php/mt.php.pre

@@ -30 +30 @@
     var $conditional = false;
     var $log = array();
+    var $warning = array();
     var $id;
     var $request;
@@ -597 +598 @@
         echo $output;
 
+        // if warnings found, show it.
+        if (!empty($this->warning)) {
+            $this->_dump($this->warning);
+        }
+
         if ($this->debugging) {
             $this->log("Queries: ".$mtdb->num_queries);
@@ -688 +694 @@
     }
 
-    function log_dump() {
+    function _dump($dump) {
         if ($_SERVER['REMOTE_ADDR']) {
             // web view...
             echo "<div class=\"debug\" style=\"border:1px solid red; margin:0.5em; padding: 0 1em; text-align:left; background-color:#ddd; color:#000\"><pre>";
-            echo implode("\n", $this->log);
+            echo implode("\n", $dump);
             echo "</pre></div>\n\n";
         } else {
             // console view...
             $stderr = fopen('php://stderr', 'w'); 
-            fwrite($stderr,implode("\n", $this->log)); 
-            echo (implode("\n", $this->log)); 
+            fwrite($stderr,implode("\n", $dump)); 
+            echo (implode("\n", $dump)); 
             fclose($stderr);
         }
+    }
+
+    function log_dump() {
+        $this->_dump($this->log);
     }
 
@@ -793 +803 @@
         return $out;
     }
+
+    function warning_log($str) {
+        $this->warning[] = $str;
+    }
 }