From a609ac1fb15d05f975920c3a6d0d6b5360bb6efb Mon Sep 17 00:00:00 2001
From: robvde <devnull@localhost>
Date: Sat, 21 Sep 2013 12:12:14 +0400
Subject: [PATCH] Fixed sync issues with exchange controller

---
 .../ExchangeServerController.cs               | 227 ++++++------------
 1 file changed, 77 insertions(+), 150 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
index c530a91d..1513a736 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
@@ -171,8 +171,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_ORG_STATS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_ORG_STATS", itemId);
 
             try
             {
@@ -260,8 +259,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CALCULATE_DISKSPACE");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CALCULATE_DISKSPACE", itemId);
 
             try
             {
@@ -348,10 +346,7 @@ namespace WebsitePanel.EnterpriseServer
         private static int ExtendToExchangeOrganization(ref Organization org)
         {
             // place log record
-            
-            List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
-            parameters.Add(new BackgroundTaskParameter("Organization ID", org.OrganizationId));
-            TaskManager.StartTask("EXCHANGE", "CREATE_ORG", org.Name,parameters);
+            TaskManager.StartTask("EXCHANGE", "CREATE_ORG", org.Name, new BackgroundTaskParameter("Organization ID", org.OrganizationId));
 
             try
             {
@@ -577,8 +572,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_ORG");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_ORG", itemId);
 
             try
             {
@@ -615,8 +609,7 @@ namespace WebsitePanel.EnterpriseServer
         public static Organization GetOrganizationStorageLimits(int itemId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_ORG_LIMITS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_ORG_LIMITS", itemId);
 
             try
             {
@@ -640,8 +633,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_ORG_LIMITS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_ORG_LIMITS", itemId);
 
             try
             {
@@ -726,8 +718,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOXES_STATS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOXES_STATS", itemId);
 
             try
             {
@@ -755,8 +746,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeMailboxStatistics GetMailboxStatistics(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_STATS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_STATS", itemId);
 
             try
             {
@@ -820,8 +810,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_FOLDERS_STATS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_FOLDERS_STATS", itemId);
 
             try
             {
@@ -867,8 +856,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_ACTIVESYNC_POLICY");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_ACTIVESYNC_POLICY", itemId);
 
             try
             {
@@ -919,8 +907,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_ACTIVESYNC_POLICY");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_ACTIVESYNC_POLICY", itemId);
 
             try
             {
@@ -995,9 +982,9 @@ namespace WebsitePanel.EnterpriseServer
             if (IsDemoMode)
             {
                 if (accountType == ExchangeAccountType.Mailbox)
-                    return SearchAccounts(0, true, false, false, true, true, "", "", "");
+                    return SearchAccounts(0, true, false, false, true, true, false, "", "", "");
                 else if (accountType == ExchangeAccountType.Contact)
-                    return SearchAccounts(0, false, true, false, false, false, "", "", "");
+                    return SearchAccounts(0, false, true, false, false, false, false, "", "", "");
                 else if (accountType == ExchangeAccountType.DistributionList)
                     return SearchAccounts(0, false, false, true, false, false, false, "", "", "");
                 else
@@ -1147,7 +1134,7 @@ namespace WebsitePanel.EnterpriseServer
 
             return ObjectUtils.CreateListFromDataReader<ExchangeAccount>(
                 DataProvider.SearchExchangeAccounts(SecurityContext.User.UserId, itemId, includeMailboxes, includeContacts,
-                includeDistributionLists, includeRooms, includeEquipment,
+                includeDistributionLists, includeRooms, includeEquipment, includeSecurityGroups,
                 filterColumn, filterValue, sortColumn));
         }
 
@@ -1183,8 +1170,7 @@ namespace WebsitePanel.EnterpriseServer
         public static bool CheckAccountCredentials(int itemId, string email, string password)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "AUTHENTICATE", email);
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "AUTHENTICATE", email, itemId);
 
             try
             {
@@ -1256,7 +1242,7 @@ namespace WebsitePanel.EnterpriseServer
             int counter = 0;
             bool bFound = false;
 
-            //if (!AccountExists(accountName)) return accountName;
+            if (!AccountExists(accountName)) return accountName;
 
             do
             {
@@ -1408,10 +1394,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
-            parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
-            TaskManager.StartTask("EXCHANGE", "ADD_DOMAIN", parameters);
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "ADD_DOMAIN", itemId, new BackgroundTaskParameter("Domain ID", domainId));
 
             try
             {
@@ -1482,11 +1465,12 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
+
             List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
             parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
             parameters.Add(new BackgroundTaskParameter("Domain Type", domainType.ToString()));
-            TaskManager.StartTask("EXCHANGE", "CHANGE_DOMAIN_TYPE", parameters);
-            TaskManager.ItemId = itemId;
+
+            TaskManager.StartTask("EXCHANGE", "CHANGE_DOMAIN_TYPE", itemId, parameters);
 
             try
             {
@@ -1541,10 +1525,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            List<BackgroundTaskParameter> parameters = new List<BackgroundTaskParameter>();
-            parameters.Add(new BackgroundTaskParameter("Domain ID", domainId));
-            TaskManager.StartTask("EXCHANGE", "DELETE_DOMAIN");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_DOMAIN", itemId, new BackgroundTaskParameter("Domain ID", domainId));
 
             try
             {
@@ -1647,8 +1628,8 @@ namespace WebsitePanel.EnterpriseServer
 
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CREATE_MAILBOX");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CREATE_MAILBOX", itemId);
+
             bool userCreated = false;
             Organization org = null;
             try
@@ -1839,8 +1820,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DISABLE_MAILBOX");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DISABLE_MAILBOX", itemId);
 
             try
             {
@@ -1888,8 +1868,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX", itemId);
 
             try
             {
@@ -1968,8 +1947,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_GENERAL", itemId);
 
             try
             {
@@ -2004,8 +1982,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL", itemId);
 
             try
             {
@@ -2051,8 +2028,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeEmailAddress[] GetMailboxEmailAddresses(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADDRESSES", itemId);
 
             try
             {
@@ -2075,8 +2051,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "ADD_MAILBOX_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "ADD_MAILBOX_ADDRESS", itemId);
 
             try
             {
@@ -2138,8 +2113,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_MAILBOX_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_MAILBOX_ADDRESS", itemId);
 
             try
             {
@@ -2198,8 +2172,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_MAILBOX_ADDRESSES", itemId);
 
             try
             {
@@ -2253,8 +2226,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_MAILFLOW", itemId);
 
             try
             {
@@ -2293,8 +2265,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_MAILFLOW", itemId);
 
             try
             {
@@ -2346,8 +2317,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADVANCED");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_ADVANCED", itemId);
 
             try
             {
@@ -2383,8 +2353,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_MAILBOX_GENERAL", itemId);
 
             try
             {
@@ -2554,8 +2523,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeMailbox GetMailboxPermissions(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_PERMISSIONS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MAILBOX_PERMISSIONS", itemId);
 
             try
             {
@@ -2591,8 +2559,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_MAILBOX_PERMISSIONS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_MAILBOX_PERMISSIONS", itemId);
 
             try
             {
@@ -2640,8 +2607,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_MAILBOXPLAN");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_MAILBOXPLAN", itemId);
 
             try
             {
@@ -2751,8 +2717,7 @@ namespace WebsitePanel.EnterpriseServer
         public static List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLANS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLANS", itemId);
 
             try
             {
@@ -2834,8 +2799,7 @@ namespace WebsitePanel.EnterpriseServer
         {
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLAN");
-            TaskManager.ItemId = mailboxPlanId;
+            TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLAN", mailboxPlanId);
 
             try
             {
@@ -2855,8 +2819,7 @@ namespace WebsitePanel.EnterpriseServer
         public static int AddExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "ADD_EXCHANGE_MAILBOXPLAN");
-            TaskManager.ItemId = itemID;
+            TaskManager.StartTask("EXCHANGE", "ADD_EXCHANGE_MAILBOXPLAN", itemID);
 
             try
             {
@@ -2925,8 +2888,7 @@ namespace WebsitePanel.EnterpriseServer
         public static int UpdateExchangeMailboxPlan(int itemID, ExchangeMailboxPlan mailboxPlan)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_EXCHANGE_MAILBOXPLAN");
-            TaskManager.ItemId = itemID;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_EXCHANGE_MAILBOXPLAN", itemID);
 
             try
             {
@@ -2998,8 +2960,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static int DeleteExchangeMailboxPlan(int itemID, int mailboxPlanId)
         {
-            TaskManager.StartTask("EXCHANGE", "DELETE_EXCHANGE_MAILBOXPLAN");
-            TaskManager.ItemId = itemID;
+            TaskManager.StartTask("EXCHANGE", "DELETE_EXCHANGE_MAILBOXPLAN", itemID);
 
             try
             {
@@ -3020,8 +2981,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static void SetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId)
         {
-            TaskManager.StartTask("EXCHANGE", "SET_EXCHANGE_MAILBOXPLAN");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_EXCHANGE_MAILBOXPLAN", itemId);
 
             try
             {
@@ -3061,8 +3021,7 @@ namespace WebsitePanel.EnterpriseServer
                 return BusinessErrorCodes.ERROR_EXCHANGE_CONTACTS_QUOTA_LIMIT;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CREATE_CONTACT");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CREATE_CONTACT", itemId);
 
             try
             {
@@ -3129,8 +3088,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_CONTACT");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_CONTACT", itemId);
 
             try
             {
@@ -3185,8 +3143,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_CONTACT_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_CONTACT_GENERAL", itemId);
 
             try
             {
@@ -3226,8 +3183,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_GENERAL", itemId);
 
             try
             {
@@ -3307,8 +3263,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_CONTACT_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_CONTACT_MAILFLOW", itemId);
 
             try
             {
@@ -3346,8 +3301,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_CONTACT_MAILFLOW", itemId);
 
             try
             {
@@ -3399,8 +3353,7 @@ namespace WebsitePanel.EnterpriseServer
                 return BusinessErrorCodes.ERROR_EXCHANGE_DLISTS_QUOTA_LIMIT;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CREATE_DISTR_LIST");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CREATE_DISTR_LIST", itemId);
 
             try
             {
@@ -3480,8 +3433,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST", itemId);
 
             try
             {
@@ -3535,8 +3487,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_GENERAL", itemId);
 
             try
             {
@@ -3573,8 +3524,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_GENERAL", itemId);
 
             try
             {
@@ -3636,8 +3586,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_MAILFLOW", itemId);
 
             try
             {
@@ -3675,8 +3624,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_DISTR_LIST_MAILFLOW", itemId);
 
             try
             {
@@ -3722,8 +3670,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeEmailAddress[] GetDistributionListEmailAddresses(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_DISTR_LIST_ADDRESSES", itemId);
 
             try
             {
@@ -3746,8 +3693,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "ADD_DISTR_LIST_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "ADD_DISTR_LIST_ADDRESS", itemId);
 
             try
             {
@@ -3801,8 +3747,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_DISTR_LIST_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_DISTR_LIST_ADDRESS", itemId);
 
             try
             {
@@ -3854,8 +3799,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_DISTR_LIST_ADDRESSES", itemId);
 
             try
             {
@@ -4200,8 +4144,7 @@ namespace WebsitePanel.EnterpriseServer
                 return BusinessErrorCodes.ERROR_EXCHANGE_PFOLDERS_QUOTA_LIMIT;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CREATE_PUBLIC_FOLDER");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CREATE_PUBLIC_FOLDER", itemId);
 
             try
             {
@@ -4308,8 +4251,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER", itemId);
 
             try
             {
@@ -4358,8 +4300,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "ENABLE_MAIL_PUBLIC_FOLDER");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "ENABLE_MAIL_PUBLIC_FOLDER", itemId);
 
             try
             {
@@ -4425,8 +4366,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DISABLE_MAIL_PUBLIC_FOLDER");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DISABLE_MAIL_PUBLIC_FOLDER", itemId);
 
             try
             {
@@ -4498,8 +4438,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_GENERAL", itemId);
 
             try
             {
@@ -4537,8 +4476,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_GENERAL");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_GENERAL", itemId);
 
             try
             {
@@ -4611,8 +4549,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_MAILFLOW", itemId);
 
             try
             {
@@ -4650,8 +4587,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_MAILFLOW");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "UPDATE_PUBLIC_FOLDER_MAILFLOW", itemId);
 
             try
             {
@@ -4691,8 +4627,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeEmailAddress[] GetPublicFolderEmailAddresses(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_PUBLIC_FOLDER_ADDRESSES", itemId);
 
             try
             {
@@ -4715,8 +4650,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "ADD_PUBLIC_FOLDER_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "ADD_PUBLIC_FOLDER_ADDRESS", itemId);
 
             try
             {
@@ -4767,8 +4701,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_PUBLIC_FOLDER_ADDRESS");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "SET_PRIMARY_PUBLIC_FOLDER_ADDRESS", itemId);
 
             try
             {
@@ -4816,8 +4749,7 @@ namespace WebsitePanel.EnterpriseServer
             if (accountCheck < 0) return accountCheck;
 
             // place log record
-            TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER_ADDRESSES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "DELETE_PUBLIC_FOLDER_ADDRESSES", itemId);
 
             try
             {
@@ -4997,8 +4929,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeMobileDevice[] GetMobileDevices(int itemId, int accountId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICES");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICES", itemId);
 
             try
             {
@@ -5028,8 +4959,7 @@ namespace WebsitePanel.EnterpriseServer
         public static ExchangeMobileDevice GetMobileDevice(int itemId, string deviceId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICE");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "GET_MOBILE_DEVICE", itemId);
 
             try
             {
@@ -5056,8 +4986,7 @@ namespace WebsitePanel.EnterpriseServer
         public static void WipeDataFromDevice(int itemId, string deviceId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "WIPE_DATA_FROM_DEVICE");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "WIPE_DATA_FROM_DEVICE", itemId);
 
             try
             {
@@ -5084,8 +5013,7 @@ namespace WebsitePanel.EnterpriseServer
         public static void CancelRemoteWipeRequest(int itemId, string deviceId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "CANCEL_REMOTE_WIPE_REQUEST");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "CANCEL_REMOTE_WIPE_REQUEST", itemId);
 
             try
             {
@@ -5112,8 +5040,7 @@ namespace WebsitePanel.EnterpriseServer
         public static void RemoveDevice(int itemId, string deviceId)
         {
             // place log record
-            TaskManager.StartTask("EXCHANGE", "REMOVE_DEVICE");
-            TaskManager.ItemId = itemId;
+            TaskManager.StartTask("EXCHANGE", "REMOVE_DEVICE", itemId);
 
             try
             {