zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webdav portal fixes

Browse source
This commit is contained in:
vfedosevich 2015-02-26 03:27:37 -08:00
parent 682e4ac18a
commit c78570eb11
15 changed files with 177 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
View file

@ -84,7 +84,9 @@ namespace WebsitePanel.WebDavPortal.Controllers
{
var resource = _webdavManager.GetResource(pathPart);
return new FileStreamResult(resource.GetReadStream(), resource.ContentType);
var mimeType = _openerManager.GetMimeType(Path.GetExtension(pathPart));
return new FileStreamResult(resource.GetReadStream(), mimeType);
}
try
@ -347,6 +349,11 @@ namespace WebsitePanel.WebDavPortal.Controllers
break;
}
}
if (Request.Browser.IsMobileDevice)
{
item.IsTargetBlank = false;
}
}
}
}

49
WebsitePanel/Sources/WebsitePanel.WebDavPortal/FileOperations/FileOpenerManager.cs
View file

@ -2,6 +2,7 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Mime;
using System.Web;
using System.Web.Mvc;
using WebsitePanel.WebDav.Core;
@ -14,12 +15,21 @@ namespace WebsitePanel.WebDavPortal.FileOperations
{
public class FileOpenerManager
{
private readonly IDictionary<string, FileOpenerType> _officeOperationTypes = new Dictionary<string, FileOpenerType>();
private readonly IDictionary<string, FileOpenerType> _operationTypes = new Dictionary<string, FileOpenerType>();
public FileOpenerManager()
{
if (WebDavAppConfigManager.Instance.OfficeOnline.IsEnabled)
_operationTypes.AddRange(WebDavAppConfigManager.Instance.OfficeOnline.ToDictionary(x => x.Extension, y => FileOpenerType.OfficeOnline));
{
_officeOperationTypes.AddRange(
WebDavAppConfigManager.Instance.OfficeOnline.ToDictionary(x => x.Extension,
y => FileOpenerType.OfficeOnline));
}
_operationTypes.AddRange(
WebDavAppConfigManager.Instance.FileOpener.ToDictionary(x => x.Extension,
y => FileOpenerType.Open));
}
public string GetUrl(IHierarchyItem item, UrlHelper urlHelper)
@ -48,14 +58,35 @@ namespace WebsitePanel.WebDavPortal.FileOperations
public bool GetIsTargetBlank(IHierarchyItem item)
{
var opener = this[Path.GetExtension(item.DisplayName)];
var result = false;
switch (opener)
{
case FileOpenerType.OfficeOnline:
return true;
default:
return false;
{
result = true;
break;
}
case FileOpenerType.Open:
{
result = true;
break;
}
}
return result;
}
public string GetMimeType(string extension)
{
var opener = WebDavAppConfigManager.Instance.FileOpener.FirstOrDefault(x => x.Extension.ToLowerInvariant() == extension.ToLowerInvariant());
if (opener == null)
{
return MediaTypeNames.Application.Octet;
}
return opener.MimeType;
}
public FileOpenerType this[string fileExtension]
@ -63,8 +94,16 @@ namespace WebsitePanel.WebDavPortal.FileOperations
get
{
FileOpenerType result;
if (_operationTypes.TryGetValue(fileExtension, out result) && CheckBrowserSupport())
if (_officeOperationTypes.TryGetValue(fileExtension, out result) && CheckBrowserSupport())
{
return result;
}
if (_operationTypes.TryGetValue(fileExtension, out result))
{
return result;
}
return FileOpenerType.Download;
}
}

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/FileOperations/FileOpenerType.cs
View file

@ -2,6 +2,6 @@
{
public enum FileOpenerType
{
Download, OfficeOnline
Download, OfficeOnline, Open
}
}

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
View file

@ -43,8 +43,7 @@ namespace WebsitePanel.WebDavPortal.Mapping.Profiles.Webdav
.ForMember(ti => ti.IconHref, x => x.MapFrom(hi => hi.ItemType == ItemType.Folder ? WebDavAppConfigManager.Instance.FileIcons.FolderPath.Trim('~') : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(hi.DisplayName.Trim('/'))].Trim('~')))
.ForMember(ti => ti.IsTargetBlank, x => x.MapFrom(hi => openerManager.GetIsTargetBlank(hi)))
.ForMember(ti => ti.LastModified, x => x.MapFrom(hi => hi.LastModified))
.ForMember(ti => ti.LastModifiedFormated,
x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
.ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
.ForMember(ti => ti.Size, x => x.MapFrom(hi => hi.ContentLength))
.ForMember(ti => ti.IsFolder, x => x.MapFrom(hi => hi.ItemType == ItemType.Folder));

13
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
View file

@ -1,4 +1,5 @@
@using WebsitePanel.WebDav.Core
@using System.Net.Mime
@using WebsitePanel.WebDav.Core
@using WebsitePanel.WebDav.Core.Client
@using WebsitePanel.WebDav.Core.Config
@using WebsitePanel.WebDavPortal.FileOperations
@ -11,7 +12,8 @@
@{
string actualPath = Model.ItemType == ItemType.Folder ? "~/Content/Images/folder_100x100.png" : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(Model.DisplayName.Trim('/'))];
string name = Model.DisplayName.Trim('/');
var opener = new FileOpenerManager()[Path.GetExtension(Model.DisplayName)];
var _opener = new FileOpenerManager();
var opener = _opener[Path.GetExtension(Model.DisplayName)];
bool isTargetBlank;
string href = "/";
switch (opener)
@ -31,6 +33,13 @@
bool showStatistic = Model.ItemType == ItemType.Folder && Model.IsRootItem && resource != null;
var contentTypeProperty = Model.Properties.FirstOrDefault(x => x.Name.Name == "getcontenttype");
if (isTargetBlank == false && Model.ItemType != ItemType.Folder)
{
isTargetBlank = _opener.GetIsTargetBlank(Model) && !Request.Browser.IsMobileDevice;
}
int percent = 0;
if (showStatistic)

7
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
View file

@ -92,6 +92,13 @@
<add extension=".ppt" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;"/>
<add extension=".pptx" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?PowerPointView=EditView&amp;" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;"/>
</officeOnline>
<typeOpener>
<add extension=".jpg" mimeType="image/jpeg" isTargetBlank="true" />
<add extension=".jpeg" mimeType="image/jpeg" isTargetBlank="true" />
<add extension=".gif" mimeType="image/gif" isTargetBlank="true" />
<add extension=".txt" mimeType="text/plain" isTargetBlank="true" />
<add extension=".pdf" mimeType="application/pdf" isTargetBlank="true" />
</typeOpener>
</webDavExplorerConfigurationSettings>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.