From f35589075705ec9b48ebc76de6a355a35bafd66e Mon Sep 17 00:00:00 2001 From: Dominik Sust Date: Fri, 29 Jan 2016 13:31:56 +0100 Subject: [PATCH 1/2] Added SVG image support for uploads --- bl-kernel/admin/themes/default/init.php | 2 +- bl-kernel/ajax/uploader.php | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bl-kernel/admin/themes/default/init.php b/bl-kernel/admin/themes/default/init.php index 5b271e07..9054ccce 100644 --- a/bl-kernel/admin/themes/default/init.php +++ b/bl-kernel/admin/themes/default/init.php @@ -489,7 +489,7 @@ $(document).ready(function() { { type: "json", action: HTML_PATH_ADMIN_ROOT+"ajax/uploader", - allow : "*.(jpg|jpeg|gif|png)", + allow : "*.(jpg|jpeg|gif|png|svg)", params: {"type":"bludit-images-v8"}, loadstart: function() { diff --git a/bl-kernel/ajax/uploader.php b/bl-kernel/ajax/uploader.php index dbb626e0..f61b070c 100644 --- a/bl-kernel/ajax/uploader.php +++ b/bl-kernel/ajax/uploader.php @@ -47,11 +47,18 @@ if($type=='profilePicture') else { // Generate the thumbnail $Image = new Image(); - $Image->setImage(PATH_TMP.'original'.'.'.$fileExtension, THUMBNAILS_WIDTH, THUMBNAILS_HEIGHT, 'crop'); - $Image->saveImage(PATH_UPLOADS_THUMBNAILS.$tmpName, 100, true); - + //Handling all other formats than svg + if (strcasecmp($fileExtension, 'svg') != 0) { + $Image->setImage(PATH_TMP.'original'.'.'.$fileExtension, THUMBNAILS_WIDTH, THUMBNAILS_HEIGHT, 'crop'); + $Image->saveImage(PATH_UPLOADS_THUMBNAILS.$tmpName, 100, true); + } // Move the original to the upload folder. rename(PATH_TMP.'original'.'.'.$fileExtension, PATH_UPLOADS.$tmpName); + + //If it is a svg file, just save a copy in thumbnail-folder + if (strcasecmp($fileExtension, 'svg') == 0) { + copy(PATH_UPLOADS.$tmpName, PATH_UPLOADS_THUMBNAILS.$tmpName); + } } // Remove the Bludit temporary file. From e25eefd8a8a9d4c4113e69d7c501f8e5c2499b6d Mon Sep 17 00:00:00 2001 From: HarleyDavidson86 Date: Mon, 1 Feb 2016 10:24:42 +0100 Subject: [PATCH 2/2] Update uploader.php Usage of a symlink instead of copy the SVG-file --- bl-kernel/ajax/uploader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bl-kernel/ajax/uploader.php b/bl-kernel/ajax/uploader.php index f61b070c..403ad0a1 100644 --- a/bl-kernel/ajax/uploader.php +++ b/bl-kernel/ajax/uploader.php @@ -57,7 +57,7 @@ else { //If it is a svg file, just save a copy in thumbnail-folder if (strcasecmp($fileExtension, 'svg') == 0) { - copy(PATH_UPLOADS.$tmpName, PATH_UPLOADS_THUMBNAILS.$tmpName); + symlink(PATH_UPLOADS.$tmpName, PATH_UPLOADS_THUMBNAILS.$tmpName); } } @@ -71,4 +71,4 @@ exit(json_encode(array( 'filename'=>$tmpName ))); -?> \ No newline at end of file +?>