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

bug fixes

Browse source
This commit is contained in:
vfedosevich 2013-11-12 10:37:09 +03:00
parent 2af6f848bb
commit eec6e2fb8d
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx.cs
View file

@ -54,6 +54,16 @@ namespace WebsitePanel.Portal.ExchangeServer
return; return;
try try
{ {
foreach (var invalidChar in System.IO.Path.GetInvalidFileNameChars())
{
if (txtFolderName.Text.Contains(invalidChar.ToString()))
{
messageBox.ShowErrorMessage("FILES_CREATE_FILE");
return;
}
}
if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID)) if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
{ {
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID); ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);

23
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs
View file

@ -98,6 +98,9 @@ namespace WebsitePanel.Portal.ExchangeServer
{ {
bool redirectNeeded = false; bool redirectNeeded = false;
string fileName = PanelRequest.FolderID;
string fileUrl = lblFolderUrl.Text;
litFolderName.Text = txtFolderName.Text; litFolderName.Text = txtFolderName.Text;
SystemFile folder = null; SystemFile folder = null;
@ -107,20 +110,32 @@ namespace WebsitePanel.Portal.ExchangeServer
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID); ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
} }
//File is renaming
if (PanelRequest.FolderID != txtFolderName.Text) if (PanelRequest.FolderID != txtFolderName.Text)
{ {
if (txtFolderName.Text.Contains("\\")) //check if filename is correct
foreach (var invalidChar in System.IO.Path.GetInvalidFileNameChars())
{ {
throw new Exception("Wrong file name"); if (txtFolderName.Text.Contains(invalidChar.ToString()))
{
messageBox.ShowErrorMessage("FILES_RENAME_FILE");
return;
}
} }
folder = ES.Services.EnterpriseStorage.RenameEnterpriseFolder(PanelRequest.ItemID, PanelRequest.FolderID, txtFolderName.Text); folder = ES.Services.EnterpriseStorage.RenameEnterpriseFolder(PanelRequest.ItemID, PanelRequest.FolderID, txtFolderName.Text);
// file is renamed - new name and url
fileName = folder.Name;
fileUrl = folder.Url;
redirectNeeded = true; redirectNeeded = true;
} }
ES.Services.EnterpriseStorage.SetEnterpriseFolderPermissions(PanelRequest.ItemID, redirectNeeded ? folder.Name : PanelRequest.FolderID, permissions.GetPemissions()); ES.Services.EnterpriseStorage.SetEnterpriseFolderPermissions(PanelRequest.ItemID, fileName, permissions.GetPemissions());
ES.Services.WebServers.SetDirectoryBrowseEnabled(PanelRequest.ItemID, redirectNeeded ? folder.Url : lblFolderUrl.Text, chkDirectoryBrowsing.Checked); ES.Services.WebServers.SetDirectoryBrowseEnabled(PanelRequest.ItemID, fileUrl, chkDirectoryBrowsing.Checked);
if (redirectNeeded) if (redirectNeeded)
{ {