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

Fixed not persisting IIS7 settings

Browse source 
PArtial checkin litigation hold
Fixed HideQuota enforce in space resources overview
This commit is contained in:
robvde 2013-01-05 10:31:06 +04:00
parent 97bb7eeddd
commit 7ce43121db
4 changed files with 82 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

49
WebsitePanel/Database/update_db.sql
View file

@ -267,3 +267,52 @@ GO
ALTER PROCEDURE [dbo].[UpdateServiceProperties]
(
@ServiceID int,
@Xml ntext
)
AS
-- delete old properties
BEGIN TRAN
DECLARE @idoc int
--Create an internal representation of the XML document.
EXEC sp_xml_preparedocument @idoc OUTPUT, @xml
-- Execute a SELECT statement that uses the OPENXML rowset provider.
DELETE FROM ServiceProperties
WHERE ServiceID = @ServiceID
AND PropertyName COLLATE Latin1_General_CI_AS IN
(
SELECT PropertyName
FROM OPENXML(@idoc, '/properties/property', 1)
WITH (PropertyName nvarchar(50) '@name')
)
INSERT INTO ServiceProperties
(
ServiceID,
PropertyName,
PropertyValue
)
SELECT
@ServiceID,
PropertyName,
PropertyValue
FROM OPENXML(@idoc, '/properties/property',1) WITH
(
PropertyName nvarchar(50) '@name',
PropertyValue nvarchar(1000) '@value'
) as PV
-- remove document
exec sp_xml_removedocument @idoc
COMMIT TRAN
RETURN
GO

6
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs
View file

@ -5060,9 +5060,9 @@ namespace WebsitePanel.Providers.HostedSolution
string path = AddADPrefix(id);
Command cmd = new Command("Update-OfflineAddressBook");
cmd.Parameters.Add("Identity", id);
ExecuteShellCommand(runSpace, cmd);
//Command cmd = new Command("Update-OfflineAddressBook");
//cmd.Parameters.Add("Identity", id);
//ExecuteShellCommand(runSpace, cmd);
AdjustADSecurity(path, securityGroup, true);

29
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2010.cs
View file

@ -214,12 +214,6 @@ namespace WebsitePanel.Providers.HostedSolution
uint? itemCount = (uint?)GetPSObjectProperty(statistics, "ItemCount");
info.TotalItems = ConvertNullableToInt32(itemCount);
totalItemSize = (Unlimited<ByteQuantifiedSize>)GetPSObjectProperty(statistics, "FolderAndSubfolderSize");
info.LitigationHoldTotalSize = ConvertUnlimitedToBytes(totalItemSize);
itemCount = (uint?)GetPSObjectProperty(statistics, "ItemsInFolder");
info.LitigationHoldTotalItems = ConvertNullableToInt32(itemCount);
DateTime? lastLogoffTime = (DateTime?)GetPSObjectProperty(statistics, "LastLogoffTime");
DateTime? lastLogonTime = (DateTime?)GetPSObjectProperty(statistics, "LastLogonTime");
@ -233,6 +227,29 @@ namespace WebsitePanel.Providers.HostedSolution
info.LastLogoff = DateTime.MinValue;
info.LastLogon = DateTime.MinValue;
}
if (info.LitigationHoldEnabled)
{
cmd = new Command("Get-MailboxFolderStatistics");
cmd.Parameters.Add("FolderScope", "RecoverableItems");
cmd.Parameters.Add("Identity", id);
result = ExecuteShellCommand(runSpace, cmd);
if (result.Count > 0)
{
PSObject statistics = result[0];
Unlimited<ByteQuantifiedSize> totalItemSize = (Unlimited<ByteQuantifiedSize>)GetPSObjectProperty(statistics, "FolderAndSubfolderSize");
info.LitigationHoldTotalSize = ConvertUnlimitedToBytes(totalItemSize);
uint? itemCount = (uint?)GetPSObjectProperty(statistics, "ItemsInFolder");
info.LitigationHoldTotalItems = ConvertNullableToInt32(itemCount);
}
}
else
{
info.LitigationHoldTotalSize = 0;
info.LitigationHoldTotalItems = 0;
}
}
finally
{

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
View file

@ -275,7 +275,12 @@ namespace WebsitePanel.Portal.ProviderControls
// Helicon Ape
bool registerHeliconApeGlobbally = chkHeliconApeGlobalRegistration.Checked;
if (registerHeliconApeGlobbally != (bool)ViewState["HeliconApeInitiallyEnabled"])
bool bHeliconApeInitiallyEnabled = false;
if (ViewState["HeliconApeInitiallyEnabled"] != null)
bHeliconApeInitiallyEnabled = (bool)ViewState["HeliconApeInitiallyEnabled"];
if (registerHeliconApeGlobbally != bHeliconApeInitiallyEnabled)
{
if (registerHeliconApeGlobbally)
{
@ -286,8 +291,8 @@ namespace WebsitePanel.Portal.ProviderControls
ES.Services.WebServers.DisableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"]));
}
}
if (WDeployEnabledCheckBox.Checked)
{