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

merge commit, remote desktop services adjusted to new code structure

Browse source
This commit is contained in:
robvde 2013-06-22 16:43:14 +04:00
parent 03e9c7f3b6
commit 09bd65878e
4 changed files with 2003 additions and 1891 deletions
Download patch file Download diff file Expand all files Collapse all files

36
WebsitePanel/Database/update_db.sql
View file

@ -1440,3 +1440,39 @@ WHERE T.Guid = (
WHERE ScheduleID = @ScheduleID WHERE ScheduleID = @ScheduleID
AND Completed = 0 AND Status IN (1, 3)) AND Completed = 0 AND Status IN (1, 3))
GO GO
-------------------------------- Remote Desktop Services ------------------------------------------------------
IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE [GroupName] = 'Remote Desktop Services')
BEGIN
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController], [ShowGroup]) VALUES (43, N'RemoteDesktopServices', 24, N'WebsitePanel.EnterpriseServer.RemoteDesktopServicesController', 1)
END
GO
IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Remote Desktop Windows 2012')
BEGIN
INSERT [dbo].[Providers] ([ProviderId], [GroupId], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES(500, 43, N'RemoteDesktop2012', N'Remote Desktop Services Windows 2012', N'WebsitePanel.Providers.RemoteDesktopServices.Windows2012, WebsitePanel.Providers.RemoteDesktopServices.Windows2012', N'RemoteDesktopServices', 1)
END
ELSE
BEGIN
UPDATE [dbo].[Providers] SET [DisableAutoDiscovery] = NULL WHERE [DisplayName] = 'Remote Desktop Windows 2012'
END
GO
IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE [GroupName] = 'Enterprise Storage')
BEGIN
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController], [ShowGroup]) VALUES (44, N'EnterpriseStorage', 25, N'WebsitePanel.EnterpriseServer.EnterpriseStorageController', 1)
END
GO
IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Enterprise Storage Windows 2012')
BEGIN
INSERT [dbo].[Providers] ([ProviderId], [GroupId], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES(600, 44, N'EnterpriseStorage2012', N'Enterprise Storage Windows 2012', N'WebsitePanel.Providers.EnterpriseStorage.Windows2012, WebsitePanel.Providers.EnterpriseStorage.Windows2012', N'EnterpriseStorage', 1)
END
ELSE
BEGIN
UPDATE [dbo].[Providers] SET [DisableAutoDiscovery] = NULL WHERE [DisplayName] = 'Enterprise Storage Windows 2012'
END
GO

253
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
View file

@ -171,7 +171,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_ORG_STATS", itemId); TaskManager.StartTask("EXCHANGE", "GET_ORG_STATS");
TaskManager.ItemId = itemId;
try try
{ {
@ -259,7 +260,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CALCULATE_DISKSPACE", itemId); TaskManager.StartTask("EXCHANGE", "CALCULATE_DISKSPACE");
TaskManager.ItemId = itemId;
try try
{ {
@ -346,7 +348,10 @@ namespace WebsitePanel.EnterpriseServer
private static int ExtendToExchangeOrganization(ref Organization org) private static int ExtendToExchangeOrganization(ref Organization org)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CREATE_ORG", org.Name, new BackgroundTaskParameter("Organization ID", org.OrganizationId));
List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
parameters.Add(new BackgroundTaskParameter("Organization ID", org.OrganizationId));
TaskManager.StartTask("EXCHANGE", "CREATE_ORG", org.Name,parameters);
try try
{ {
@ -408,7 +413,7 @@ namespace WebsitePanel.EnterpriseServer
{ {
clientAccessRole = GetExchangeServer(id, org.ServiceId); clientAccessRole = GetExchangeServer(id, org.ServiceId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.WriteError(ex); TaskManager.WriteError(ex);
continue; continue;
@ -430,7 +435,7 @@ namespace WebsitePanel.EnterpriseServer
{ {
hubTransportRole = GetExchangeServer(id, org.ServiceId); hubTransportRole = GetExchangeServer(id, org.ServiceId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.WriteError(ex); TaskManager.WriteError(ex);
continue; continue;
@ -572,7 +577,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_ORG", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_ORG");
TaskManager.ItemId = itemId;
try try
{ {
@ -609,7 +615,8 @@ namespace WebsitePanel.EnterpriseServer
public static Organization GetOrganizationStorageLimits(int itemId) public static Organization GetOrganizationStorageLimits(int itemId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_ORG_LIMITS", itemId); TaskManager.StartTask("EXCHANGE", "GET_ORG_LIMITS");
TaskManager.ItemId = itemId;
try try
{ {
@ -633,7 +640,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_ORG_LIMITS", itemId); TaskManager.StartTask("EXCHANGE", "SET_ORG_LIMITS");
TaskManager.ItemId = itemId;
try try
{ {
@ -718,7 +726,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOXES_STATS", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOXES_STATS");
TaskManager.ItemId = itemId;
try try
{ {
@ -746,7 +755,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeMailboxStatistics GetMailboxStatistics(int itemId, int accountId) public static ExchangeMailboxStatistics GetMailboxStatistics(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_STATS", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_STATS");
TaskManager.ItemId = itemId;
try try
{ {
@ -810,7 +820,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_FOLDERS_STATS", itemId); TaskManager.StartTask("EXCHANGE", "GET_FOLDERS_STATS");
TaskManager.ItemId = itemId;
try try
{ {
@ -856,7 +867,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_ACTIVESYNC_POLICY", itemId); TaskManager.StartTask("EXCHANGE", "GET_ACTIVESYNC_POLICY");
TaskManager.ItemId = itemId;
try try
{ {
@ -907,7 +919,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_ACTIVESYNC_POLICY", itemId); TaskManager.StartTask("EXCHANGE", "SET_ACTIVESYNC_POLICY");
TaskManager.ItemId = itemId;
try try
{ {
@ -955,7 +968,7 @@ namespace WebsitePanel.EnterpriseServer
#region Demo Mode #region Demo Mode
if (IsDemoMode) if (IsDemoMode)
{ {
string []parseedAccountTypes = Utils.ParseDelimitedString(accountTypes, ','); string[] parseedAccountTypes = Utils.ParseDelimitedString(accountTypes, ',');
ExchangeAccountsPaged res = new ExchangeAccountsPaged(); ExchangeAccountsPaged res = new ExchangeAccountsPaged();
res.PageItems = GetAccounts(itemId, (ExchangeAccountType)Utils.ParseInt(parseedAccountTypes[0], 1)).ToArray(); res.PageItems = GetAccounts(itemId, (ExchangeAccountType)Utils.ParseInt(parseedAccountTypes[0], 1)).ToArray();
@ -1160,7 +1173,8 @@ namespace WebsitePanel.EnterpriseServer
public static bool CheckAccountCredentials(int itemId, string email, string password) public static bool CheckAccountCredentials(int itemId, string email, string password)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "AUTHENTICATE", email, itemId); TaskManager.StartTask("EXCHANGE", "AUTHENTICATE", email);
TaskManager.ItemId = itemId;
try try
{ {
@ -1232,7 +1246,7 @@ namespace WebsitePanel.EnterpriseServer
int counter = 0; int counter = 0;
bool bFound = false; bool bFound = false;
if (!AccountExists(accountName)) return accountName; //if (!AccountExists(accountName)) return accountName;
do do
{ {
@ -1384,7 +1398,10 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ADD_DOMAIN", itemId, new BackgroundTaskParameter("Domain ID", domainId)); List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
TaskManager.StartTask("EXCHANGE", "ADD_DOMAIN", parameters);
TaskManager.ItemId = itemId;
try try
{ {
@ -1455,12 +1472,11 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>(); List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
parameters.Add(new BackgroundTaskParameter("Domain ID", domainId)); parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
parameters.Add(new BackgroundTaskParameter("Domain Type", domainType.ToString())); parameters.Add(new BackgroundTaskParameter("Domain Type", domainType.ToString()));
TaskManager.StartTask("EXCHANGE", "CHANGE_DOMAIN_TYPE", parameters);
TaskManager.StartTask("EXCHANGE", "CHANGE_DOMAIN_TYPE", itemId, parameters); TaskManager.ItemId = itemId;
try try
{ {
@ -1515,7 +1531,10 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_DOMAIN", itemId, new BackgroundTaskParameter("Domain ID", domainId)); List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
TaskManager.StartTask("EXCHANGE", "DELETE_DOMAIN");
TaskManager.ItemId = itemId;
try try
{ {
@ -1526,7 +1545,7 @@ namespace WebsitePanel.EnterpriseServer
// load domain // load domain
DomainInfo domain = ServerController.GetDomain(domainId); DomainInfo domain = ServerController.GetDomain(domainId);
if(domain == null) if (domain == null)
return -1; return -1;
if (DataProvider.CheckDomainUsedByHostedOrganization(domain.DomainName) == 1) if (DataProvider.CheckDomainUsedByHostedOrganization(domain.DomainName) == 1)
@ -1618,8 +1637,8 @@ namespace WebsitePanel.EnterpriseServer
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CREATE_MAILBOX", itemId); TaskManager.StartTask("EXCHANGE", "CREATE_MAILBOX");
TaskManager.ItemId = itemId;
bool userCreated = false; bool userCreated = false;
Organization org = null; Organization org = null;
try try
@ -1810,7 +1829,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DISABLE_MAILBOX", itemId); TaskManager.StartTask("EXCHANGE", "DISABLE_MAILBOX");
TaskManager.ItemId = itemId;
try try
{ {
@ -1858,7 +1878,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX");
TaskManager.ItemId = itemId;
try try
{ {
@ -1937,7 +1958,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -1972,7 +1994,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -2018,7 +2041,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeEmailAddress[] GetMailboxEmailAddresses(int itemId, int accountId) public static ExchangeEmailAddress[] GetMailboxEmailAddresses(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -2041,7 +2065,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ADD_MAILBOX_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "ADD_MAILBOX_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -2103,7 +2128,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_MAILBOX_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_MAILBOX_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -2162,7 +2188,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -2216,7 +2243,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -2255,7 +2283,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -2307,7 +2336,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADVANCED", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADVANCED");
TaskManager.ItemId = itemId;
try try
{ {
@ -2343,7 +2373,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -2513,7 +2544,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeMailbox GetMailboxPermissions(int itemId, int accountId) public static ExchangeMailbox GetMailboxPermissions(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_PERMISSIONS", itemId); TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_PERMISSIONS");
TaskManager.ItemId = itemId;
try try
{ {
@ -2549,7 +2581,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_MAILBOX_PERMISSIONS", itemId); TaskManager.StartTask("EXCHANGE", "SET_MAILBOX_PERMISSIONS");
TaskManager.ItemId = itemId;
try try
{ {
@ -2597,7 +2630,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_MAILBOXPLAN", itemId); TaskManager.StartTask("EXCHANGE", "SET_MAILBOXPLAN");
TaskManager.ItemId = itemId;
try try
{ {
@ -2707,7 +2741,8 @@ namespace WebsitePanel.EnterpriseServer
public static List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId) public static List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLANS", itemId); TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLANS");
TaskManager.ItemId = itemId;
try try
{ {
@ -2743,7 +2778,7 @@ namespace WebsitePanel.EnterpriseServer
} }
} }
private static void GetExchangeMailboxPlansByUser(int itemId, UserInfo user, ref List<ExchangeMailboxPlan>mailboxPlans) private static void GetExchangeMailboxPlansByUser(int itemId, UserInfo user, ref List<ExchangeMailboxPlan> mailboxPlans)
{ {
if ((user != null)) if ((user != null))
{ {
@ -2789,7 +2824,8 @@ namespace WebsitePanel.EnterpriseServer
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLAN", mailboxPlanId); TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLAN");
TaskManager.ItemId = mailboxPlanId;
try try
{ {
@ -2809,7 +2845,8 @@ namespace WebsitePanel.EnterpriseServer
public static int AddExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan) public static int AddExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ADD_EXCHANGE_MAILBOXPLAN", itemID); TaskManager.StartTask("EXCHANGE", "ADD_EXCHANGE_MAILBOXPLAN");
TaskManager.ItemId = itemID;
try try
{ {
@ -2878,7 +2915,8 @@ namespace WebsitePanel.EnterpriseServer
public static int UpdateExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan) public static int UpdateExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_EXCHANGE_MAILBOXPLAN", itemID); TaskManager.StartTask("EXCHANGE", "UPDATE_EXCHANGE_MAILBOXPLAN");
TaskManager.ItemId = itemID;
try try
{ {
@ -2950,7 +2988,8 @@ namespace WebsitePanel.EnterpriseServer
public static int DeleteExchangeMailboxPlan(int itemID, int mailboxPlanId) public static int DeleteExchangeMailboxPlan(int itemID, int mailboxPlanId)
{ {
TaskManager.StartTask("EXCHANGE", "DELETE_EXCHANGE_MAILBOXPLAN", itemID); TaskManager.StartTask("EXCHANGE", "DELETE_EXCHANGE_MAILBOXPLAN");
TaskManager.ItemId = itemID;
try try
{ {
@ -2971,7 +3010,8 @@ namespace WebsitePanel.EnterpriseServer
public static void SetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId) public static void SetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId)
{ {
TaskManager.StartTask("EXCHANGE", "SET_EXCHANGE_MAILBOXPLAN", itemId); TaskManager.StartTask("EXCHANGE", "SET_EXCHANGE_MAILBOXPLAN");
TaskManager.ItemId = itemId;
try try
{ {
@ -3011,7 +3051,8 @@ namespace WebsitePanel.EnterpriseServer
return BusinessErrorCodes.ERROR_EXCHANGE_CONTACTS_QUOTA_LIMIT; return BusinessErrorCodes.ERROR_EXCHANGE_CONTACTS_QUOTA_LIMIT;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CREATE_CONTACT", itemId); TaskManager.StartTask("EXCHANGE", "CREATE_CONTACT");
TaskManager.ItemId = itemId;
try try
{ {
@ -3078,7 +3119,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_CONTACT", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_CONTACT");
TaskManager.ItemId = itemId;
try try
{ {
@ -3133,7 +3175,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_CONTACT_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "GET_CONTACT_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -3173,7 +3216,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -3253,7 +3297,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_CONTACT_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "GET_CONTACT_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -3291,7 +3336,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -3343,7 +3389,8 @@ namespace WebsitePanel.EnterpriseServer
return BusinessErrorCodes.ERROR_EXCHANGE_DLISTS_QUOTA_LIMIT; return BusinessErrorCodes.ERROR_EXCHANGE_DLISTS_QUOTA_LIMIT;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CREATE_DISTR_LIST", itemId); TaskManager.StartTask("EXCHANGE", "CREATE_DISTR_LIST");
TaskManager.ItemId = itemId;
try try
{ {
@ -3423,7 +3470,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST");
TaskManager.ItemId = itemId;
try try
{ {
@ -3477,7 +3525,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -3514,7 +3563,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -3576,7 +3626,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -3614,7 +3665,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -3660,7 +3712,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeEmailAddress[] GetDistributionListEmailAddresses(int itemId, int accountId) public static ExchangeEmailAddress[] GetDistributionListEmailAddresses(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -3683,7 +3736,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ADD_DISTR_LIST_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "ADD_DISTR_LIST_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -3737,7 +3791,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_DISTR_LIST_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_DISTR_LIST_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -3789,7 +3844,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -3847,7 +3903,7 @@ namespace WebsitePanel.EnterpriseServer
if (org == null) if (org == null)
throw new ApplicationException("Organization is null"); throw new ApplicationException("Organization is null");
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_BY_ITEM_ID, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_BY_ITEM_ID, ex);
return res; return res;
@ -3860,7 +3916,7 @@ namespace WebsitePanel.EnterpriseServer
int exchangeServiceId = GetExchangeServiceID(org.PackageId); int exchangeServiceId = GetExchangeServiceID(org.PackageId);
exchange = GetExchangeServer(exchangeServiceId, org.ServiceId); exchange = GetExchangeServer(exchangeServiceId, org.ServiceId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_PROXY, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_PROXY, ex);
return res; return res;
@ -3872,7 +3928,7 @@ namespace WebsitePanel.EnterpriseServer
{ {
account = GetAccount(itemId, accountId); account = GetAccount(itemId, accountId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ACCOUNT, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ACCOUNT, ex);
return res; return res;
@ -3887,7 +3943,7 @@ namespace WebsitePanel.EnterpriseServer
exchange.SetDistributionListPermissions(org.OrganizationId, account.AccountName, sendAsAccounts, exchange.SetDistributionListPermissions(org.OrganizationId, account.AccountName, sendAsAccounts,
sendOnBehalfAccounts, addressLists.ToArray()); sendOnBehalfAccounts, addressLists.ToArray());
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_SET_DISTRIBUTION_LIST_PERMISSIONS, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_SET_DISTRIBUTION_LIST_PERMISSIONS, ex);
return res; return res;
@ -3908,7 +3964,7 @@ namespace WebsitePanel.EnterpriseServer
if (org == null) if (org == null)
throw new ApplicationException("Organization is null"); throw new ApplicationException("Organization is null");
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_BY_ITEM_ID, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_BY_ITEM_ID, ex);
return res; return res;
@ -3920,7 +3976,7 @@ namespace WebsitePanel.EnterpriseServer
int exchangeServiceId = GetExchangeServiceID(org.PackageId); int exchangeServiceId = GetExchangeServiceID(org.PackageId);
exchange = GetExchangeServer(exchangeServiceId, org.ServiceId); exchange = GetExchangeServer(exchangeServiceId, org.ServiceId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_PROXY, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ORGANIZATION_PROXY, ex);
return res; return res;
@ -3931,7 +3987,7 @@ namespace WebsitePanel.EnterpriseServer
{ {
account = GetAccount(itemId, accountId); account = GetAccount(itemId, accountId);
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ACCOUNT, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_ACCOUNT, ex);
return res; return res;
@ -3942,7 +3998,7 @@ namespace WebsitePanel.EnterpriseServer
res.Value = exchange.GetDistributionListPermissions(org.OrganizationId, account.AccountName); res.Value = exchange.GetDistributionListPermissions(org.OrganizationId, account.AccountName);
res.Value.DisplayName = account.DisplayName; res.Value.DisplayName = account.DisplayName;
} }
catch(Exception ex) catch (Exception ex)
{ {
TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_DISTRIBUTION_LIST_PERMISSIONS, ex); TaskManager.CompleteResultTask(res, ErrorCodes.CANNOT_GET_DISTRIBUTION_LIST_PERMISSIONS, ex);
return res; return res;
@ -3969,7 +4025,8 @@ namespace WebsitePanel.EnterpriseServer
return BusinessErrorCodes.ERROR_EXCHANGE_PFOLDERS_QUOTA_LIMIT; return BusinessErrorCodes.ERROR_EXCHANGE_PFOLDERS_QUOTA_LIMIT;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CREATE_PUBLIC_FOLDER", itemId); TaskManager.StartTask("EXCHANGE", "CREATE_PUBLIC_FOLDER");
TaskManager.ItemId = itemId;
try try
{ {
@ -4035,10 +4092,10 @@ namespace WebsitePanel.EnterpriseServer
// add meta-item // add meta-item
int accountId = AddAccount(itemId, ExchangeAccountType.PublicFolder, accountName, int accountId = AddAccount(itemId, ExchangeAccountType.PublicFolder, accountName,
folderPath, email, mailEnabled, folderPath, email, mailEnabled,
0, folder.NETBIOS+"\\"+accountName, null, 0, null); 0, folder.NETBIOS + "\\" + accountName, null, 0, null);
// register email address // register email address
if(mailEnabled) if (mailEnabled)
AddAccountEmailAddress(accountId, email); AddAccountEmailAddress(accountId, email);
return accountId; return accountId;
@ -4076,7 +4133,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER");
TaskManager.ItemId = itemId;
try try
{ {
@ -4125,7 +4183,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ENABLE_MAIL_PUBLIC_FOLDER", itemId); TaskManager.StartTask("EXCHANGE", "ENABLE_MAIL_PUBLIC_FOLDER");
TaskManager.ItemId = itemId;
try try
{ {
@ -4191,7 +4250,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DISABLE_MAIL_PUBLIC_FOLDER", itemId); TaskManager.StartTask("EXCHANGE", "DISABLE_MAIL_PUBLIC_FOLDER");
TaskManager.ItemId = itemId;
try try
{ {
@ -4263,7 +4323,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -4301,7 +4362,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_GENERAL", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_GENERAL");
TaskManager.ItemId = itemId;
try try
{ {
@ -4374,7 +4436,8 @@ namespace WebsitePanel.EnterpriseServer
#endregion #endregion
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -4412,7 +4475,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_MAILFLOW", itemId); TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_MAILFLOW");
TaskManager.ItemId = itemId;
try try
{ {
@ -4452,7 +4516,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeEmailAddress[] GetPublicFolderEmailAddresses(int itemId, int accountId) public static ExchangeEmailAddress[] GetPublicFolderEmailAddresses(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -4475,7 +4540,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "ADD_PUBLIC_FOLDER_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "ADD_PUBLIC_FOLDER_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -4526,7 +4592,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_PUBLIC_FOLDER_ADDRESS", itemId); TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_PUBLIC_FOLDER_ADDRESS");
TaskManager.ItemId = itemId;
try try
{ {
@ -4574,7 +4641,8 @@ namespace WebsitePanel.EnterpriseServer
if (accountCheck < 0) return accountCheck; if (accountCheck < 0) return accountCheck;
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER_ADDRESSES", itemId); TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER_ADDRESSES");
TaskManager.ItemId = itemId;
try try
{ {
@ -4690,7 +4758,7 @@ namespace WebsitePanel.EnterpriseServer
ServiceProviderProxy.Init(ws, exchangeServiceId); ServiceProviderProxy.Init(ws, exchangeServiceId);
string []exchangeSettings = ws.ServiceProviderSettingsSoapHeaderValue.Settings; string[] exchangeSettings = ws.ServiceProviderSettingsSoapHeaderValue.Settings;
List<string> resSettings = new List<string>(exchangeSettings); List<string> resSettings = new List<string>(exchangeSettings);
@ -4754,7 +4822,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeMobileDevice[] GetMobileDevices(int itemId, int accountId) public static ExchangeMobileDevice[] GetMobileDevices(int itemId, int accountId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICES", itemId); TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICES");
TaskManager.ItemId = itemId;
try try
{ {
@ -4784,7 +4853,8 @@ namespace WebsitePanel.EnterpriseServer
public static ExchangeMobileDevice GetMobileDevice(int itemId, string deviceId) public static ExchangeMobileDevice GetMobileDevice(int itemId, string deviceId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICE", itemId); TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICE");
TaskManager.ItemId = itemId;
try try
{ {
@ -4811,7 +4881,8 @@ namespace WebsitePanel.EnterpriseServer
public static void WipeDataFromDevice(int itemId, string deviceId) public static void WipeDataFromDevice(int itemId, string deviceId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "WIPE_DATA_FROM_DEVICE", itemId); TaskManager.StartTask("EXCHANGE", "WIPE_DATA_FROM_DEVICE");
TaskManager.ItemId = itemId;
try try
{ {
@ -4838,7 +4909,8 @@ namespace WebsitePanel.EnterpriseServer
public static void CancelRemoteWipeRequest(int itemId, string deviceId) public static void CancelRemoteWipeRequest(int itemId, string deviceId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "CANCEL_REMOTE_WIPE_REQUEST", itemId); TaskManager.StartTask("EXCHANGE", "CANCEL_REMOTE_WIPE_REQUEST");
TaskManager.ItemId = itemId;
try try
{ {
@ -4865,7 +4937,8 @@ namespace WebsitePanel.EnterpriseServer
public static void RemoveDevice(int itemId, string deviceId) public static void RemoveDevice(int itemId, string deviceId)
{ {
// place log record // place log record
TaskManager.StartTask("EXCHANGE", "REMOVE_DEVICE", itemId); TaskManager.StartTask("EXCHANGE", "REMOVE_DEVICE");
TaskManager.ItemId = itemId;
try try
{ {

1
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
View file

@ -129,6 +129,7 @@
<Compile Include="Provisioning\IImportController.cs" /> <Compile Include="Provisioning\IImportController.cs" />
<Compile Include="Provisioning\ImportAsyncWorker.cs" /> <Compile Include="Provisioning\ImportAsyncWorker.cs" />
<Compile Include="Provisioning\ImportController.cs" /> <Compile Include="Provisioning\ImportController.cs" />
<Compile Include="RemoteDesktopServices\RemoteDesktopServicesController.cs" />
<Compile Include="SchedulerTasks\ActivatePaidInvoicesTask.cs" /> <Compile Include="SchedulerTasks\ActivatePaidInvoicesTask.cs" />
<Compile Include="SchedulerTasks\BackupDatabaseTask.cs" /> <Compile Include="SchedulerTasks\BackupDatabaseTask.cs" />
<Compile Include="SchedulerTasks\BackupTask.cs" /> <Compile Include="SchedulerTasks\BackupTask.cs" />

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
View file

@ -123,7 +123,6 @@
<Compile Include="..\VersionInfo.cs"> <Compile Include="..\VersionInfo.cs">
<Link>VersionInfo.cs</Link> <Link>VersionInfo.cs</Link>
</Compile> </Compile>
<Compile Include="Code\RemoteDesktopServices\RemoteDesktopServicesController.cs" />
<Compile Include="esEnterpriseStorage.asmx.cs"> <Compile Include="esEnterpriseStorage.asmx.cs">
<DependentUpon>esEnterpriseStorage.asmx</DependentUpon> <DependentUpon>esEnterpriseStorage.asmx</DependentUpon>
<SubType>Component</SubType> <SubType>Component</SubType>
@ -291,6 +290,9 @@
<None Include="TaskEventHandlers.config" /> <None Include="TaskEventHandlers.config" />
<None Include="WsePolicyCache.Config" /> <None Include="WsePolicyCache.Config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Code\" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>