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

U4-7083 - filesystems, polish, fix, and back-compat

Browse Source
This commit is contained in:
Stephan
2015-09-10 14:10:45 +02:00
parent 8b612a1047
commit 3314ab026b
7 changed files with 323 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web/WebServices/SaveFileController.cs
View File

@@ -75,6 +75,11 @@ namespace Umbraco.Web.WebServices
Func<IFileService, IPartialView, bool> validate,
Func<IFileService, IPartialView, Attempt<IPartialView>> save)
{
// sanitize input - partial view names have an extension
filename = filename
.Replace('\\', '/')
.TrimStart('/');
// sharing the editor with partial views & partial view macros,
// using path prefix to differenciate,
// but the file service manages different filesystems,
@@ -85,8 +90,12 @@ namespace Umbraco.Web.WebServices
if (filename.InvariantStartsWith(pathPrefix))
filename = filename.TrimStart(pathPrefix);
if (oldname != null && oldname.InvariantStartsWith(pathPrefix))
oldname = oldname.TrimStart(pathPrefix);
if (oldname != null)
{
oldname = oldname.TrimStart('/', '\\');
if (oldname.InvariantStartsWith(pathPrefix))
oldname = oldname.TrimStart(pathPrefix);
}
var view = get(svce, oldname);
if (view == null)
@@ -187,7 +196,10 @@ namespace Umbraco.Web.WebServices
[HttpPost]
public JsonResult SaveScript(string filename, string oldName, string contents)
{
filename = filename.TrimStart('/', '\\');
// sanitize input - script names have an extension
filename = filename
.Replace('\\', '/')
.TrimStart('/');
var svce = (FileService) Services.FileService;
var script = svce.GetScriptByName(oldName);
@@ -223,7 +235,11 @@ namespace Umbraco.Web.WebServices
[HttpPost]
public JsonResult SaveStylesheet(string filename, string oldName, string contents)
{
filename = filename.TrimStart('/', '\\').EnsureEndsWith(".css");
// sanitize input - stylesheet names have no extension
filename = filename
.Replace('\\', '/')
.TrimStart('/')
.EnsureEndsWith(".css");
var svce = (FileService) Services.FileService;
var stylesheet = svce.GetStylesheetByName(oldName);