Changeset 8663

Timestamp:

07/06/10 17:56:19 (2 months ago)

Author:

inureyes

Message:

refs #1482

• 관련 기존 클래스 호출 수정

Location:

branches/1.8

Files:

• framework/legacy/Textcube.Function.Image.php (modified) (1 diff)
• framework/utils/Image.php (modified) (1 diff)
• interface/i/imageResizer/index.php (modified) (1 diff)
• library/function/image.php (modified) (1 diff)
• library/view/iphoneView.php (modified) (1 diff)
• plugins/FM_Markdown/ttml.php (modified) (14 diffs)
• plugins/FM_TTML/ttml.php (modified) (5 diffs)
• plugins/FM_Textile/ttml.php (modified) (5 diffs)
• plugins/MT_Meta_RecentPS_Default/index.php (modified) (1 diff)

branches/1.8/framework/legacy/Textcube.Function.Image.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
-class Image {
-    function Image() {
-        $this->reset();
-    }
-    
-    function reset() {
-        $this->extraPadding = 0;
-        $this->imageFile = NULL;
-        $this->resultImageDevice = NULL;
-    }
-    
-    function resample($width, $height) {
-        if (empty($width) && empty($height))
-            return false;
-        if (empty($this->imageFile) || !file_exists($this->imageFile))
-            return false;
-        
-        // create an image device as image format.
-        switch ($this->getImageType($this->imageFile)) {
-            case "gif":
-                if (imagetypes() & IMG_GIF) {
-                    $originImageDevice = imagecreatefromgif($this->imageFile);
-                } else {
-                    return false;
-                }
-                break;
-            case "jpg":
-                if (imagetypes() & IMG_JPG) {
-                    $originImageDevice = imagecreatefromjpeg($this->imageFile);
-                } else {
-                    return false;
-                }
-                break;
-            case "png":
-                if ((imagetypes() & IMG_PNG) && function_exists('imagecreatefrompng')) {
-                    $originImageDevice = imagecreatefrompng($this->imageFile);
-                } else {
-                    return false;
-                }
-                break;
-            case "wbmp":
-                if (imagetypes() & IMG_WBMP) {
-                    $originImageDevice = imagecreatefromwbmp($this->imageFile);
-                } else {
-                    return false;
-                }
-                break;
-            case "xpm":
-                if (imagetypes() & IMG_XPM) {
-                    $originImageDevice = imagecreatefromxpm($this->imageFile);
-                } else {
-                    return false;
-                }
-                break;
-            default:
-                return false;
-                break;
-        }
-        // 리샘플링은 최종단계에서 리샘플링만을 하는 기능임. 시스템을 예로 들면 OS의 기능에 해당함.
-        // 이미지 프로세스는 어플리케이션의 기능으로 볼 수 있고, 따라서 이미지 리샘플링 중에는 이벤트가 끼어들면 안 됨.
-        //$originImageDevice = fireEvent('BeforeResizeImage', $originImageDevice, $this);
-        
-        if (Path::getExtension($this->imageFile) == ".gif") {
-            $this->resultImageDevice = imagecreate($width, $height);
-        } else {
-            $this->resultImageDevice = imagecreatetruecolor($width, $height);
-        }
-        
-        $bgColorBy16 = $this->hexRGB("FFFFFF");
-        $temp = imagecolorallocate($this->resultImageDevice, $bgColorBy16['R'], $bgColorBy16['G'], $bgColorBy16['B']);
-        imagefilledrectangle($this->resultImageDevice, 0, 0, $width, $height, $temp);
-        imagecopyresampled($this->resultImageDevice, $originImageDevice, 0, 0, 0, 0, $width, $height, imagesx($originImageDevice), imagesy($originImageDevice));
-        imagedestroy($originImageDevice);
-        //$this->resultImageDevice = fireEvent('AfterResizeImage', $this->resultImageDevice, $this);
-        
-        return true;
-    }
-    
-    function resizeImageToContent($property, $originSrc, $imageWidth) {
-        if ( !is_readable($originSrc) ) {
-            return array($property, false);
-        }
-        
-        list($originWidth, $originHeight, $type, $attr) = getimagesize($originSrc);     
-        $attributes = Misc::getAttributesFromString($property, false);
-        
-        // 단위 변환.
-        $onclickFlag = false;
-        if (array_key_exists('width', $attributes)) {
-            if (preg_match('/(.+)(%?)/', $attributes['width'], $matches)) {
-                if($matches[2] == '%')
-                    $attributes['width'] = round($originWidth * $matches[1] / 100);
-                else
-                    $attributes['width'] = intval($matches[1]);
-                
-            }
-        }
 
-        if (array_key_exists('height', $attributes)) {
-            if (preg_match('/(.+)(%?)/', $attributes['height'], $matches)) {
-                if ($matches[2] == '%')
-                    $attributes['height'] = round($originHeight * $matches[1] / 100);
-                else
-                    $attributes['height'] = intval($matches[1]);
-                
-            }
-        }
-        
-        // 가로, 세로 어느 쪽이든 0이면 이미지는 표시되지 않음. 따라서 계산할 필요 없음.
-        if ((isset($attributes['width']) && $attributes['width'] <= 0) || (isset($attributes['height']) && $attributes['height'] <= 0)) {
-            return array($property, false);
-        }
+/// Legacy code for plugins. See /framework/utils/Image.php for working codes. 
 
-        // 가로만 지정된 이미지의 경우.
-        if (isset($attributes['width']) && !isset($attributes['height'])) {
-            // 비어있는 세로를 가로의 크기를 이용하여 계산.
-            $attributes['height'] = floor($originHeight * $attributes['width'] / $originWidth);
-        // 세로만 지정된 이미지의 경우.
-        } else if (!isset($attributes['width']) && isset($attributes['height'])) {
-            // 비어있는 가로를 세로의 크기를 이용하여 계산.
-            $attributes['width'] = floor($originWidth * $attributes['height'] / $originHeight);
-        // 둘 다 지정되지 않은 이미지의 경우.
-        } else if (!isset($attributes['width']) && !isset($attributes['height'])) {
-            // 둘 다 비어 있을 경우는 오리지널 사이즈로 대치.
-            $attributes['width'] = $originWidth;
-            $attributes['height'] = $originHeight;
-        }
-
-        if ($attributes['width'] > $imageWidth) {
-            $attributes['height'] = floor($attributes['height'] * $imageWidth / $attributes['width']);
-            $attributes['width'] = $imageWidth;
-        }
-        
-        if ($attributes['width'] < $originWidth || $attributes['height'] < $originHeight) {
-            $onclickFlag = true;
-        } else {
-            $onclickFlag = false;
-        }
-
-        $properties = array();
-        ksort($attributes);
-        foreach($attributes as $key => $value) {
-            array_push($properties, "$key=\"$value\"");
-        }
-        
-        return array(implode(' ', $properties), $onclickFlag);
-    }
-    
-    function impressWaterMark($waterMarkFile, $position="left=10|bottom=10", $gamma=100) {
-        if ($this->getImageType($waterMarkFile) == "png")
-            return $this->_impressWaterMarkCore("PNG", $waterMarkFile, $position);
-        else
-            return $this->_impressWaterMarkCore("GIF", $waterMarkFile, $position, $gamma);
-    }
-    
-    function _impressWaterMarkCore($type, $waterMarkFile, $position, $gamma=100) {
-        if (empty($waterMarkFile))
-            return false;
-        if (!file_exists($waterMarkFile))
-            return false;
-        if (empty($this->resultImageDevice))
-            return false;
-        
-        // validate gamma.
-        if (!is_int($gamma)) {
-            $gamma = 100;
-        } else if ($gamma < 0) {
-            $gamma = 0;
-        } else if ($gamma > 100) {
-            $gamma = 100;
-        }
-        
-        list($waterMarkWidth, $waterMarkHeight, $waterMakrType) = getimagesize($waterMarkFile);
-        
-        // position of watermark.
-        if (preg_match("/^(-?[0-9A-Z]+) (-?[0-9A-Z]+)$/i", $position, $temp)) {
-            $resultWidth = imagesx($this->resultImageDevice);
-            $resultHeight = imagesy($this->resultImageDevice);
-            
-            switch ($temp[1]) {
-                case "left":
-                    $xPosition = $this->extraPadding;
-                    break;
-                case "center":
-                    $xPosition = $resultWidth / 2 - $waterMarkWidth / 2;
-                    break;
-                case "right":
-                    $xPosition = $resultWidth - $waterMarkWidth - $this->extraPadding;
-                    break;
-                default:
-                    // if positive, calculate x value from left.
-                    if (preg_match("/^([1-9][0-9]*)$/", $temp[1], $extra)) {
-                        if ($extra[1] > $resultWidth - $waterMarkWidth) {
-                            $xPosition = $resultWidth - $waterMarkWidth;
-                        } else {
-                            $xPosition = $extra[1];
-                        }
-                    // if negative, calculate x value from right.
-                    } else if (preg_match("/^(-?[1-9][0-9]*)$/", $temp[1], $extra)) {
-                        if ($resultWidth - $waterMarkWidth - abs($extra[1]) < 0) {
-                            $xPosition = 0;
-                        } else {
-                            $xPosition = $resultWidth - $waterMarkWidth - abs($extra[1]);
-                        }
-                    // in the case of 0.
-                    } else if ($temp[1] == "0") {
-                        $xPosition = 0;
-                    // the others. calculate x value from left.
-                    } else {
-                        $xPosition = $resultWidth - $waterMarkWidth - $this->extraPadding;
-                    }
-            }
-            
-            switch ($temp[2]) {
-                case "top":
-                    $yPosition = $this->extraPadding;
-                    break;
-                case "middle":
-                    $yPosition = $resultHeight / 2 - $waterMarkHeight / 2;
-                    break;
-                case "bottom":
-                    $yPosition = $resultHeight - $waterMarkHeight - $this->extraPadding;
-                    break;
-                default:
-                    // if positive, calculate y value from top.
-                    if (preg_match("/^([1-9][0-9]*)$/", $temp[2], $extra)) {
-                        if ($extra[1] > $resultHeight - $waterMarkHeight) {
-                            $yPosition = $resultHeight - $waterMarkHeight;
-                        } else {
-                            $yPosition = $extra[1];
-                        }
-                    // if negative, calculate y value from bottom.
-                    } else if (preg_match("/^(-?[1-9][0-9]*)$/", $temp[2], $extra)) {
-                        if ($resultHeight - $waterMarkHeight - abs($extra[1]) < 0) {
-                            $yPosition = 0;
-                        } else {
-                            $yPosition = $resultHeight - $waterMarkHeight - abs($extra[1]);
-                        }
-                    // in the case of 0.
-                    } else if ($temp[1] == "0") {
-                        $yPosition = 0;
-                    // the others. calculate y value from bottom.
-                    } else {
-                        $yPosition = $resultHeight - $waterMarkHeight - $this->extraPadding;
-                    }
-            }
-        } else {
-            $xPosition = $resultWidth - $waterMarkWidth - $this->extraPadding;
-            $yPosition = $resultHeight - $waterMarkHeight - $this->extraPadding;
-        }
-        
-        // create watermark image device.
-        switch ($waterMakrType) {
-            case 1:
-                $waterMarkDevice = imagecreatefromgif($waterMarkFile);
-                break;
-            case 2:
-                $waterMarkDevice = imagecreatefromjpeg($waterMarkFile);
-                break;
-            case 3:
-                $waterMarkDevice = imagecreatefrompng($waterMarkFile);
-                break;
-        }
-        
-        // PHP >= 4.0.6
-        if (strtolower($type) == "png" && function_exists("imagealphablending")) {
-            imagealphablending($this->resultImageDevice, true);
-            imagecopy($this->resultImageDevice, $waterMarkDevice, $xPosition, $yPosition, 0, 0, $waterMarkWidth, $waterMarkHeight);
-        } else {
-            // if not support alpha channel, support GIF transparency.
-            $tempWaterMarkDevice = imagecreatetruecolor($waterMarkWidth, $waterMarkHeight);
-            
-            $bgColorBy16 = $this->hexRGB("FF00FF");
-            $temp = imagecolorallocate($tempWaterMarkDevice, $bgColorBy16['R'], $bgColorBy16['G'], $bgColorBy16['B']);
-            imagecolortransparent($this->resultImageDevice, $temp);
-            imagefill($tempWaterMarkDevice, 0, 0, $temp);
-            imagecopy($tempWaterMarkDevice, $waterMarkDevice, 0, 0, 0, 0, $waterMarkWidth, $waterMarkHeight);
-            
-            if (function_exists("imagecopymerge"))
-                imagecopymerge($this->resultImageDevice, $tempWaterMarkDevice, $xPosition, $yPosition, 0, 0, $waterMarkWidth, $waterMarkHeight, $gamma);
-            else
-                imagecopy($this->resultImageDevice, $tempWaterMarkDevice, $xPosition, $yPosition, 0, 0, $waterMarkWidth, $waterMarkHeight);
-            
-            imagedestroy($tempWaterMarkDevice);
-        }
-        
-        imagedestroy($waterMarkDevice);
-        return true;
-    }
-    
-    function cropRectByCoordinates($startX, $startY, $finishX, $finishY) {
-        $width = $finishX - $startX;
-        $height = $finishY - $startY;
-        
-        $targetDevice = imagecreatetruecolor($width, $height);
-        $bgColorBy16 = $this->hexRGB('FFFFFF');
-        imagecolorallocate($tempWaterMarkDevice, $bgColorBy16['R'], $bgColorBy16['G'], $bgColorBy16['B']);
-        imagecopy($targetDevice, $this->resultImageDevice, 0, 0, $startX, $startY, $width, $height);
-        $this->resultImageDevice = $targetDevice;
-        unset($targetDevice);
-        
-        return true;
-    }
-    
-    function cropRectBySize($width, $height, $align='center', $valign='middle') {
-        switch ($align) {
-            case 'left':
-                $srcX = 0;
-                break;
-            case 'center':
-                $srcX = floor((imagesx($this->resultImageDevice) - $width) / 2);
-                break;
-            case 'right':
-                $srcX = imagesx($this->resultImageDevice) - $width;
-                break;
-        }
-        
-        switch ($valign) {
-            case 'top':
-                $srcY = 0;
-                break;
-            case 'middle':
-                $srcY = floor((imagesy($this->resultImageDevice) - $height) / 2);
-                break;
-            case 'bottom':
-                $srcY = imagesy($this->resultImageDevice) - $height;
-                break;
-        }
-        
-        $targetDevice = imagecreatetruecolor($width, $height);
-        $bgColorBy16 = $this->hexRGB('FFFFFF');
-        imagecolorallocate($targetDevice, $bgColorBy16['R'], $bgColorBy16['G'], $bgColorBy16['B']);
-        imagecopy($targetDevice, $this->resultImageDevice, 0, 0, $srcX, $srcY, $width, $height);
-        $this->resultImageDevice = $targetDevice;
-        unset($targetDevice);
-        
-        return true;
-    }
-    
-    function saveAsFile($fileName) {
-        return $this->createThumbnailIntoFile($fileName);
-    }
-    
-    function createThumbnailIntoFile($fileName) {
-        if (empty($this->resultImageDevice))
-            return false;
-        
-        imageinterlace($this->resultImageDevice);
-        switch ($this->getImageType($this->imageFile)) {
-            case "gif":
-                imagegif($this->resultImageDevice, $fileName);
-                break;
-            case "png":
-                imagepng($this->resultImageDevice, $fileName);
-                break;
-            case "wbmp":
-                imagewbmp($this->resultImageDevice, $fileName);
-                break;
-            case "jpg":
-            default:
-                imagejpeg($this->resultImageDevice, $fileName, 80);
-                break;
-        }
-        
-        $this->resultImageDevice = NULL;
-        
-        return true;
-    }
-    
-    function saveAsCache() {
-        return $this->createThumbnailIntoCache();
-    }
-    
-    function createThumbnailIntoCache() {
-        header("Content-type: image/jpeg");
-        imagejpeg($this->resultImageDevice);
-        
-        $originImageDevice = NULL;
-        $this->resultImageDevice = NULL;
-        
-        return true;
-    }
-    
-    function calcOptimizedImageSize($argWidth, $argHeight, $boxWidth=NULL, $boxHeight=NULL, $resizeFlag="reduce") {
-        if (empty($boxWidth) && empty($boxHeight)) {
-            return array($argWidth, $argHeight);
-        } else if (!empty($boxWidth) && empty($boxHeight)) {
-            if ($argWidth > $boxWidth) {
-                $newWidth = $boxWidth;
-                $newHeight = floor($argHeight * $newWidth / $argWidth);
-            } else {
-                $newWidth = $argWidth;
-                $newHeight = $argHeight;
-            }
-        } else if (empty($boxWidth) && !empty($boxHeight)) {
-            if ($argHeight > $boxHeight) {
-                $newHeight = $boxHeight;
-                $newWidth = floor($argWidth * $newHeight / $argHeight);
-            } else {
-                $newWidth = $argWidth;
-                $newHeight = $argHeight;
-            }
-        } else {
-            if ($argWidth > $boxWidth) {
-                $newWidth = $boxWidth;
-                $newHeight = floor($argHeight * $newWidth / $argWidth);
-            } else {
-                $newWidth = $argWidth;
-                $newHeight = $argHeight;
-            }
-            
-            if ($newHeight > $boxHeight) {
-                $tempHeight = $newHeight;
-                $newHeight = $boxHeight;
-                $newWidth = floor($newWidth * $newHeight / $tempHeight);
-            }
-        }
-        
-        if ($argWidth * $argHeight > $newWidth * $newHeight) {
-            if ($resizeFlag == "reduce" || $resizeFlag == "both") {
-                $imgWidth = $newWidth;
-                $imgHeight = $newHeight;
-            } else {
-                $imgWidth = $argWidth;
-                $imgHeight = $argHeight;
-            }
-        } else if ($argWidth * $argHeight == $newWidth * $newHeight) {
-            $imgWidth = $argWidth;
-            $imgHeight = $argHeight;
-        } else if ($argWidth * $argHeight < $newWidth * $newHeight) {
-            if ($resizeFlag == "enlarge" || $resizeFlag == "both") {
-                $imgWidth = $newWidth;
-                $imgHeight = $newHeight;
-            } else {
-                $imgWidth = $argWidth;
-                $imgHeight = $argHeight;
-            }
-        }
-        
-        return array($imgWidth, $imgHeight);
-    }
-    
-    function getImageType($filename) {
-        if (file_exists($filename)) {
-            if (function_exists("exif_imagetype")) {
-                $imageType = exif_imagetype($filename);
-            } else {
-                $tempInfo = getimagesize($filename);
-                $imageType = $tempInfo[2];
-            }
-            
-            switch ($imageType) {
-                case IMAGETYPE_GIF:
-                    $extension = 'gif';
-                    break;
-                case IMAGETYPE_JPEG:
-                    $extension = 'jpg';
-                    break;
-                case IMAGETYPE_PNG:
-                    $extension = 'png';
-                    break;
-                case IMAGETYPE_SWF:
-                    $extension = 'swf';
-                    break;
-                case IMAGETYPE_PSD:
-                    $extension = 'psd';
-                    break;
-                case IMAGETYPE_BMP:
-                    $extension = 'bmp';
-                    break;
-                case IMAGETYPE_TIFF_II:
-                case IMAGETYPE_TIFF_MM:
-                    $extension = 'tiff';
-                    break;
-                case IMAGETYPE_JPC:
-                    $extension = 'jpc';
-                    break;
-                case IMAGETYPE_JP2:
-                    $extension = 'jp2';
-                    break;
-                case IMAGETYPE_JPX:
-                    $extension = 'jpx';
-                    break;
-                case IMAGETYPE_JB2:
-                    $extension = 'jb2';
-                    break;
-                case IMAGETYPE_SWC:
-                    $extension = 'swc';
-                    break;
-                case IMAGETYPE_IFF:
-                    $extension = 'aiff';
-                    break;
-                case IMAGETYPE_WBMP:
-                    $extension = 'wbmp';
-                    break;
-                case IMAGETYPE_XBM:
-                    $extension = 'xbm';
-                    break;
-                default:
-                    $extension = false;
-            }
-        } else {
-            $extension = false;
-        }
-        
-        return $extension;
-    }
-    
-    /* "FFFFFF" => array(255, 255, 255) */
-    function hexRGB($hexstr) {
-        $int = hexdec($hexstr);
-        return array('R' => 0xFF & ($int >> 0x10), 'G' => 0xFF & ($int >> 0x8), 'B' => 0xFF & $int);
+if(!class_exists('Image')) {
+    class Image extends Utils_Image {
     }
 }
-?>

branches/1.8/framework/utils/Image.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
-class Utils_Image {
+
+class Utils_Image extends Singleton {
     function __construct() {
         $this->reset();
     }
-    
+
+    public static function getInstance() {
+        return self::_getInstance(__CLASS__);
+    }
+
     function reset() {
         $this->extraPadding = 0;

branches/1.8/interface/i/imageResizer/index.php

@@ -18 +18 @@
             $imageInfo = getimagesize($imagePath);
             $cropSize = $_GET['m'];
-            $objThumbnail = new Image();
+            $objThumbnail = new Utils_Image();
             if ($imageInfo[0] > $imageInfo[1])
                 list($tempWidth, $tempHeight) = $objThumbnail->calcOptimizedImageSize($imageInfo[0], $imageInfo[1], NULL, $cropSize);

branches/1.8/library/function/image.php

@@ -120 +120 @@
     }
 
-    requireComponent('Textcube.Function.Image');
-    $objResize = new Image();
+    $objResize = new Utils_Image();
     $objResize->imageFile = $originSrc;
     if (isset($options['size']) && is_numeric($options['size'])) {

branches/1.8/library/view/iphoneView.php

@@ -322 +322 @@
     $thumbnailSrc = ROOT . "/cache/thumbnail/{$blogid}/iphoneThumbnail/th_{$filename}";
     if (file_exists($originSrc)) {
-        requireComponent('Textcube.Function.Image');
         $imageInfo = getimagesize($originSrc);
 
-        $objThumbnail = new Image();
+        $objThumbnail = new Utils_Image();
         if ($imageInfo[0] > $imageInfo[1])
             list($tempWidth, $tempHeight) = $objThumbnail->calcOptimizedImageSize($imageInfo[0], $imageInfo[1], NULL, $cropSize);

branches/1.8/plugins/FM_Markdown/ttml.php

@@ -1 +1 @@
 <?php
 // PHP TTML parser
-// Version 1.6 (2008.1.20)
+// Version 1.8 (2010.7.6)
 // 2004-2009 Needlworks / TNF / Tatter and Company
 // Original TTML is created by JH, 2004.4
@@ -7 +7 @@
 // TTML Module port for Tattertools 1.1 by lifthrasiir, 2007.1
 // TTML External library for Textcube 1.6 by inureyes, 2008.1
+// TTML External library for Textcube 1.8 by inureyes, 2010.7
 
 function FM_TTML_bindTags($id, $content) {
@@ -28 +29 @@
 }
 
-function FM_TTML_bindAttachments($entryId, $folderPath, $folderURL, $content, $useAbsolutePath = true, $bRssMode = false) {
+function FM_TTML_bindAttachments($entryId, $folderPath, $folderURL, $content, $useAbsolutePath = false, $bRssMode = false) {
     global $service, $hostURL, $blogURL, $serviceURL;
     requireModel('blog.attachment');
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     getAttachments($blogid, $entryId); // For attachment caching.
@@ -61 +61 @@
                 for ($i = 1; $i < sizeof($attributes) - 2; $i += 2)
                     array_push($items, array($attributes[$i], $attributes[$i + 1]));
-                $galleryAttributes = misc::getAttributesFromString($attributes[sizeof($attributes) - 1]);
+                $galleryAttributes = Misc::getAttributesFromString($attributes[sizeof($attributes) - 1]);
                 
                 $images = array_slice($attributes, 1, count($attributes) - 2);
@@ -96 +96 @@
                 $id = "gallery$entryId$count";
                 $cssId = "tt-gallery-$entryId-$count";
-                $contentWidth = misc::getContentWidth();
+                $contentWidth = Misc::getContentWidth();
                 
                 $items = array();
                 for ($i = 1; $i < sizeof($attributes) - 2; $i += 2)
                     array_push($items, array($attributes[$i], $attributes[$i + 1]));
-                $galleryAttributes = misc::getAttributesFromString($attributes[sizeof($attributes) - 1]);
+                $galleryAttributes = Misc::getAttributesFromString($attributes[sizeof($attributes) - 1]);
                 
                 if (!isset($galleryAttributes['width']))
@@ -183 +183 @@
                 $buf .= $attributes[count($attributes) - 1];
             } else {
-                $params = misc::getAttributesFromString($attributes[sizeof($attributes) - 2]);
+                $params = Misc::getAttributesFromString($attributes[sizeof($attributes) - 2]);
                 $id = $entryId . $count;
                 $imgs = array_slice($attributes, 1, count($attributes) - 3);
@@ -199 +199 @@
                     $caption = '';
                 }
-                $buf .= '<div style="clear: both; text-align: center"><img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/image/gallery/gallery_enlarge.gif" alt="' . _text('확대') . '" style="cursor:pointer" onclick="openFullScreen(\'' . $service['path'] . '/iMazing?d=' . urlencode($id) . '&f=' . urlencode($params['frame']) . '&t=' . urlencode($params['transition']) . '&n=' . urlencode($params['navigation']) . '&si=' . urlencode($params['slideshowinterval']) . '&p=' . urlencode($params['page']) . '&a=' . urlencode($params['align']) . '&o=' . $blogid . '&i=' . $imgStr . '\',\'' . htmlspecialchars(str_replace("'", "&#39;", $attributes[count($attributes) - 1])) . '\',\'' . $service['path'] . '\')" />';
+                $buf .= '<div style="clear: both; text-align: center"><img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/resources/image/gallery/gallery_enlarge.gif" alt="' . _text('확대') . '" style="cursor:pointer" onclick="openFullScreen(\'' . $service['path'] . '/iMazing?d=' . urlencode($id) . '&f=' . urlencode($params['frame']) . '&t=' . urlencode($params['transition']) . '&n=' . urlencode($params['navigation']) . '&si=' . urlencode($params['slideshowinterval']) . '&p=' . urlencode($params['page']) . '&a=' . urlencode($params['align']) . '&o=' . $blogid . '&i=' . $imgStr . '\',\'' . htmlspecialchars(str_replace("'", "&#39;", $attributes[count($attributes) - 1])) . '\',\'' . $service['path'] . '\')" />';
                 $buf .= '<div id="iMazingContainer'.$id.'" class="iMazingContainer" style="width:'.$params['width'].'px; height:'.$params['height'].'px;"></div><script type="text/javascript">//<![CDATA['.CRLF;
-                $buf .= 'iMazing' . $id . 'Str = getEmbedCode(\'' . $service['path'] . '/script/gallery/iMazing/main.swf\',\'100%\',\'100%\',\'iMazing' . $id . '\',\'#FFFFFF\',"image=' . $imgStr . '&amp;frame=' . $params['frame'] . '&amp;transition=' . $params['transition'] . '&amp;navigation=' . $params['navigation'] . '&amp;slideshowInterval=' . $params['slideshowinterval'] . '&amp;page=' . $params['page'] . '&amp;align=' . $params['align'] . '&amp;skinPath=' . $service['path'] . '/script/gallery/iMazing/&amp;","false"); writeCode(iMazing' . $id . 'Str, "iMazingContainer'.$id.'");';
+                $buf .= 'iMazing' . $id . 'Str = getEmbedCode(\'' . $service['path'] . '/resources/script/gallery/iMazing/main.swf\',\'100%\',\'100%\',\'iMazing' . $id . '\',\'#FFFFFF\',"image=' . $imgStr . '&amp;frame=' . $params['frame'] . '&amp;transition=' . $params['transition'] . '&amp;navigation=' . $params['navigation'] . '&amp;slideshowInterval=' . $params['slideshowinterval'] . '&amp;page=' . $params['page'] . '&amp;align=' . $params['align'] . '&amp;skinPath=' . $service['path'] . '/resources/script/gallery/iMazing/&amp;","false"); writeCode(iMazing' . $id . 'Str, "iMazingContainer'.$id.'");';
                 $buf .= '//]]></script><noscript>';
                 for ($i = 0; $i < count($imgs); $i += 2)
@@ -216 +216 @@
                 }
             } else {
-                $params = misc::getAttributesFromString($attributes[sizeof($attributes) - 2]);
+                $params = Misc::getAttributesFromString($attributes[sizeof($attributes) - 2]);
                 foreach ($params as $key => $value) {
                     if ($key == 'autoPlay') {
@@ -252 +252 @@
                 $buf .= '<div id="jukeBox' . $id . 'Div" style="margin-left: auto; margin-right: auto; width:' . $width . '; height:' . $height . ';"><div id="jukeBoxContainer'.$id.'" style="width:' . $width . '; height:' . $height . ';"></div>';
                 $buf .= '<script type="text/javascript">//<![CDATA['.CRLF;
-                $buf .= 'writeCode(getEmbedCode(\'' . $service['path'] . '/script/jukebox/flash/main.swf\',\'100%\',\'100%\',\'jukeBox' . $id . 'Flash\',\'#FFFFFF\',"sounds=' . $imgStr . '&amp;autoplay=' . $params['autoplay'] . '&amp;visible=' . $params['visible'] . '&amp;id=' . $id . '","false"), "jukeBoxContainer'.$id.'")';
+                $buf .= 'writeCode(getEmbedCode(\'' . $service['path'] . '/resources/script/jukebox/flash/main.swf\',\'100%\',\'100%\',\'jukeBox' . $id . 'Flash\',\'#FFFFFF\',"sounds=' . $imgStr . '&amp;autoplay=' . $params['autoplay'] . '&amp;visible=' . $params['visible'] . '&amp;id=' . $id . '","false"), "jukeBoxContainer'.$id.'")';
                 $buf .= '//]]></script><noscript>';
                 for ($i = 0; $i < count($imgs); $i++) {
@@ -264 +264 @@
             }
         } else {
-            $contentWidth = misc::getContentWidth();
+            $contentWidth = Misc::getContentWidth();
 
             switch (count($attributes)) {
@@ -342 +342 @@
 function FM_TTML_getAttachmentBinder($filename, $property, $folderPath, $folderURL, $imageBlocks = 1, $useAbsolutePath = true, $bRssMode = false, $onclickFlag=false) {
     global $database, $skinSetting, $service, $blogURL, $hostURL, $serviceURL;
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     $path = "$folderPath/$filename";
@@ -350 +349 @@
         $url = "$folderURL/$filename";
     $fileInfo = getAttachmentByOnlyName($blogid, $filename);
-    switch (misc::getFileExtension($filename)) {
+    switch (Misc::getFileExtension($filename)) {
         case 'jpg':case 'jpeg':case 'gif':case 'png':case 'bmp':
             $bPassing = false;
@@ -399 +398 @@
             break;
         default:
-            if (file_exists(ROOT . '/image/extension/' . misc::getFileExtension($fileInfo['label']) . '.gif')) {
-                return '<a class="extensionIcon" href="' . ($useAbsolutePath ? $hostURL : '') . $blogURL . '/attachment/' . $filename . '">' . fireEvent('ViewAttachedFileExtension', '<img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/image/extension/' . misc::getFileExtension($fileInfo['label']) . '.gif" alt="" />') . ' ' . htmlspecialchars($fileInfo['label']) . '</a>';
+            if (file_exists(ROOT . '/resources/image/extension/' . Misc::getFileExtension($fileInfo['label']) . '.gif')) {
+                return '<a class="extensionIcon" href="' . ($useAbsolutePath ? $hostURL : '') . $blogURL . '/attachment/' . $filename . '">' . fireEvent('ViewAttachedFileExtension', '<img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/resources/image/extension/' . Misc::getFileExtension($fileInfo['label']) . '.gif" alt="" />') . ' ' . htmlspecialchars($fileInfo['label']) . '</a>';
             } else {
-                return '<a class="extensionIcon" href="' . ($useAbsolutePath ? $hostURL : '') . $blogURL . '/attachment/' . $filename . '">' . fireEvent('ViewAttachedFileExtension', '<img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/image/extension/unknown.gif" alt="" />') . ' ' . htmlspecialchars($fileInfo['label']) . '</a>';
+                return '<a class="extensionIcon" href="' . ($useAbsolutePath ? $hostURL : '') . $blogURL . '/attachment/' . $filename . '">' . fireEvent('ViewAttachedFileExtension', '<img src="' . ($useAbsolutePath ? $serviceURL : $service['path']) . '/resources/image/extension/unknown.gif" alt="" />') . ' ' . htmlspecialchars($fileInfo['label']) . '</a>';
             }
             break;
@@ -410 +409 @@
 function FM_TTML_createNewProperty($filename, $imageWidth, $property) {
     $blogid = getBlogId();
-    requireComponent('Textcube.Function.Image');
-    if (in_array(Image::getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
-        return Image::resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
+    $image = Utils_Image::getInstance();
+    if (in_array($image->getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
+        return $image->resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
     else
         return array($property, false);

branches/1.8/plugins/FM_TTML/ttml.php

@@ -1 +1 @@
 <?php
 // PHP TTML parser
-// Version 1.6 (2008.1.20)
+// Version 1.8 (2010.7.6)
 // 2004-2009 Needlworks / TNF / Tatter and Company
 // Original TTML is created by JH, 2004.4
@@ -7 +7 @@
 // TTML Module port for Tattertools 1.1 by lifthrasiir, 2007.1
 // TTML External library for Textcube 1.6 by inureyes, 2008.1
+// TTML External library for Textcube 1.8 by inureyes, 2010.7
 
 function FM_TTML_bindTags($id, $content) {
@@ -31 +32 @@
     global $service, $hostURL, $blogURL, $serviceURL;
     requireModel('blog.attachment');
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     getAttachments($blogid, $entryId); // For attachment caching.
@@ -342 +342 @@
 function FM_TTML_getAttachmentBinder($filename, $property, $folderPath, $folderURL, $imageBlocks = 1, $useAbsolutePath = true, $bRssMode = false, $onclickFlag=false) {
     global $database, $skinSetting, $service, $blogURL, $hostURL, $serviceURL;
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     $path = "$folderPath/$filename";
@@ -410 +409 @@
 function FM_TTML_createNewProperty($filename, $imageWidth, $property) {
     $blogid = getBlogId();
-    requireComponent('Textcube.Function.Image');
-    if (in_array(Image::getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
-        return Image::resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
+    $image = Utils_Image::getInstance();
+    if (in_array($image->getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
+        return $image->resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
     else
         return array($property, false);

branches/1.8/plugins/FM_Textile/ttml.php

@@ -1 +1 @@
 <?php
 // PHP TTML parser
-// Version 1.6 (2008.1.20)
+// Version 1.8 (2010.7.6)
 // 2004-2009 Needlworks / TNF / Tatter and Company
 // Original TTML is created by JH, 2004.4
@@ -7 +7 @@
 // TTML Module port for Tattertools 1.1 by lifthrasiir, 2007.1
 // TTML External library for Textcube 1.6 by inureyes, 2008.1
+// TTML External library for Textcube 1.8 by inureyes, 2010.7
 
 function FM_TTML_bindTags($id, $content) {
@@ -31 +32 @@
     global $service, $hostURL, $blogURL, $serviceURL;
     requireModel('blog.attachment');
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     getAttachments($blogid, $entryId); // For attachment caching.
@@ -342 +342 @@
 function FM_TTML_getAttachmentBinder($filename, $property, $folderPath, $folderURL, $imageBlocks = 1, $useAbsolutePath = true, $bRssMode = false, $onclickFlag=false) {
     global $database, $skinSetting, $service, $blogURL, $hostURL, $serviceURL;
-    requireComponent('Textcube.Function.misc');
     $blogid = getBlogId();
     $path = "$folderPath/$filename";
@@ -410 +409 @@
 function FM_TTML_createNewProperty($filename, $imageWidth, $property) {
     $blogid = getBlogId();
-    requireComponent('Textcube.Function.Image');
-    if (in_array(Image::getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
-        return Image::resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
+    $image = Utils_Image::getInstance();
+    if (in_array($image->getImageType(ROOT."/attach/$blogid/$filename"), array('gif', 'png', 'jpg', 'bmp')))
+        return $image->resizeImageToContent($property, ROOT."/attach/$blogid/$filename", $imageWidth);
     else
         return array($property, false);

branches/1.8/plugins/MT_Meta_RecentPS_Default/index.php

@@ -183 +183 @@
         $imageInfo = getimagesize($originSrc);
 
-        $objThumbnail = new Image();
+        $objThumbnail = new Utils_Image();
         if ($imageInfo[0] > $imageInfo[1])
             list($tempWidth, $tempHeight) = $objThumbnail->calcOptimizedImageSize($imageInfo[0], $imageInfo[1], NULL, $cropSize);