Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Removed Repository methods which are not used and are not valid because they do not adhere to tenant scope boundaries

Browse Source
This commit is contained in:
Shaun Walker
2020-02-23 10:45:32 -05:00
parent 00914208ba
commit d18b4d574a
18 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Oqtane.Server/Controllers/FileController.cs
View File

@ -145,6 +145,11 @@ namespace Oqtane.Controllers
try
{
var client = new System.Net.WebClient();
// remove file if it already exists
if (System.IO.File.Exists(folderpath + filename))
{
System.IO.File.Delete(folderpath + filename);
}
client.DownloadFile(url, folderpath + filename);
Files.AddFile(CreateFile(filename, folder.FolderId, folderpath + filename));
}
@ -260,6 +265,11 @@ namespace Oqtane.Controllers
}
else
{
// remove file if it already exists
if (System.IO.File.Exists(Path.Combine(folder, filename)))
{
System.IO.File.Delete(Path.Combine(folder, filename));
}
// rename file now that the entire process is completed
System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
@ -326,8 +336,18 @@ namespace Oqtane.Controllers
Models.File file = Files.GetFile(id);
if (file != null && UserPermissions.IsAuthorized(User, "View", file.Folder.Permissions))
{
byte[] filebytes = System.IO.File.ReadAllBytes(GetFolderPath(file.Folder) + file.Name);
return File(filebytes, "application/octet-stream", file.Name);
string filepath = GetFolderPath(file.Folder) + file.Name;
if (System.IO.File.Exists(filepath))
{
byte[] filebytes = System.IO.File.ReadAllBytes(filepath);
return File(filebytes, "application/octet-stream", file.Name);
}
else
{
logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {File}", file);
HttpContext.Response.StatusCode = 404;
return null;
}
}
else
{