Fixed not persisting IIS7 settings

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

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

View file

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

View file

@ -214,12 +214,6 @@ namespace WebsitePanel.Providers.HostedSolution
uint? itemCount = (uint?)GetPSObjectProperty(statistics, "ItemCount"); uint? itemCount = (uint?)GetPSObjectProperty(statistics, "ItemCount");
info.TotalItems = ConvertNullableToInt32(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? lastLogoffTime = (DateTime?)GetPSObjectProperty(statistics, "LastLogoffTime");
DateTime? lastLogonTime = (DateTime?)GetPSObjectProperty(statistics, "LastLogonTime"); DateTime? lastLogonTime = (DateTime?)GetPSObjectProperty(statistics, "LastLogonTime");
@ -233,6 +227,29 @@ namespace WebsitePanel.Providers.HostedSolution
info.LastLogoff = DateTime.MinValue; info.LastLogoff = DateTime.MinValue;
info.LastLogon = 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 finally
{ {

View file

@ -275,7 +275,12 @@ namespace WebsitePanel.Portal.ProviderControls
// Helicon Ape // Helicon Ape
bool registerHeliconApeGlobbally = chkHeliconApeGlobalRegistration.Checked; 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) if (registerHeliconApeGlobbally)
{ {
@ -286,8 +291,8 @@ namespace WebsitePanel.Portal.ProviderControls
ES.Services.WebServers.DisableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"])); ES.Services.WebServers.DisableHeliconApeGlobally(int.Parse(Request.QueryString["ServiceID"]));
} }
} }
if (WDeployEnabledCheckBox.Checked) if (WDeployEnabledCheckBox.Checked)
{ {