Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / actions / photos.php

diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php
index 4a927782aa0ec36a84b611d732071b17249e8ca9..29a70e4589b03e730502711f91261988f6d0fb8a 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photos.php
+++ b/plugins/GNUsocialPhotos/actions/photos.php
@@ -97,7 +97,7 @@ class PhotosAction extends Action
                         $this->elementStart('li');
                         $this->elementStart('a', array('href' => 'http://' . common_config('site', 'server') . '/file/' . $file));
                         if (!file_exists(INSTALLDIR . '/file/thumb.' . $file)) {
-                            $this->makeThumb($file);
+                            photo_make_thumbnail($file);
                         }
                         $this->element('img', array('src' => 'http://' . common_config('site', 'server') . '/file/' . 'thumb.' .  $file));
                         $this->elementEnd('a');
@@ -107,60 +107,4 @@ class PhotosAction extends Action
             $this->elementEnd('ul');
         }
     }
-
-    function makeThumb($filename)
-    {
-        $height_dest = 192;
-        $width_dest = 256;
-
-        if (substr($filename, -4) == '.jpg' || substr($filename, -5) == '.jpeg') {
-            $image_src = imagecreatefromjpeg(INSTALLDIR . '/file/' . $filename);
-            $image_type = IMAGETYPE_JPEG;
-        } else if(substr($filename, -4) == '.png') {
-            $image_src = imagecreatefrompng(INSTALLDIR . '/file/' . $filename);
-            $image_type = IMAGETYPE_PNG;
-        } else if(substr($filename, -4) == '.gif') {
-            $image_src = imagecreatefromgif(INSTALLDIR . '/file/' . $filename);
-            $image_type = IMAGETYPE_GIF;
-        } else {
-            return false;
-        }
-
-        $size_src = getimagesize(INSTALLDIR . '/file/' . $filename);
-        $width_src = $size_src[0];
-        $height_src = $size_src[1];
-
-        $ratio_src = (float) $width_src / (float) $height_src;
-        $ratio_dest = (float) $width_dest / (float) $height_dest;
-
-        if ($ratio_src > $ratio_dest) {
-            $height_crop = $height_src;
-            $width_crop = (int)($height_crop * $ratio_dest);
-            $x_crop = ($width_src - $width_crop) / 2;
-        } else {
-            $width_crop = $width_src;
-            $height_crop = (int)($width_crop / $ratio_dest);
-            $x_crop = 0;
-        }
-        
-        $image_dest = imagecreatetruecolor($width_dest, $height_dest);
-        
-        imagecopyresampled($image_dest, $image_src, 0, 0, $x_crop, 0, $width_dest, $height_dest, $width_crop, $height_crop);
-        switch ($image_type) {
-        case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, INSTALLDIR . '/file/' . 'thumb.' . $filename, 100);
-            break;
-        case IMAGETYPE_PNG:
-            imagepng($image_dest, INSTALLDIR . '/file/thumb.' . $filename);
-            break;
-        case IMAGETYPE_GIF:
-            imagegif($image_dest, INSTALLDIR . '/file/thumb.' . $filename);
-            break;
-        }
-        
-        imagedestroy($image_src);
-        imagedestroy($image_dest);
-
-        return true;
-    }
 }