arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add exif function detection. The server fails silently otherwise.

Browse Source
This commit is contained in:
Mirko 2018-06-25 22:29:46 -07:00
parent 2a8b1f9ec2
commit 239de71bd9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
php/Modules/Photo.php
View File

@ -42,7 +42,6 @@ final class Photo {
* @return string|false ID of the added photo.
*/
public function add(array $files, $albumID = 0, $returnOnError = false) {
// Check permissions
if (hasPermissions(LYCHEE_UPLOADS)===false||
hasPermissions(LYCHEE_UPLOADS_BIG)===false||
@ -85,6 +84,7 @@ final class Photo {
}
// Only process the first photo in the array
$file = $files[0];
@ -131,8 +131,15 @@ final class Photo {
Response::error('Photo format not supported!');
}
// Verify image
$type = @exif_imagetype($file['tmp_name']);
// Verify image
if (!function_exists("exif_imagetype")) {
Log::error(Database::get(), __METHOD__, __LINE__, 'EXIF library not loaded. Make sure exif is enabled in php.ini');
if ($returnOnError===true) return false;
Response::error('EXIF library not loaded on the server!');
}
$type = @exif_imagetype($file['tmp_name']);
if (!in_array($type, self::$validTypes, true)) {
Log::error(Database::get(), __METHOD__, __LINE__, 'Photo type not supported');
if ($returnOnError===true) return false;