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

wsp-10200 Domain remains in "Accepted domains" in Exchange 2010/13 environment

Browse source 
after deletion hosted organization/space from WSP

Fixed
This commit is contained in:
robvde 2014-07-13 09:44:53 +08:00
parent 24ad3c2c25
commit 4bcfe5f5cf
15 changed files with 2777 additions and 3432 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WebsitePanel/Sources/WebsitePanel.Server/EnterpriseStorage.asmx.cs
View file

@ -130,8 +130,9 @@ namespace WebsitePanel.Server
try
{
Log.WriteStart("'{0}' SetFolderWebDavRules", ProviderSettings.ProviderName);
return EnterpriseStorageProvider.SetFolderWebDavRules(organizationId, folder, setting, rules);
bool bResult = EnterpriseStorageProvider.SetFolderWebDavRules(organizationId, folder, setting, rules);
Log.WriteEnd("'{0}' SetFolderWebDavRules", ProviderSettings.ProviderName);
return bResult;
}
catch (Exception ex)
{
@ -146,8 +147,9 @@ namespace WebsitePanel.Server
try
{
Log.WriteStart("'{0}' GetFolderWebDavRules", ProviderSettings.ProviderName);
return EnterpriseStorageProvider.GetFolderWebDavRules(organizationId, folder, setting);
Providers.Web.WebDavFolderRule[] webDavFolderRule = EnterpriseStorageProvider.GetFolderWebDavRules(organizationId, folder, setting);
Log.WriteEnd("'{0}' GetFolderWebDavRules", ProviderSettings.ProviderName);
return webDavFolderRule;
}
catch (Exception ex)
{
@ -162,8 +164,9 @@ namespace WebsitePanel.Server
try
{
Log.WriteStart("'{0}' CheckFileServicesInstallation", ProviderSettings.ProviderName);
return EnterpriseStorageProvider.CheckFileServicesInstallation();
bool bResult = EnterpriseStorageProvider.CheckFileServicesInstallation();
Log.WriteEnd("'{0}' CheckFileServicesInstallation", ProviderSettings.ProviderName);
return bResult;
}
catch (Exception ex)
{
@ -178,8 +181,9 @@ namespace WebsitePanel.Server
try
{
Log.WriteStart("'{0}' RenameFolder", ProviderSettings.ProviderName);
return EnterpriseStorageProvider.RenameFolder(organizationId, originalFolder, newFolder, setting);
SystemFile systemFile = EnterpriseStorageProvider.RenameFolder(organizationId, originalFolder, newFolder, setting);
Log.WriteEnd("'{0}' RenameFolder", ProviderSettings.ProviderName);
return systemFile;
}
catch (Exception ex)
{

5
WebsitePanel/Sources/WebsitePanel.Server/ExchangeServer.asmx.cs
View file

@ -30,6 +30,7 @@ using System;
using System.ComponentModel;
using System.Web.Services;
using System.Web.Services.Protocols;
using System.Collections.Generic;
using WebsitePanel.Providers;
using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Server.Utils;
@ -197,12 +198,12 @@ namespace WebsitePanel.Server
[WebMethod, SoapHeader("settings")]
public bool DeleteOrganization(string organizationId, string distinguishedName, string globalAddressList, string addressList, string roomList, string offlineAddressBook, string securityGroup, string addressBookPolicy)
public bool DeleteOrganization(string organizationId, string distinguishedName, string globalAddressList, string addressList, string roomList, string offlineAddressBook, string securityGroup, string addressBookPolicy, List<ExchangeDomainName> acceptedDomains)
{
try
{
LogStart("DeleteOrganization");
bool ret = ES.DeleteOrganization(organizationId, distinguishedName, globalAddressList, addressList, roomList, offlineAddressBook, securityGroup, addressBookPolicy);
bool ret = ES.DeleteOrganization(organizationId, distinguishedName, globalAddressList, addressList, roomList, offlineAddressBook, securityGroup, addressBookPolicy, acceptedDomains);
LogEnd("DeleteOrganization");
return ret;
}

3
WebsitePanel/Sources/WebsitePanel.Server/OperatingSystem.asmx.cs
View file

@ -590,8 +590,9 @@ namespace WebsitePanel.Server
try
{
Log.WriteStart("'{0}' CheckFileServicesInstallation", ProviderSettings.ProviderName);
return OsProvider.CheckFileServicesInstallation();
bool bResult = OsProvider.CheckFileServicesInstallation();
Log.WriteEnd("'{0}' CheckFileServicesInstallation", ProviderSettings.ProviderName);
return bResult;
}
catch (Exception ex)
{

4
WebsitePanel/Sources/WebsitePanel.Server/WebServer.asmx.cs
View file

@ -1198,9 +1198,11 @@ namespace WebsitePanel.Server
{
Log.WriteStart("CheckLoadUserProfile");
return WebProvider.CheckLoadUserProfile();
bool bResult = WebProvider.CheckLoadUserProfile();
Log.WriteEnd("CheckLoadUserProfile");
return bResult;
}
catch (Exception ex)
{