@@ -41,11 +41,6 @@ # Define size of image (maximum width or height)- if specified via get. $thumb_size = (isset($_GET['size'])) ? (int) $_GET["size"] : 0; - if (isset($_GET['sizex']) and (int) $_GET["sizex"] > 0) { - $thumb_size_x = (int) $_GET["sizex"]; - $thumb_size_y = (isset($_GET['sizey']) and (int) $_GET["sizey"] > 0) ? (int) $_GET["sizey"] : $thumb_size_x ; - } - $filename = fallback($_GET['file'], $image_error, true); $filename = str_replace("\'","'",$filename); @@ -53,10 +48,15 @@ $filename = str_replace("//","/",$filename); $fileextension = substr($filename, strrpos($filename, ".") + 1); + list($original_width, $original_height, $type, $attr) = getimagesize($filename); + + if (isset($_GET['sizex']) and (int) $_GET["sizex"] > 0) { + $thumb_size_x = (int) $_GET["sizex"]; + $thumb_size_y = (isset($_GET['sizey']) and (int) $_GET["sizey"] > 0) ? (int) $_GET["sizey"] : $original_height ; + } + $cache_file = INCLUDES_DIR."/caches/thumb_". md5($filename.$thumb_size.$thumb_size_x.$thumb_size_y.$quality).'.'.$fileextension; - - list($original_width, $original_height, $type, $attr) = getimagesize($filename); if ($original_width < $thumb_size_x and $original_height < $thumb_size_y) header("Location: ".$filename); @@ -73,10 +73,8 @@ exit; # no need to create thumbnail - it already exists in the cache } - # determine php and gd versions - $ver = (int) str_replace(".", "", phpversion()); - if ($ver >= 430) - $gd_version = gd_info(); + # determine gd version + $gd_version = gd_info(); # define the right function for the right image types if (!$image_type_arr = getimagesize($filename)) { feathers/photo/thumb.php a28b3f382316eb7e1ca51f6a37ddd572cac31423 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/ef5ae7a0265e1689a93b839188dd51d1f16b10b0 ef5ae7a0265e1689a93b839188dd51d1f16b10b0 2008-07-10T02:18:11-07:00 2008-07-10T02:18:11-07:00 Fixed thumbnail scaling when it doesn't need to. 9f334d93414cf796c13ce60a251e1cd54238a073 Alex Suraci i.am@toogeneric.com