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 2014-04-13 16:13:29 -04:00
commit a515c9a68c
116 changed files with 198344 additions and 6475 deletions
Download patch file Download diff file Expand all files Collapse all files

32
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esCRM.asmx.cs
View file

@ -48,24 +48,34 @@ namespace WebsitePanel.EnterpriseServer
{
[WebMethod]
public OrganizationResult CreateOrganization(int organizationId, string baseCurrencyCode, string baseCurrencyName, string baseCurrencySymbol, string regionName, int userId, string collation)
public OrganizationResult CreateOrganization(int organizationId, string baseCurrencyCode, string baseCurrencyName, string baseCurrencySymbol, string regionName, int userId, string collation, int baseLanguageCode)
{
return CRMController.CreateOrganization(organizationId, baseCurrencyCode, baseCurrencyName, baseCurrencySymbol, regionName, userId, collation);
return CRMController.CreateOrganization(organizationId, baseCurrencyCode, baseCurrencyName, baseCurrencySymbol, regionName, userId, collation, baseLanguageCode);
}
[WebMethod]
public StringArrayResultObject GetCollation(int packageId)
{
return CRMController.GetCollationNames(packageId);
return CRMController.GetCollation(packageId);
}
[WebMethod]
public StringArrayResultObject GetCollationByServiceId(int serviceId)
{
return CRMController.GetCollationByServiceId(serviceId);
}
[WebMethod]
public CurrencyArrayResultObject GetCurrency(int packageId)
{
return CRMController.GetCurrency(packageId);
}
[WebMethod]
public CurrencyArrayResultObject GetCurrencyByServiceId(int serviceId)
{
return CRMController.GetCurrencyByServiceId(serviceId);
}
[WebMethod]
public ResultObject DeleteCRMOrganization(int organizationId)
@ -149,5 +159,17 @@ namespace WebsitePanel.EnterpriseServer
return CRMController.GetMaxDBSize(itemId, packageId);
}
[WebMethod]
public int[] GetInstalledLanguagePacks(int packageId)
{
return CRMController.GetInstalledLanguagePacks(packageId);
}
[WebMethod]
public int[] GetInstalledLanguagePacksByServiceId(int serviceId)
{
return CRMController.GetInstalledLanguagePacksByServiceId(serviceId);
}
}
}

72
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
View file

@ -166,11 +166,11 @@ namespace WebsitePanel.EnterpriseServer
[WebMethod]
public ExchangeAccountsPaged GetAccountsPaged(int itemId, string accountTypes,
string filterColumn, string filterValue, string sortColumn,
int startRow, int maximumRows)
int startRow, int maximumRows, bool archiving)
{
return ExchangeServerController.GetAccountsPaged(itemId, accountTypes,
filterColumn, filterValue, sortColumn,
startRow, maximumRows);
startRow, maximumRows, archiving);
}
[WebMethod]
@ -222,9 +222,9 @@ namespace WebsitePanel.EnterpriseServer
#region Mailboxes
[WebMethod]
public int CreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName,
string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber)
string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber)
{
return ExchangeServerController.CreateMailbox(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, subscriberNumber);
return ExchangeServerController.CreateMailbox(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, archivedPlanId, subscriberNumber);
}
[WebMethod]
@ -303,9 +303,9 @@ namespace WebsitePanel.EnterpriseServer
[WebMethod]
public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId)
public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, int archivePlanId)
{
return ExchangeServerController.SetExchangeMailboxPlan(itemId, accountId, mailboxPlanId);
return ExchangeServerController.SetExchangeMailboxPlan(itemId, accountId, mailboxPlanId, archivePlanId);
}
[WebMethod]
@ -527,9 +527,9 @@ namespace WebsitePanel.EnterpriseServer
#region MailboxPlans
[WebMethod]
public List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId)
public List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId, bool archiving)
{
return ExchangeServerController.GetExchangeMailboxPlans(itemId);
return ExchangeServerController.GetExchangeMailboxPlans(itemId, archiving);
}
[WebMethod]
@ -549,8 +549,7 @@ namespace WebsitePanel.EnterpriseServer
{
return ExchangeServerController.UpdateExchangeMailboxPlan(itemId, mailboxPlan);
}
[WebMethod]
public int DeleteExchangeMailboxPlan(int itemId, int mailboxPlanId)
{
@ -565,6 +564,59 @@ namespace WebsitePanel.EnterpriseServer
#endregion
#region Exchange Retention Policy Tags
[WebMethod]
public List<ExchangeRetentionPolicyTag> GetExchangeRetentionPolicyTags(int itemId)
{
return ExchangeServerController.GetExchangeRetentionPolicyTags(itemId);
}
[WebMethod]
public ExchangeRetentionPolicyTag GetExchangeRetentionPolicyTag(int itemId, int tagId)
{
return ExchangeServerController.GetExchangeRetentionPolicyTag(itemId, tagId);
}
[WebMethod]
public int AddExchangeRetentionPolicyTag(int itemId, ExchangeRetentionPolicyTag tag)
{
return ExchangeServerController.AddExchangeRetentionPolicyTag(itemId, tag);
}
[WebMethod]
public int UpdateExchangeRetentionPolicyTag(int itemId, ExchangeRetentionPolicyTag tag)
{
return ExchangeServerController.UpdateExchangeRetentionPolicyTag(itemId, tag);
}
[WebMethod]
public int DeleteExchangeRetentionPolicyTag(int itemId, int tagId)
{
return ExchangeServerController.DeleteExchangeRetentionPolicyTag(itemId, tagId);
}
[WebMethod]
public List<ExchangeMailboxPlanRetentionPolicyTag> GetExchangeMailboxPlanRetentionPolicyTags(int policyId)
{
return ExchangeServerController.GetExchangeMailboxPlanRetentionPolicyTags(policyId);
}
[WebMethod]
public int AddExchangeMailboxPlanRetentionPolicyTag(int itemId, ExchangeMailboxPlanRetentionPolicyTag planTag)
{
return ExchangeServerController.AddExchangeMailboxPlanRetentionPolicyTag(itemId, planTag);
}
[WebMethod]
public int DeleteExchangeMailboxPlanRetentionPolicyTag(int itemId, int planTagId)
{
return ExchangeServerController.DeleteExchangeMailboxPlanRetentionPolicyTag(itemId, planTagId);
}
#endregion
#region Public Folders
[WebMethod]