diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs index 6635c5f9..076cb1e3 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs @@ -33,6 +33,10 @@ namespace WebsitePanel.WebDav.Core.Entities.Owa public string DownloadUrl { get; set; } [DataMember] public bool ReadOnly { get; set; } + [DataMember] + public bool RestrictedWebViewOnly { get; set; } + [DataMember] + public string ClientUrl { get; set; } //[DataMember] //public bool UserCanNotWriteRelative { get; set; } @@ -100,8 +104,7 @@ namespace WebsitePanel.WebDav.Core.Entities.Owa //public bool ProtectInClient { get; set; } //[DataMember] //public bool ReadOnly { get; set; } - //[DataMember] - //public bool RestrictedWebViewOnly { get; set; } + //[DataMember] //public string SignoutUrl { get; set; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs index d5b4bd8d..547f930c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs @@ -38,7 +38,7 @@ namespace WebsitePanel.WebDav.Core.Owa var cFileInfo = new CheckFileInfo { - BaseFileName = resource.DisplayName, + BaseFileName = resource.DisplayName.Split(new []{'/'},StringSplitOptions.RemoveEmptyEntries).LastOrDefault(), OwnerId = WspContext.User.Login, Size = resource.ContentLength, Version = DateTime.Now.ToString("s"), @@ -50,7 +50,8 @@ namespace WebsitePanel.WebDav.Core.Owa SupportsSecureStore = false, SupportsUpdate = true, UserCanWrite = !readOnly, - ReadOnly = readOnly + ReadOnly = readOnly, + RestrictedWebViewOnly = false }; return cFileInfo; diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs index 950be3f9..633a9fda 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs @@ -60,6 +60,7 @@ namespace WebsitePanel.WebDavPortal.Controllers.Api var url = new Uri(Request.RequestUri, urlPart).ToString(); fileInfo.DownloadUrl = url; + fileInfo.ClientUrl = _webDavManager.GetFileUrl(token.FilePath); return fileInfo; }