From 72278f3d3ce9b3dff0b4f5e95ad400d14a79eb71 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 20 Jun 2009 16:33:54 +0000
Subject: cleaned up the thumbnail code

---
 thumbnail.php | 66 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

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