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

merge commit

Browse source
This commit is contained in:
robvde 2014-11-03 10:47:49 +08:00
commit 0b7831549d
41 changed files with 7095 additions and 4821 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,9 @@ namespace WebsitePanel.Server
}
[WebMethod, SoapHeader("settings")]
public string CreateMailEnableUser(string upn, string organizationId, string organizationDistinguishedName, ExchangeAccountType accountType,
public string CreateMailEnableUser(string upn, string organizationId, string organizationDistinguishedName,
string securityGroup, string organizationDomain,
ExchangeAccountType accountType,
string mailboxDatabase, string offlineAddressBook, string addressBookPolicy,
string accountName, bool enablePOP, bool enableIMAP,
bool enableOWA, bool enableMAPI, bool enableActiveSync,
@ -100,7 +102,9 @@ namespace WebsitePanel.Server
try
{
LogStart("CreateMailEnableUser");
string ret = ES.CreateMailEnableUser(upn, organizationId, organizationDistinguishedName, accountType,
string ret = ES.CreateMailEnableUser(upn, organizationId, organizationDistinguishedName,
securityGroup, organizationDomain,
accountType,
mailboxDatabase, offlineAddressBook, addressBookPolicy,
accountName, enablePOP, enableIMAP,
enableOWA, enableMAPI, enableActiveSync,
@ -556,6 +560,24 @@ namespace WebsitePanel.Server
}
}
[WebMethod, SoapHeader("settings")]
public string[] SetDefaultPublicFolderMailbox(string id, string organizationId, string organizationDistinguishedName)
{
try
{
LogStart("SetDefaultPublicFolderMailbox");
string[] ret = ES.SetDefaultPublicFolderMailbox(id, organizationId, organizationDistinguishedName);
LogEnd("SetDefaultPublicFolderMailbox");
return ret;
}
catch (Exception ex)
{
Log.WriteError("SetDefaultPublicFolderMailbox", ex);
throw;
}
}
#endregion
#region Contacts
@ -1084,6 +1106,23 @@ namespace WebsitePanel.Server
throw;
}
}
[WebMethod, SoapHeader("settings")]
public string CreateOrganizationRootPublicFolder(string organizationId, string organizationDistinguishedName, string securityGroup, string organizationDomain)
{
try
{
LogStart("CreateOrganizationRootPublicFolder");
string ret = ES.CreateOrganizationRootPublicFolder(organizationId, organizationDistinguishedName, securityGroup, organizationDomain);
LogEnd("CreateOrganizationRootPublicFolder");
return ret;
}
catch (Exception ex)
{
Log.WriteError("CreateOrganizationRootPublicFolder", ex);
throw;
}
}
#endregion