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

webdav protal bugs fixe

Browse source
This commit is contained in:
vfedosevich 2015-01-16 06:22:46 -08:00
parent 2beacef40e
commit 67aab39780
5 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
View file

@ -48,7 +48,7 @@ namespace WebsitePanel.WebDav.Core.Managers
_cryptography.Decrypt(WspContext.User.EncryptedPassword),
WebDavAppConfigManager.Instance.UserDomain);
_currentFolder = _webDavSession.OpenFolder(string.Format("{0}{1}/{2}",WebDavAppConfigManager.Instance.WebdavRoot, WspContext.User.OrganizationId , pathPart));
_currentFolder = _webDavSession.OpenFolder(string.Format("{0}{1}/{2}", WebDavAppConfigManager.Instance.WebdavRoot, WspContext.User.OrganizationId, pathPart));
}
children = _currentFolder.GetChildren();
@ -73,9 +73,15 @@ namespace WebsitePanel.WebDav.Core.Managers
OpenFolder(folder);
IResource resource = _currentFolder.GetResource(resourceName);
try
{
IResource resource = _currentFolder.GetResource(resourceName);
return resource.ItemType == ItemType.Resource;
return true;
}
catch (Exception e){}
return false;
}
@ -180,6 +186,8 @@ namespace WebsitePanel.WebDav.Core.Managers
private string GetFileFolder(string path)
{
path = path.TrimEnd('/');
if (string.IsNullOrEmpty(path) || !path.Contains('/'))
{
return string.Empty;
@ -187,13 +195,15 @@ namespace WebsitePanel.WebDav.Core.Managers
string fileName = path.Split('/').Last();
int index = path.LastIndexOf(fileName, StringComparison.InvariantCultureIgnoreCase);
string folder = path.Remove(index - 1, fileName.Length + 1);
string folder = string.IsNullOrEmpty(fileName)? path : path.Remove(index - 1, fileName.Length + 1);
return folder;
}
private string GetResourceName(string path)
{
path = path.TrimEnd('/');
if (string.IsNullOrEmpty(path) || !path.Contains('/'))
{
return string.Empty;