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

Merge

Browse source
This commit is contained in:
Virtuworks 2013-11-12 07:05:47 -05:00
commit 0b45632700
12 changed files with 582 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -5358,5 +5358,7 @@
</data>
<data name="ResourceGroup.RDS" xml:space="preserve">
<value>Remote Desktop Services</value>
<data name="Warning.WEB_SITE_IS_NOT_CREATED" xml:space="preserve">
<value>Website is not created</value>
</data>
</root>

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

@ -35,6 +35,18 @@ namespace WebsitePanel.Portal.ExchangeServer
{
public partial class EnterpriseStorageCreateFolder : WebsitePanelModuleBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
"ItemID=" + PanelRequest.ItemID));
}
}
}
protected void btnCreate_Click(object sender, EventArgs e)
{
@ -42,6 +54,21 @@ namespace WebsitePanel.Portal.ExchangeServer
return;
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))
{
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
}
ResultObject result = ES.Services.EnterpriseStorage.CreateEnterpriseFolder(PanelRequest.ItemID, txtFolderName.Text);
if (!result.IsSuccess && result.ErrorCodes.Count > 0)

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

@ -49,6 +49,12 @@ namespace WebsitePanel.Portal.ExchangeServer
{
if (!IsPostBack)
{
if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
"ItemID=" + PanelRequest.ItemID));
}
BindSettings();
}
}
@ -92,25 +98,44 @@ namespace WebsitePanel.Portal.ExchangeServer
{
bool redirectNeeded = false;
string fileName = PanelRequest.FolderID;
string fileUrl = lblFolderUrl.Text;
litFolderName.Text = txtFolderName.Text;
// SystemFile folder = ES.Services.EnterpriseStorage.GetEnterpriseFolder(PanelRequest.ItemID, PanelRequest.FolderID);
SystemFile folder = new SystemFile();
SystemFile folder = null;
if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
{
ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
}
//File is renaming
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);
// file is renamed - new name and url
fileName = folder.Name;
fileUrl = folder.Url;
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)
{

11
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx.cs
View file

@ -41,7 +41,16 @@ namespace WebsitePanel.Portal.ExchangeServer
{
if (!IsPostBack)
{
BindEnterpriseStorageStats();
if (ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
{
BindEnterpriseStorageStats();
}
else
{
btnAddFolder.Enabled = false;
messageBox.ShowWarningMessage("WEB_SITE_IS_NOT_CREATED");
}
}
}