yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes image upload extensions

Browse Source 
filters out disallowed
converts images to mediaType=image
everything else type = file
This commit is contained in:
perploug
2013-09-27 12:23:12 +02:00
parent 0c8a7f3466
commit 540a28ea8b
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web/Editors/MediaController.cs
View File

@@ -29,6 +29,7 @@ using Umbraco.Web.WebApi.Filters;
using umbraco;
using umbraco.BusinessLogic.Actions;
using Constants = Umbraco.Core.Constants;
using Umbraco.Core.Configuration;
namespace Umbraco.Web.Editors
{
@@ -347,16 +348,24 @@ namespace Umbraco.Web.Editors
foreach (var file in result.FileData)
{
var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' });
var ext = fileName.Substring(fileName.LastIndexOf('.')+1).ToLower();
var mediaService = ApplicationContext.Services.MediaService;
var f = mediaService.CreateMedia(fileName, parentId, Constants.Conventions.MediaTypes.Image);
using (var fs = System.IO.File.OpenRead(file.LocalFileName))
if (!UmbracoConfig.For.UmbracoSettings().Content.DisallowedUploadFiles.Contains(ext))
{
f.SetValue(Constants.Conventions.Media.File, fileName, fs);
}
var mediaType = Constants.Conventions.MediaTypes.File;
mediaService.Save(f);
if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.Contains(ext))
mediaType = Constants.Conventions.MediaTypes.Image;
var mediaService = ApplicationContext.Services.MediaService;
var f = mediaService.CreateMedia(fileName, parentId, mediaType);
using (var fs = System.IO.File.OpenRead(file.LocalFileName))
{
f.SetValue(Constants.Conventions.Media.File, fileName, fs);
}
mediaService.Save(f);
}
//now we can remove the temp file
System.IO.File.Delete(file.LocalFileName);