cleaned up the thumbnail code

diff --git a/thumbnail.php b/thumbnail.php
index fe8ca8bab9b323396ddf48b860a001721495ee17..113262960742a82634862eaaa5cd680f70074105 100644 (file)
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -5,46 +5,50 @@
         * \r
         */\r
 \r
-       // Get engine\r
        include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
-               \r
+       \r
        // Get file GUID\r
-       $file_guid = (int) get_input('file_guid',0);\r
-               \r
+       $file_guid = (int) get_input('file_guid');\r
+       \r
        // Get file thumbnail size\r
-       $size = get_input('size','small');\r
+       $size = get_input('size');\r
+       // only 3 possibilities\r
        if ($size != 'small' && $size != 'thumb') {\r
                $size = 'large';\r
        }\r
-               \r
+       error_log('size is ' . $size);\r
+       \r
        // Get file entity\r
-       if ($file = get_entity($file_guid)) {\r
-               if ($file->getSubtype() == "image") {\r
-                       // Get file thumbnail\r
-                       if ($size === "thumb") {\r
-                               $thumbfile = $file->thumbnail;\r
-                       } else if ($size === "small") {\r
-                               $thumbfile = $file->smallthumb;\r
-                       } else {\r
-                               $thumbfile = $file->largethumb;\r
-                       }\r
-                                               \r
-                       // Grab the file\r
-                       if ($thumbfile && !empty($thumbfile)) {\r
-                               $readfile = new ElggFile();\r
-                               $readfile->owner_guid = $file->owner_guid;\r
-                               $readfile->setFilename($thumbfile);\r
-                               //$mime = $file->getMimeType();\r
-                               $contents = $readfile->grabFile();\r
-                       }\r
-               } //end subtype comparison\r
-       } //end get_entity\r
+       $file = get_entity($file_guid);\r
+       if (!$file)\r
+               forward('mod/tidypics/graphics/img_error.jpg');\r
+       \r
+       if ($file->getSubtype() != "image")\r
+               forward('mod/tidypics/graphics/img_error.jpg');\r
+       \r
+       // Get filename\r
+       if ($size == "thumb") {\r
+               $thumbfile = $file->thumbnail;\r
+       } else if ($size == "small") {\r
+               $thumbfile = $file->smallthumb;\r
+       } else {\r
+               $thumbfile = $file->largethumb;\r
+       }\r
+       error_log('filename is ' . $thumbfile);\r
+       \r
+       if (!$thumbfile)\r
+               forward('mod/tidypics/graphics/img_error.jpg');\r
+       \r
+       // create Elgg File object\r
+       $readfile = new ElggFile();\r
+       $readfile->owner_guid = $file->owner_guid;\r
+       $readfile->setFilename($thumbfile);\r
+       $contents = $readfile->grabFile();\r
 \r
-       // Open error image if file was not found\r
-       if (!isset($contents) || is_null($contents) || $file->getSubtype()!='image') {\r
-               //$vars['url'].'mod/tidypics/graphics/img_error.jpg\r
+       // send error image if file could not be read\r
+       if (!$contents) {\r
                forward('mod/tidypics/graphics/img_error.jpg');\r
-       } //end of default error image\r
+       }\r
 \r
        // Return the thumbnail and exit\r
        header("Content-type: image");\r