lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#16864 Making invalid rename to fail.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-24 14:10:33 -08:00
parent bce90313af
commit 2652425378
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
View File

@@ -111,12 +111,13 @@ namespace Orchard.Media.Controllers {
[HttpPost, ActionName("EditProperties")]
[FormValueRequired("submit.Delete")]
public ActionResult EditPropertiesDeletePOST() {
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
var viewModel = new MediaFolderEditPropertiesViewModel();
try {
UpdateModel(viewModel);
if (!Services.Authorizer.Authorize(Permissions.ManageMediaFiles, T("Couldn't delete media folder")))
return new HttpUnauthorizedResult();
_mediaService.DeleteFolder(viewModel.MediaPath);
return RedirectToAction("Index");

6
src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
View File

@@ -83,9 +83,11 @@ namespace Orchard.Media.Services {
}
public void RenameFile(string name, string newName, string folderName) {
if (FileAllowed(newName, false)) {
_storageProvider.RenameFile(_storageProvider.Combine(folderName, name), _storageProvider.Combine(folderName, newName));
if (!FileAllowed(newName, false)) {
throw new ArgumentException("New file name " + newName + " not allowed.");
}
_storageProvider.RenameFile(_storageProvider.Combine(folderName, name), _storageProvider.Combine(folderName, newName));
}
public string UploadMediaFile(string folderName, HttpPostedFileBase postedFile) {