Knah-Tsaeb/Minigalnano
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #63 from bifek/thumbwarnings

Browse source 
quiesce warnings
This commit is contained in:
Tom.C. 2014-11-24 22:35:03 +01:00
commit 92f0e5bba0
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
createthumb.php
View file

@ -83,7 +83,7 @@ function sanitize($name)
} }
// Make sure the "thumbs" directory exists. // Make sure the "thumbs" directory exists.
if (!is_dir('thumbs')) if (!is_dir('thumbs') && is_writable('.'))
{ {
mkdir('thumbs',0700); mkdir('thumbs',0700);
} }
@ -140,14 +140,18 @@ else // otherwise, generate thumbnail, send it and save it to file.
$height = $width; $height = $width;
} }
$degrees = 0;
$flip = '';
// Rotate JPG pictures // Rotate JPG pictures
if (preg_match("/.jpg$|.jpeg$/i", $_GET['filename'])) if (preg_match("/.jpg$|.jpeg$/i", $_GET['filename']))
{ {
if (function_exists('exif_read_data') && function_exists('imagerotate')) if (function_exists('exif_read_data') && function_exists('imagerotate'))
{ {
$exif = exif_read_data($_GET['filename'], 0, true); $exif = exif_read_data($_GET['filename'], 0, true);
$ort = $exif['IFD0']['Orientation']; if (isset($exif['IFD0']) && isset($exif['IFD0']['Orientation']))
$degrees = 0; $ort = $exif['IFD0']['Orientation'];
else
$ort = 0;
switch($ort) switch($ort)
{ {
case 3: // 180 rotate right case 3: // 180 rotate right
@ -164,7 +168,7 @@ else // otherwise, generate thumbnail, send it and save it to file.
break; break;
// see http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ for more info on orientation // see http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ for more info on orientation
case 7: // flipped case 7: // flipped
$degrees = 90; $degrees = 90;
$flip = 'vertical'; $flip = 'vertical';
break; break;
case 5: // flipped case 5: // flipped
@ -215,20 +219,20 @@ else // otherwise, generate thumbnail, send it and save it to file.
flipVertical($target); flipVertical($target);
flipHorizontal($target); flipHorizontal($target);
flipVertical($target); flipVertical($target);
ImageJPEG($target,null,80);
} else {
ImageJPEG($target,null,80);
} }
ImageJPEG($target,null,80);
imagedestroy($target); imagedestroy($target);
$cachedImage = ob_get_contents(); // Get the buffer content. $cachedImage = ob_get_contents(); // Get the buffer content.
ob_end_flush();// End buffering ob_end_flush();// End buffering
$fd = fopen($thumbname, "w"); // Save buffer to disk if (is_writable(dirname($thumbname))) {
if ($fd) $fd = fopen($thumbname, "w"); // Save buffer to disk
{ if ($fd)
fwrite($fd,$cachedImage); {
fclose($fd); fwrite($fd,$cachedImage);
fclose($fd);
}
} }
} }