merge commit

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

View file

@ -37,7 +37,9 @@ namespace WebsitePanel.Providers.HostedSolution
bool CheckAccountCredentials(string username, string password);
// Organizations
string CreateMailEnableUser(string upn, string organizationId, string organizationDistinguishedName, ExchangeAccountType accountType,
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,
@ -74,6 +76,8 @@ namespace WebsitePanel.Providers.HostedSolution
void SetMailboxPermissions(string organizationId, string accountName, string[] sendAsAccounts, string[] fullAccessAccounts);
ExchangeMailbox GetMailboxPermissions(string organizationId, string accountName);
ExchangeMailboxStatistics GetMailboxStatistics(string accountName);
string[] SetDefaultPublicFolderMailbox(string id, string organizationId, string organizationDistinguishedName);
// Contacts
void CreateContact(string organizationId, string organizationDistinguishedName, string contactDisplayName, string contactAccountName, string contactEmail, string defaultOrganizationDomain);
@ -113,6 +117,8 @@ namespace WebsitePanel.Providers.HostedSolution
ExchangeItemStatistics[] GetPublicFoldersStatistics(string organizationId, string[] folders);
string[] GetPublicFoldersRecursive(string organizationId, string parent);
long GetPublicFolderSize(string organizationId, string folder);
string CreateOrganizationRootPublicFolder(string organizationId, string organizationDistinguishedName, string securityGroup, string organizationDomain);
//ActiveSync
void CreateOrganizationActiveSyncPolicy(string organizationId);

View file

@ -63,6 +63,7 @@ namespace WebsitePanel.Providers.Web
private bool heliconApeInstalled;
private bool heliconApeEnabled;
private HeliconApeStatus heliconApeStatus;
private bool sniEnabled;
public WebSite()
{
@ -187,6 +188,12 @@ namespace WebsitePanel.Providers.Web
get { return this.heliconApeStatus; }
set { this.heliconApeStatus = value; }
}
public bool SniEnabled
{
get { return this.sniEnabled; }
set { this.sniEnabled = value; }
}
}
[Flags]