Exchange Module: Add ability to manage all built-in security types in public folder management.

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/WebsitePanel.EnterpriseServer.Client.csproj

@@ -84,6 +84,9 @@
     <Compile Include="CommentsProxy.cs" />
     <Compile Include="Common\EnterpriseServerProxyConfigurator.cs" />
     <Compile Include="Common\UsernameAssertion.cs" />
+    <Compile Include="ExchangeServerProxy.cs">
+      <SubType>code</SubType>
+    </Compile>
     <Compile Include="VirtualizationServerProxyForPrivateCloud.cs" />
     <Compile Include="CRMProxy.cs" />
     <Compile Include="DatabaseServersProxy.cs" />
@@ -91,7 +94,6 @@
     <Compile Include="ecStorefrontProxy.cs" />
     <Compile Include="ecStorehouseProxy.cs" />
     <Compile Include="ExchangeHostedEditionProxy.cs" />
-    <Compile Include="ExchangeServerProxy.cs" />
     <Compile Include="FilesProxy.cs" />
     <Compile Include="FtpServersProxy.cs" />
     <Compile Include="HostedSharePointServersProxy.cs" />

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs

@@ -3636,7 +3636,7 @@ namespace WebsitePanel.EnterpriseServer
 			c.DisplayName = "\\fabrikam\\Documents";
 			c.MailEnabled = true;
 			c.Name = "Documents";
-			c.AuthorsAccounts = GetAccounts(0, ExchangeAccountType.Mailbox).ToArray();
+			c.Accounts = GetAccounts(0, ExchangeAccountType.Mailbox).ToArray();
 			c.AcceptAccounts = GetAccounts(0, ExchangeAccountType.Mailbox).ToArray();
 			return c;
 		}
@@ -3683,7 +3683,7 @@ namespace WebsitePanel.EnterpriseServer
 		}
 
 		public static int SetPublicFolderGeneralSettings(int itemId, int accountId, string newName,
-			bool hideAddressBook, string[] authorAccounts)
+			bool hideAddressBook, ExchangeAccount[] accounts)
 		{
 			// check account
 			int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
@@ -3714,8 +3714,9 @@ namespace WebsitePanel.EnterpriseServer
 				exchange.SetPublicFolderGeneralSettings(
 					account.DisplayName,
 					newName,
-					authorAccounts,
+					hideAddressBook,
-					hideAddressBook);
+                    accounts
+                    );
 
 				// update folder name
 				string origName = account.DisplayName;

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj

@@ -68,11 +68,11 @@
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebsitePanel.Providers.Base, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.Providers.Base, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.Server.Client, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.Server.Client, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.Server.Client.dll</HintPath>
     </Reference>
@@ -425,7 +425,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>9002</DevelopmentServerPort>
+          <DevelopmentServerPort>9005</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs

@@ -515,10 +515,10 @@ namespace WebsitePanel.EnterpriseServer
 
 		[WebMethod]
 		public int SetPublicFolderGeneralSettings(int itemId, int accountId, string newName,
-			bool hideAddressBook, string[] authorAccounts)
+			bool hideAddressBook, ExchangeAccount[] accounts)
 		{
 			return ExchangeServerController.SetPublicFolderGeneralSettings(itemId, accountId, newName,
-				hideAddressBook, authorAccounts);
+				hideAddressBook, accounts);
 		}
 
 		[WebMethod]

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs

@@ -45,6 +45,7 @@ namespace WebsitePanel.Providers.HostedSolution
         MailboxManagerActions mailboxManagerActions;
         string accountPassword;
         string samAccountName;
+        string publicFolderPermission;
 
 		public int AccountId
 		{
@@ -111,5 +112,11 @@ namespace WebsitePanel.Providers.HostedSolution
             get { return this.mailboxManagerActions; }
             set { this.mailboxManagerActions = value; }
         }
+
+        public string PublicFolderPermission
+        {
+            get { return this.publicFolderPermission; }
+            set { this.publicFolderPermission = value; }
+        }
 	}
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangePublicFolder.cs

@@ -35,7 +35,7 @@ namespace WebsitePanel.Providers.HostedSolution
 		bool hideFromAddressBook;
 		bool mailEnabled;
 
-		ExchangeAccount[] authorsAccounts;
+		ExchangeAccount[] accounts;	
 		
 		ExchangeAccount[] acceptAccounts;
 		ExchangeAccount[] rejectAccounts;
@@ -59,10 +59,11 @@ namespace WebsitePanel.Providers.HostedSolution
 			set { this.mailEnabled = value; }
 		}
 
-		public WebsitePanel.Providers.HostedSolution.ExchangeAccount[] AuthorsAccounts
+		        
+		public WebsitePanel.Providers.HostedSolution.ExchangeAccount[] Accounts
         {
-			get { return this.authorsAccounts; }
+            get { return this.accounts; }
-			set { this.authorsAccounts = value; }
+            set { this.accounts = value; }
         }
         
 		public WebsitePanel.Providers.HostedSolution.ExchangeAccount[] AcceptAccounts

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IExchangeServer.cs

@@ -101,7 +101,7 @@ namespace WebsitePanel.Providers.HostedSolution
 		void EnableMailPublicFolder(string organizationId, string folder, string accountName, string name, string domain);
 		void DisableMailPublicFolder(string folder);
 		ExchangePublicFolder GetPublicFolderGeneralSettings(string folder);
-		void SetPublicFolderGeneralSettings(string folder, string newFolderName, string[] authorAccounts, bool hideFromAddressBook);
+		void SetPublicFolderGeneralSettings(string folder, string newFolderName, bool hideFromAddressBook, ExchangeAccount[] accounts );
 		ExchangePublicFolder GetPublicFolderMailFlowSettings(string folder);
 		void SetPublicFolderMailFlowSettings(string folder, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication);
 		ExchangeEmailAddress[] GetPublicFolderEmailAddresses(string folder);

WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs

@@ -489,9 +489,9 @@ namespace WebsitePanel.Providers.HostedSolution
 		}
 
 		public void SetPublicFolderGeneralSettings(string folder, string newFolderName,
-			string[] authorAccounts, bool hideFromAddressBook)
+			 bool hideFromAddressBook, ExchangeAccount[] accounts)
 		{
-			SetPublicFolderGeneralSettingsInternal(folder, newFolderName, authorAccounts, hideFromAddressBook);
+			SetPublicFolderGeneralSettingsInternal(folder, newFolderName, hideFromAddressBook, accounts);
 		}
 		public ExchangePublicFolder GetPublicFolderMailFlowSettings(string folder)
 		{
@@ -4142,8 +4142,8 @@ namespace WebsitePanel.Providers.HostedSolution
 
 		private void SetPublicFolderPermissions(Runspace runSpace, string folder, string securityGroup)
 		{
+			//set the default Permission to 'Reviewer'
             RemovePublicFolderClientPermission(runSpace, folder, "Default", "Author");
-			//RemovePublicFolderClientPermission(runSpace, folder, "Anonymous", "CreateItems");
 			AddPublicFolderClientPermission(runSpace, folder, securityGroup, "Reviewer");
 		}
 
@@ -4325,7 +4325,8 @@ namespace WebsitePanel.Providers.HostedSolution
 				info.Name = (string)GetPSObjectProperty(publicFolder, "Name");
 				info.MailEnabled = (bool)GetPSObjectProperty(publicFolder, "MailEnabled");
 				info.HideFromAddressBook = (bool)GetPSObjectProperty(publicFolder, "HiddenFromAddressListsEnabled");
-				info.AuthorsAccounts = GetPublicFolderAuthors(runSpace, folder);
+
+				info.Accounts = GetPublicFolderAccounts(runSpace, folder);				
 			}
 			finally
 			{
@@ -4336,9 +4337,9 @@ namespace WebsitePanel.Providers.HostedSolution
 			return info;
 		}
 		
-		private ExchangeAccount[] GetPublicFolderAuthors(Runspace runSpace, string folder)
+        private ExchangeAccount[] GetPublicFolderAccounts(Runspace runSpace, string folder)
         {
-			ExchangeLog.LogStart("GetPublicFolderAuthors");
+            ExchangeLog.LogStart("GetPublicFolderAccounts");
             ExchangeLog.DebugInfo("Folder: {0}", folder);
 
             List<ExchangeAccount> list = new List<ExchangeAccount>();
@@ -4353,29 +4354,27 @@ namespace WebsitePanel.Providers.HostedSolution
             foreach (PSObject obj in result)
             {
                 string userId = ObjToString(GetPSObjectProperty(obj, "User"));
-				if (userId == "Default" || userId == "Anonymous")
+                if (userId == "Default" || userId == "Anonymous" || userId.StartsWith("NT User:") == true)
                     continue;
 
                 object rights = GetPSObjectProperty(obj, "AccessRights");
                 int count = (int)GetObjectPropertyValue(rights, "Count");
                 for (int i = 0; i < count; i++)
-				{
-					string right = ObjToString(GetObjectIndexerValue(rights, i));
-					if (right == "Author")
                 {
                     account = GetExchangeAccount(runSpace, userId);
+                    string permission = ObjToString(GetObjectIndexerValue(rights, i));
                     if (account != null)
+                        account.PublicFolderPermission = permission;
                         list.Add(account);
                     break;                   
                 }
             }
-			}
+            ExchangeLog.LogEnd("GetPublicFolderAccounts");
-			ExchangeLog.LogEnd("GetPublicFolderAuthors");
             return list.ToArray();
         }
 
 		private void SetPublicFolderGeneralSettingsInternal(string folder, string newFolderName,
-			string[] authorAccounts, bool hideFromAddressBook)
+			bool hideFromAddressBook, ExchangeAccount[] accounts)
 		{
 			ExchangeLog.LogStart("SetPublicFolderGeneralSettingsInternal");
 			ExchangeLog.DebugInfo("Folder: {0}", folder);
@@ -4389,44 +4388,36 @@ namespace WebsitePanel.Providers.HostedSolution
 				Collection<PSObject> result = GetPublicFolderObject(runSpace, folder);
 				PSObject publicFolder = result[0];
 				string folderName = (string)GetPSObjectProperty(publicFolder, "Name");
-				ExchangeAccount[] accounts = GetPublicFolderAuthors(runSpace, folder);
+				ExchangeAccount[] allAccounts = GetPublicFolderAccounts(runSpace, folder);
 								
-				//authors
+                //Remove all accounts and re-apply               
-				Dictionary<string, string> existingAuthors = new Dictionary<string, string>();
+                List<ExchangeAccount> accountsToDelete = new List<ExchangeAccount>();
-				Dictionary<string, string> newAuthors = new Dictionary<string, string>();
+                List<ExchangeAccount> accountsToAdd = new List<ExchangeAccount>();
-				List<string> authorsToDelete = new List<string>();
-				List<string> authorsToAdd = new List<string>();
                                
-				foreach (ExchangeAccount account in accounts)
+                foreach (ExchangeAccount existingAccount in allAccounts)
                 {
-					existingAuthors.Add(account.AccountName.ToLower(), account.AccountName);
+                    try
+                    {
+                        RemovePublicFolderClientPermission(runSpace, folder, @"\" + existingAccount.AccountName, existingAccount.PublicFolderPermission);
+                    }
+                    catch (Exception)
+                    {
+                        throw;
                     }
                     
-				foreach (string newAuthor in authorAccounts)
-				{
-					newAuthors.Add(newAuthor.ToLower(), newAuthor);
-					if (!existingAuthors.ContainsKey(newAuthor.ToLower()))
-					{
-						authorsToAdd.Add(newAuthor);
-					}
                 }
 
-				foreach (string existingAuthor in existingAuthors.Keys)
+                foreach (ExchangeAccount newAccount in accounts)
                 {
-					if (!newAuthors.ContainsKey(existingAuthor))
+                    try
                     {
-						authorsToDelete.Add(existingAuthors[existingAuthor]);
+                        AddPublicFolderClientPermission(runSpace, folder, @"\" + newAccount.AccountName, newAccount.PublicFolderPermission);
                     }
+                    catch (Exception)
+                    {                        
+                        throw;
                     }
                     
-				foreach (string user in authorsToAdd)
-				{
-					AddPublicFolderClientPermission(runSpace, folder, user, "Author");
-				}
-
-				foreach (string user in authorsToDelete)
-				{
-					RemovePublicFolderClientPermission(runSpace, folder, user, "Author");
                 }
                	
 				//general settings

WebsitePanel/Sources/WebsitePanel.Server.Client/ExchangeServerProxy.cs

@@ -29,7 +29,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
+//     Runtime Version:2.0.50727.5456
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -37,21 +37,21 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by wsdl, Version=2.0.50727.3038.
+// This source code was auto-generated by wsdl, Version=2.0.50727.42.
 // 
 using WebsitePanel.Providers.HostedSolution;
-
+namespace WebsitePanel.Providers.Exchange
-namespace WebsitePanel.Providers.Exchange {
+{
-    using System.Diagnostics;
+    using System.Xml.Serialization;
     using System.Web.Services;
     using System.ComponentModel;
     using System.Web.Services.Protocols;
     using System;
-    using System.Xml.Serialization;
+    using System.Diagnostics;
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="ExchangeServerSoap", Namespace="http://smbsaas/websitepanel/server/")]
@@ -61,6 +61,12 @@ namespace WebsitePanel.Providers.Exchange {
         
         public ServiceProviderSettingsSoapHeader ServiceProviderSettingsSoapHeaderValue;
         
+        private System.Threading.SendOrPostCallback WipeDataFromDeviceOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CancelRemoteWipeRequestOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback RemoveDeviceOperationCompleted;
+        
         private System.Threading.SendOrPostCallback CheckAccountCredentialsOperationCompleted;
         
         private System.Threading.SendOrPostCallback ExtendToExchangeOrganizationOperationCompleted;
@@ -187,17 +193,20 @@ namespace WebsitePanel.Providers.Exchange {
         
         private System.Threading.SendOrPostCallback GetMobileDeviceOperationCompleted;
         
-        private System.Threading.SendOrPostCallback WipeDataFromDeviceOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback CancelRemoteWipeRequestOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback RemoveDeviceOperationCompleted;
-        
         /// <remarks/>
         public ExchangeServer() {
-            this.Url = "http://127.0.0.1:9003/ExchangeServer.asmx";
+            this.Url = "http://localhost:9004/ExchangeServer.asmx";
         }
         
+        /// <remarks/>
+        public event WipeDataFromDeviceCompletedEventHandler WipeDataFromDeviceCompleted;
+        
+        /// <remarks/>
+        public event CancelRemoteWipeRequestCompletedEventHandler CancelRemoteWipeRequestCompleted;
+        
+        /// <remarks/>
+        public event RemoveDeviceCompletedEventHandler RemoveDeviceCompleted;
+        
         /// <remarks/>
         public event CheckAccountCredentialsCompletedEventHandler CheckAccountCredentialsCompleted;
         
@@ -388,13 +397,124 @@ namespace WebsitePanel.Providers.Exchange {
         public event GetMobileDeviceCompletedEventHandler GetMobileDeviceCompleted;
         
         /// <remarks/>
-        public event WipeDataFromDeviceCompletedEventHandler WipeDataFromDeviceCompleted;
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/WipeDataFromDevice", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void WipeDataFromDevice(string id) {
+            this.Invoke("WipeDataFromDevice", new object[] {
+                        id});
+        }
         
         /// <remarks/>
-        public event CancelRemoteWipeRequestCompletedEventHandler CancelRemoteWipeRequestCompleted;
+        public System.IAsyncResult BeginWipeDataFromDevice(string id, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("WipeDataFromDevice", new object[] {
+                        id}, callback, asyncState);
+        }
         
         /// <remarks/>
-        public event RemoveDeviceCompletedEventHandler RemoveDeviceCompleted;
+        public void EndWipeDataFromDevice(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void WipeDataFromDeviceAsync(string id) {
+            this.WipeDataFromDeviceAsync(id, null);
+        }
+        
+        /// <remarks/>
+        public void WipeDataFromDeviceAsync(string id, object userState) {
+            if ((this.WipeDataFromDeviceOperationCompleted == null)) {
+                this.WipeDataFromDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWipeDataFromDeviceOperationCompleted);
+            }
+            this.InvokeAsync("WipeDataFromDevice", new object[] {
+                        id}, this.WipeDataFromDeviceOperationCompleted, userState);
+        }
+        
+        private void OnWipeDataFromDeviceOperationCompleted(object arg) {
+            if ((this.WipeDataFromDeviceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.WipeDataFromDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CancelRemoteWipeRequest", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void CancelRemoteWipeRequest(string id) {
+            this.Invoke("CancelRemoteWipeRequest", new object[] {
+                        id});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCancelRemoteWipeRequest(string id, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CancelRemoteWipeRequest", new object[] {
+                        id}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndCancelRemoteWipeRequest(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void CancelRemoteWipeRequestAsync(string id) {
+            this.CancelRemoteWipeRequestAsync(id, null);
+        }
+        
+        /// <remarks/>
+        public void CancelRemoteWipeRequestAsync(string id, object userState) {
+            if ((this.CancelRemoteWipeRequestOperationCompleted == null)) {
+                this.CancelRemoteWipeRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCancelRemoteWipeRequestOperationCompleted);
+            }
+            this.InvokeAsync("CancelRemoteWipeRequest", new object[] {
+                        id}, this.CancelRemoteWipeRequestOperationCompleted, userState);
+        }
+        
+        private void OnCancelRemoteWipeRequestOperationCompleted(object arg) {
+            if ((this.CancelRemoteWipeRequestCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CancelRemoteWipeRequestCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/RemoveDevice", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void RemoveDevice(string id) {
+            this.Invoke("RemoveDevice", new object[] {
+                        id});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginRemoveDevice(string id, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("RemoveDevice", new object[] {
+                        id}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndRemoveDevice(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void RemoveDeviceAsync(string id) {
+            this.RemoveDeviceAsync(id, null);
+        }
+        
+        /// <remarks/>
+        public void RemoveDeviceAsync(string id, object userState) {
+            if ((this.RemoveDeviceOperationCompleted == null)) {
+                this.RemoveDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDeviceOperationCompleted);
+            }
+            this.InvokeAsync("RemoveDevice", new object[] {
+                        id}, this.RemoveDeviceOperationCompleted, userState);
+        }
+        
+        private void OnRemoveDeviceOperationCompleted(object arg) {
+            if ((this.RemoveDeviceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.RemoveDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
@@ -3243,21 +3363,21 @@ namespace WebsitePanel.Providers.Exchange {
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/SetPublicFolderGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void SetPublicFolderGeneralSettings(string folder, string newFolderName, string[] authorAccounts, bool hideFromAddressBook) {
+        public void SetPublicFolderGeneralSettings(string folder, string newFolderName, bool hideFromAddressBook, ExchangeAccount[] accounts) {
             this.Invoke("SetPublicFolderGeneralSettings", new object[] {
                         folder,
                         newFolderName,
-                        authorAccounts,
+                        hideFromAddressBook,
-                        hideFromAddressBook});
+                        accounts});
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginSetPublicFolderGeneralSettings(string folder, string newFolderName, string[] authorAccounts, bool hideFromAddressBook, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSetPublicFolderGeneralSettings(string folder, string newFolderName, bool hideFromAddressBook, ExchangeAccount[] accounts, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetPublicFolderGeneralSettings", new object[] {
                         folder,
                         newFolderName,
-                        authorAccounts,
+                        hideFromAddressBook,
-                        hideFromAddressBook}, callback, asyncState);
+                        accounts}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -3266,20 +3386,20 @@ namespace WebsitePanel.Providers.Exchange {
         }
         
         /// <remarks/>
-        public void SetPublicFolderGeneralSettingsAsync(string folder, string newFolderName, string[] authorAccounts, bool hideFromAddressBook) {
+        public void SetPublicFolderGeneralSettingsAsync(string folder, string newFolderName, bool hideFromAddressBook, ExchangeAccount[] accounts) {
-            this.SetPublicFolderGeneralSettingsAsync(folder, newFolderName, authorAccounts, hideFromAddressBook, null);
+            this.SetPublicFolderGeneralSettingsAsync(folder, newFolderName, hideFromAddressBook, accounts, null);
         }
         
         /// <remarks/>
-        public void SetPublicFolderGeneralSettingsAsync(string folder, string newFolderName, string[] authorAccounts, bool hideFromAddressBook, object userState) {
+        public void SetPublicFolderGeneralSettingsAsync(string folder, string newFolderName, bool hideFromAddressBook, ExchangeAccount[] accounts, object userState) {
             if ((this.SetPublicFolderGeneralSettingsOperationCompleted == null)) {
                 this.SetPublicFolderGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetPublicFolderGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetPublicFolderGeneralSettings", new object[] {
                         folder,
                         newFolderName,
-                        authorAccounts,
+                        hideFromAddressBook,
-                        hideFromAddressBook}, this.SetPublicFolderGeneralSettingsOperationCompleted, userState);
+                        accounts}, this.SetPublicFolderGeneralSettingsOperationCompleted, userState);
         }
         
         private void OnSetPublicFolderGeneralSettingsOperationCompleted(object arg) {
@@ -3959,155 +4079,30 @@ namespace WebsitePanel.Providers.Exchange {
             }
         }
         
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/WipeDataFromDevice", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void WipeDataFromDevice(string id) {
-            this.Invoke("WipeDataFromDevice", new object[] {
-                        id});
-        }
-        
-        /// <remarks/>
-        public System.IAsyncResult BeginWipeDataFromDevice(string id, System.AsyncCallback callback, object asyncState) {
-            return this.BeginInvoke("WipeDataFromDevice", new object[] {
-                        id}, callback, asyncState);
-        }
-        
-        /// <remarks/>
-        public void EndWipeDataFromDevice(System.IAsyncResult asyncResult) {
-            this.EndInvoke(asyncResult);
-        }
-        
-        /// <remarks/>
-        public void WipeDataFromDeviceAsync(string id) {
-            this.WipeDataFromDeviceAsync(id, null);
-        }
-        
-        /// <remarks/>
-        public void WipeDataFromDeviceAsync(string id, object userState) {
-            if ((this.WipeDataFromDeviceOperationCompleted == null)) {
-                this.WipeDataFromDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWipeDataFromDeviceOperationCompleted);
-            }
-            this.InvokeAsync("WipeDataFromDevice", new object[] {
-                        id}, this.WipeDataFromDeviceOperationCompleted, userState);
-        }
-        
-        private void OnWipeDataFromDeviceOperationCompleted(object arg) {
-            if ((this.WipeDataFromDeviceCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.WipeDataFromDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CancelRemoteWipeRequest", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void CancelRemoteWipeRequest(string id) {
-            this.Invoke("CancelRemoteWipeRequest", new object[] {
-                        id});
-        }
-        
-        /// <remarks/>
-        public System.IAsyncResult BeginCancelRemoteWipeRequest(string id, System.AsyncCallback callback, object asyncState) {
-            return this.BeginInvoke("CancelRemoteWipeRequest", new object[] {
-                        id}, callback, asyncState);
-        }
-        
-        /// <remarks/>
-        public void EndCancelRemoteWipeRequest(System.IAsyncResult asyncResult) {
-            this.EndInvoke(asyncResult);
-        }
-        
-        /// <remarks/>
-        public void CancelRemoteWipeRequestAsync(string id) {
-            this.CancelRemoteWipeRequestAsync(id, null);
-        }
-        
-        /// <remarks/>
-        public void CancelRemoteWipeRequestAsync(string id, object userState) {
-            if ((this.CancelRemoteWipeRequestOperationCompleted == null)) {
-                this.CancelRemoteWipeRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCancelRemoteWipeRequestOperationCompleted);
-            }
-            this.InvokeAsync("CancelRemoteWipeRequest", new object[] {
-                        id}, this.CancelRemoteWipeRequestOperationCompleted, userState);
-        }
-        
-        private void OnCancelRemoteWipeRequestOperationCompleted(object arg) {
-            if ((this.CancelRemoteWipeRequestCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.CancelRemoteWipeRequestCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/RemoveDevice", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RemoveDevice(string id) {
-            this.Invoke("RemoveDevice", new object[] {
-                        id});
-        }
-        
-        /// <remarks/>
-        public System.IAsyncResult BeginRemoveDevice(string id, System.AsyncCallback callback, object asyncState) {
-            return this.BeginInvoke("RemoveDevice", new object[] {
-                        id}, callback, asyncState);
-        }
-        
-        /// <remarks/>
-        public void EndRemoveDevice(System.IAsyncResult asyncResult) {
-            this.EndInvoke(asyncResult);
-        }
-        
-        /// <remarks/>
-        public void RemoveDeviceAsync(string id) {
-            this.RemoveDeviceAsync(id, null);
-        }
-        
-        /// <remarks/>
-        public void RemoveDeviceAsync(string id, object userState) {
-            if ((this.RemoveDeviceOperationCompleted == null)) {
-                this.RemoveDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDeviceOperationCompleted);
-            }
-            this.InvokeAsync("RemoveDevice", new object[] {
-                        id}, this.RemoveDeviceOperationCompleted, userState);
-        }
-        
-        private void OnRemoveDeviceOperationCompleted(object arg) {
-            if ((this.RemoveDeviceCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.RemoveDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
         }
     }
     
-    
+    /// <remarks/>
-    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    
+    public delegate void WipeDataFromDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CancelRemoteWipeRequestCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void RemoveDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CheckAccountCredentialsCompletedEventHandler(object sender, CheckAccountCredentialsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CheckAccountCredentialsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4129,11 +4124,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void ExtendToExchangeOrganizationCompletedEventHandler(object sender, ExtendToExchangeOrganizationCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ExtendToExchangeOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4155,11 +4150,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateMailEnableUserCompletedEventHandler(object sender, CreateMailEnableUserCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CreateMailEnableUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4181,11 +4176,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateOrganizationOfflineAddressBookCompletedEventHandler(object sender, CreateOrganizationOfflineAddressBookCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CreateOrganizationOfflineAddressBookCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4207,15 +4202,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdateOrganizationOfflineAddressBookCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOABVirtualDirectoryCompletedEventHandler(object sender, GetOABVirtualDirectoryCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetOABVirtualDirectoryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4237,11 +4232,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteOrganizationCompletedEventHandler(object sender, DeleteOrganizationCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class DeleteOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4263,15 +4258,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetOrganizationStorageLimitsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxesStatisticsCompletedEventHandler(object sender, GetMailboxesStatisticsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxesStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4293,15 +4288,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddAuthoritativeDomainCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetAuthoritativeDomainsCompletedEventHandler(object sender, GetAuthoritativeDomainsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetAuthoritativeDomainsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4323,15 +4318,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteAuthoritativeDomainCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateMailboxCompletedEventHandler(object sender, CreateMailboxCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CreateMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4353,19 +4348,19 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteMailboxCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DisableMailboxCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxGeneralSettingsCompletedEventHandler(object sender, GetMailboxGeneralSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4387,15 +4382,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxMailFlowSettingsCompletedEventHandler(object sender, GetMailboxMailFlowSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4417,15 +4412,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxMailFlowSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxAdvancedSettingsCompletedEventHandler(object sender, GetMailboxAdvancedSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxAdvancedSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4447,15 +4442,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxAdvancedSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxEmailAddressesCompletedEventHandler(object sender, GetMailboxEmailAddressesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4477,23 +4472,23 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxEmailAddressesCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxPrimaryEmailAddressCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxPermissionsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxPermissionsCompletedEventHandler(object sender, GetMailboxPermissionsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4515,11 +4510,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxStatisticsCompletedEventHandler(object sender, GetMailboxStatisticsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMailboxStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4541,19 +4536,19 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateContactCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteContactCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetContactGeneralSettingsCompletedEventHandler(object sender, GetContactGeneralSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetContactGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4575,15 +4570,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetContactGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetContactMailFlowSettingsCompletedEventHandler(object sender, GetContactMailFlowSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetContactMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4605,23 +4600,23 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetContactMailFlowSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateDistributionListCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteDistributionListCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListGeneralSettingsCompletedEventHandler(object sender, GetDistributionListGeneralSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetDistributionListGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4643,15 +4638,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListMailFlowSettingsCompletedEventHandler(object sender, GetDistributionListMailFlowSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetDistributionListMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4673,15 +4668,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListMailFlowSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListEmailAddressesCompletedEventHandler(object sender, GetDistributionListEmailAddressesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetDistributionListEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4703,23 +4698,23 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListEmailAddressesCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListPrimaryEmailAddressCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListPermissionsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListPermissionsCompletedEventHandler(object sender, GetDistributionListPermissionsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetDistributionListPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4741,27 +4736,27 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreatePublicFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePublicFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void EnableMailPublicFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DisableMailPublicFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderGeneralSettingsCompletedEventHandler(object sender, GetPublicFolderGeneralSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFolderGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4783,15 +4778,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderMailFlowSettingsCompletedEventHandler(object sender, GetPublicFolderMailFlowSettingsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFolderMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4813,15 +4808,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderMailFlowSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderEmailAddressesCompletedEventHandler(object sender, GetPublicFolderEmailAddressesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFolderEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4843,19 +4838,19 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderEmailAddressesCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderPrimaryEmailAddressCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFoldersStatisticsCompletedEventHandler(object sender, GetPublicFoldersStatisticsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFoldersStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4877,11 +4872,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFoldersRecursiveCompletedEventHandler(object sender, GetPublicFoldersRecursiveCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFoldersRecursiveCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4903,11 +4898,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderSizeCompletedEventHandler(object sender, GetPublicFolderSizeCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetPublicFolderSizeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4929,15 +4924,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateOrganizationActiveSyncPolicyCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetActiveSyncPolicyCompletedEventHandler(object sender, GetActiveSyncPolicyCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetActiveSyncPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4959,15 +4954,15 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetActiveSyncPolicyCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMobileDevicesCompletedEventHandler(object sender, GetMobileDevicesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMobileDevicesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4989,11 +4984,11 @@ namespace WebsitePanel.Providers.Exchange {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMobileDeviceCompletedEventHandler(object sender, GetMobileDeviceCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetMobileDeviceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -5013,16 +5008,4 @@ namespace WebsitePanel.Providers.Exchange {
             }
         }
     }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
-    public delegate void WipeDataFromDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
-    public delegate void CancelRemoteWipeRequestCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
-    public delegate void RemoveDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }

WebsitePanel/Sources/WebsitePanel.Server/ExchangeServer.asmx.cs

@@ -896,12 +896,12 @@ namespace WebsitePanel.Server
 
 		[WebMethod, SoapHeader("settings")]
 		public void SetPublicFolderGeneralSettings(string folder, string newFolderName,
-			string[] authorAccounts, bool hideFromAddressBook)
+			 bool hideFromAddressBook, ExchangeAccount[] accounts)
 		{
 			try
 			{
 				LogStart("SetPublicFolderGeneralSettings");
-				ES.SetPublicFolderGeneralSettings(folder, newFolderName, authorAccounts, hideFromAddressBook);
+				ES.SetPublicFolderGeneralSettings(folder, newFolderName, hideFromAddressBook,  accounts);
 				LogEnd("SetPublicFolderGeneralSettings");
 			}
 			catch (Exception ex)

WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj

@@ -224,7 +224,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
-          <DevelopmentServerPort>9003</DevelopmentServerPort>
+          <DevelopmentServerPort>9004</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/WebsitePanel.Portal.Ecommerce.Modules.csproj

@@ -18,6 +18,7 @@
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -111,42 +112,36 @@
     </Compile>
     <Compile Include="BillingCycles.ascx.cs">
       <DependentUpon>BillingCycles.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="BillingCycles.ascx.designer.cs">
       <DependentUpon>BillingCycles.ascx</DependentUpon>
     </Compile>
     <Compile Include="BillingCyclesAddCycle.ascx.cs">
       <DependentUpon>BillingCyclesAddCycle.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="BillingCyclesAddCycle.ascx.designer.cs">
       <DependentUpon>BillingCyclesAddCycle.ascx</DependentUpon>
     </Compile>
     <Compile Include="BillingCyclesEditCycle.ascx.cs">
       <DependentUpon>BillingCyclesEditCycle.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="BillingCyclesEditCycle.ascx.designer.cs">
       <DependentUpon>BillingCyclesEditCycle.ascx</DependentUpon>
     </Compile>
     <Compile Include="Categories.ascx.cs">
       <DependentUpon>Categories.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Categories.ascx.designer.cs">
       <DependentUpon>Categories.ascx</DependentUpon>
     </Compile>
     <Compile Include="CategoriesAddCategory.ascx.cs">
       <DependentUpon>CategoriesAddCategory.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CategoriesAddCategory.ascx.designer.cs">
       <DependentUpon>CategoriesAddCategory.ascx</DependentUpon>
     </Compile>
     <Compile Include="CategoriesEditCategory.ascx.cs">
       <DependentUpon>CategoriesEditCategory.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CategoriesEditCategory.ascx.designer.cs">
       <DependentUpon>CategoriesEditCategory.ascx</DependentUpon>
@@ -158,12 +153,8 @@
     <Compile Include="Code\Framework\CheckoutBasePage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Code\Framework\ecControlBase.cs">
+    <Compile Include="Code\Framework\ecControlBase.cs" />
-      <SubType>ASPXCodeBehind</SubType>
+    <Compile Include="Code\Framework\ecModuleBase.cs" />
-    </Compile>
-    <Compile Include="Code\Framework\ecModuleBase.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="Code\Framework\ecPanelFormatter.cs" />
     <Compile Include="Code\Framework\ecPanelGlobals.cs" />
     <Compile Include="Code\Framework\ecPanelRequest.cs" />
@@ -190,175 +181,150 @@
     </Compile>
     <Compile Include="CustomerPaymentProfile.ascx.cs">
       <DependentUpon>CustomerPaymentProfile.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomerPaymentProfile.ascx.designer.cs">
       <DependentUpon>CustomerPaymentProfile.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersInvoices.ascx.cs">
       <DependentUpon>CustomersInvoices.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersInvoices.ascx.designer.cs">
       <DependentUpon>CustomersInvoices.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersInvoicesViewInvoice.ascx.cs">
       <DependentUpon>CustomersInvoicesViewInvoice.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersInvoicesViewInvoice.ascx.designer.cs">
       <DependentUpon>CustomersInvoicesViewInvoice.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersPayments.ascx.cs">
       <DependentUpon>CustomersPayments.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersPayments.ascx.designer.cs">
       <DependentUpon>CustomersPayments.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersServices.ascx.cs">
       <DependentUpon>CustomersServices.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersServices.ascx.designer.cs">
       <DependentUpon>CustomersServices.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersServicesUpgradeService.ascx.cs">
       <DependentUpon>CustomersServicesUpgradeService.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersServicesUpgradeService.ascx.designer.cs">
       <DependentUpon>CustomersServicesUpgradeService.ascx</DependentUpon>
     </Compile>
     <Compile Include="CustomersServicesViewService.ascx.cs">
       <DependentUpon>CustomersServicesViewService.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="CustomersServicesViewService.ascx.designer.cs">
       <DependentUpon>CustomersServicesViewService.ascx</DependentUpon>
     </Compile>
     <Compile Include="DomainNames.ascx.cs">
       <DependentUpon>DomainNames.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DomainNames.ascx.designer.cs">
       <DependentUpon>DomainNames.ascx</DependentUpon>
     </Compile>
     <Compile Include="DomainNamesAddDomain.ascx.cs">
       <DependentUpon>DomainNamesAddDomain.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DomainNamesAddDomain.ascx.designer.cs">
       <DependentUpon>DomainNamesAddDomain.ascx</DependentUpon>
     </Compile>
     <Compile Include="DomainNamesEditDomain.ascx.cs">
       <DependentUpon>DomainNamesEditDomain.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DomainNamesEditDomain.ascx.designer.cs">
       <DependentUpon>DomainNamesEditDomain.ascx</DependentUpon>
     </Compile>
     <Compile Include="DomainRegistrarDirecti.ascx.cs">
       <DependentUpon>DomainRegistrarDirecti.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DomainRegistrarDirecti.ascx.designer.cs">
       <DependentUpon>DomainRegistrarDirecti.ascx</DependentUpon>
     </Compile>
     <Compile Include="DomainRegistrarEnom.ascx.cs">
       <DependentUpon>DomainRegistrarEnom.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="DomainRegistrarEnom.ascx.designer.cs">
       <DependentUpon>DomainRegistrarEnom.ascx</DependentUpon>
     </Compile>
     <Compile Include="EcommerceSystemSettings.ascx.cs">
       <DependentUpon>EcommerceSystemSettings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="EcommerceSystemSettings.ascx.designer.cs">
       <DependentUpon>EcommerceSystemSettings.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingAddons.ascx.cs">
       <DependentUpon>HostingAddons.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingAddons.ascx.designer.cs">
       <DependentUpon>HostingAddons.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingAddonsAddAddon.ascx.cs">
       <DependentUpon>HostingAddonsAddAddon.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingAddonsAddAddon.ascx.designer.cs">
       <DependentUpon>HostingAddonsAddAddon.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingAddonsEditAddon.ascx.cs">
       <DependentUpon>HostingAddonsEditAddon.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingAddonsEditAddon.ascx.designer.cs">
       <DependentUpon>HostingAddonsEditAddon.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingPlans.ascx.cs">
       <DependentUpon>HostingPlans.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingPlans.ascx.designer.cs">
       <DependentUpon>HostingPlans.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingPlansAddPlan.ascx.cs">
       <DependentUpon>HostingPlansAddPlan.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingPlansAddPlan.ascx.designer.cs">
       <DependentUpon>HostingPlansAddPlan.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostingPlansEditPlan.ascx.cs">
       <DependentUpon>HostingPlansEditPlan.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="HostingPlansEditPlan.ascx.designer.cs">
       <DependentUpon>HostingPlansEditPlan.ascx</DependentUpon>
     </Compile>
     <Compile Include="NotificationNewInvoice.ascx.cs">
       <DependentUpon>NotificationNewInvoice.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NotificationNewInvoice.ascx.designer.cs">
       <DependentUpon>NotificationNewInvoice.ascx</DependentUpon>
     </Compile>
     <Compile Include="NotificationPaymentReceived.ascx.cs">
       <DependentUpon>NotificationPaymentReceived.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NotificationPaymentReceived.ascx.designer.cs">
       <DependentUpon>NotificationPaymentReceived.ascx</DependentUpon>
     </Compile>
     <Compile Include="NotificationServiceActivated.ascx.cs">
       <DependentUpon>NotificationServiceActivated.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NotificationServiceActivated.ascx.designer.cs">
       <DependentUpon>NotificationServiceActivated.ascx</DependentUpon>
     </Compile>
     <Compile Include="NotificationServiceCancelled.ascx.cs">
       <DependentUpon>NotificationServiceCancelled.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NotificationServiceCancelled.ascx.designer.cs">
       <DependentUpon>NotificationServiceCancelled.ascx</DependentUpon>
     </Compile>
     <Compile Include="NotificationServiceSuspended.ascx.cs">
       <DependentUpon>NotificationServiceSuspended.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="NotificationServiceSuspended.ascx.designer.cs">
       <DependentUpon>NotificationServiceSuspended.ascx</DependentUpon>
     </Compile>
     <Compile Include="OrderFailed.ascx.cs">
       <DependentUpon>OrderFailed.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="OrderFailed.ascx.designer.cs">
       <DependentUpon>OrderFailed.ascx</DependentUpon>
@@ -372,56 +338,48 @@
     </Compile>
     <Compile Include="PaymentMethod2Checkout.ascx.cs">
       <DependentUpon>PaymentMethod2Checkout.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethod2Checkout.ascx.designer.cs">
       <DependentUpon>PaymentMethod2Checkout.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethodCreditCard.ascx.cs">
       <DependentUpon>PaymentMethodCreditCard.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethodCreditCard.ascx.designer.cs">
       <DependentUpon>PaymentMethodCreditCard.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethodOffline.ascx.cs">
       <DependentUpon>PaymentMethodOffline.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethodOffline.ascx.designer.cs">
       <DependentUpon>PaymentMethodOffline.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethodPayPalAccount.ascx.cs">
       <DependentUpon>PaymentMethodPayPalAccount.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethodPayPalAccount.ascx.designer.cs">
       <DependentUpon>PaymentMethodPayPalAccount.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethods\2CO_Payment.ascx.cs">
       <DependentUpon>2CO_Payment.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethods\2CO_Payment.ascx.designer.cs">
       <DependentUpon>2CO_Payment.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethods\CreditCard_Payment.ascx.cs">
       <DependentUpon>CreditCard_Payment.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethods\CreditCard_Payment.ascx.designer.cs">
       <DependentUpon>CreditCard_Payment.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethods\Offline_Payment.ascx.cs">
       <DependentUpon>Offline_Payment.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethods\Offline_Payment.ascx.designer.cs">
       <DependentUpon>Offline_Payment.ascx</DependentUpon>
     </Compile>
     <Compile Include="PaymentMethods\PPAccount_Payment.ascx.cs">
       <DependentUpon>PPAccount_Payment.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PaymentMethods\PPAccount_Payment.ascx.designer.cs">
       <DependentUpon>PPAccount_Payment.ascx</DependentUpon>
@@ -435,35 +393,30 @@
     </Compile>
     <Compile Include="ProductControls\DomainName_ServiceDetails.ascx.cs">
       <DependentUpon>DomainName_ServiceDetails.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductControls\DomainName_ServiceDetails.ascx.designer.cs">
       <DependentUpon>DomainName_ServiceDetails.ascx</DependentUpon>
     </Compile>
     <Compile Include="ProductControls\HostingAddon_ServiceDetails.ascx.cs">
       <DependentUpon>HostingAddon_ServiceDetails.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductControls\HostingAddon_ServiceDetails.ascx.designer.cs">
       <DependentUpon>HostingAddon_ServiceDetails.ascx</DependentUpon>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_Brief.ascx.cs">
       <DependentUpon>HostingPlan_Brief.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_Brief.ascx.designer.cs">
       <DependentUpon>HostingPlan_Brief.ascx</DependentUpon>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_Highlights.ascx.cs">
       <DependentUpon>HostingPlan_Highlights.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_Highlights.ascx.designer.cs">
       <DependentUpon>HostingPlan_Highlights.ascx</DependentUpon>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_ServiceDetails.ascx.cs">
       <DependentUpon>HostingPlan_ServiceDetails.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProductControls\HostingPlan_ServiceDetails.ascx.designer.cs">
       <DependentUpon>HostingPlan_ServiceDetails.ascx</DependentUpon>
@@ -471,28 +424,24 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProvisioningSettingsEdit.ascx.cs">
       <DependentUpon>ProvisioningSettingsEdit.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ProvisioningSettingsEdit.ascx.designer.cs">
       <DependentUpon>ProvisioningSettingsEdit.ascx</DependentUpon>
     </Compile>
     <Compile Include="QuickSignup.ascx.cs">
       <DependentUpon>QuickSignup.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="QuickSignup.ascx.designer.cs">
       <DependentUpon>QuickSignup.ascx</DependentUpon>
     </Compile>
     <Compile Include="OrderComplete.ascx.cs">
       <DependentUpon>OrderComplete.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="OrderComplete.ascx.designer.cs">
       <DependentUpon>OrderComplete.ascx</DependentUpon>
     </Compile>
     <Compile Include="OrderCheckout.ascx.cs">
       <DependentUpon>OrderCheckout.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="OrderCheckout.ascx.designer.cs">
       <DependentUpon>OrderCheckout.ascx</DependentUpon>
@@ -504,119 +453,102 @@
     </Compile>
     <Compile Include="SkinControls\CatalogBreadCrumb.ascx.cs">
       <DependentUpon>CatalogBreadCrumb.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SkinControls\CatalogBreadCrumb.ascx.designer.cs">
       <DependentUpon>CatalogBreadCrumb.ascx</DependentUpon>
     </Compile>
     <Compile Include="StorefrontMenu.ascx.cs">
       <DependentUpon>StorefrontMenu.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="StorefrontMenu.ascx.designer.cs">
       <DependentUpon>StorefrontMenu.ascx</DependentUpon>
     </Compile>
     <Compile Include="StorefrontOrderProduct.ascx.cs">
       <DependentUpon>StorefrontOrderProduct.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="StorefrontOrderProduct.ascx.designer.cs">
       <DependentUpon>StorefrontOrderProduct.ascx</DependentUpon>
     </Compile>
     <Compile Include="StorefrontViewCategory.ascx.cs">
       <DependentUpon>StorefrontViewCategory.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="StorefrontViewCategory.ascx.designer.cs">
       <DependentUpon>StorefrontViewCategory.ascx</DependentUpon>
     </Compile>
     <Compile Include="StorefrontWelcome.ascx.cs">
       <DependentUpon>StorefrontWelcome.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="StorefrontWelcome.ascx.designer.cs">
       <DependentUpon>StorefrontWelcome.ascx</DependentUpon>
     </Compile>
     <Compile Include="StorefrontWelcomeEdit.ascx.cs">
       <DependentUpon>StorefrontWelcomeEdit.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="StorefrontWelcomeEdit.ascx.designer.cs">
       <DependentUpon>StorefrontWelcomeEdit.ascx</DependentUpon>
     </Compile>
     <Compile Include="SupportedPlugins\2Checkout_Settings.ascx.cs">
       <DependentUpon>2Checkout_Settings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SupportedPlugins\2Checkout_Settings.ascx.designer.cs">
       <DependentUpon>2Checkout_Settings.ascx</DependentUpon>
     </Compile>
     <Compile Include="SupportedPlugins\AuthorizeNet_Settings.ascx.cs">
       <DependentUpon>AuthorizeNet_Settings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SupportedPlugins\AuthorizeNet_Settings.ascx.designer.cs">
       <DependentUpon>AuthorizeNet_Settings.ascx</DependentUpon>
     </Compile>
     <Compile Include="SupportedPlugins\OfflinePayment_Settings.ascx.cs">
       <DependentUpon>OfflinePayment_Settings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SupportedPlugins\OfflinePayment_Settings.ascx.designer.cs">
       <DependentUpon>OfflinePayment_Settings.ascx</DependentUpon>
     </Compile>
     <Compile Include="SupportedPlugins\PayPalPro_Settings.ascx.cs">
       <DependentUpon>PayPalPro_Settings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SupportedPlugins\PayPalPro_Settings.ascx.designer.cs">
       <DependentUpon>PayPalPro_Settings.ascx</DependentUpon>
     </Compile>
     <Compile Include="SupportedPlugins\PayPalStandard_Settings.ascx.cs">
       <DependentUpon>PayPalStandard_Settings.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="SupportedPlugins\PayPalStandard_Settings.ascx.designer.cs">
       <DependentUpon>PayPalStandard_Settings.ascx</DependentUpon>
     </Compile>
     <Compile Include="Taxations.ascx.cs">
       <DependentUpon>Taxations.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Taxations.ascx.designer.cs">
       <DependentUpon>Taxations.ascx</DependentUpon>
     </Compile>
     <Compile Include="TaxationsAddTax.ascx.cs">
       <DependentUpon>TaxationsAddTax.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TaxationsAddTax.ascx.designer.cs">
       <DependentUpon>TaxationsAddTax.ascx</DependentUpon>
     </Compile>
     <Compile Include="TaxationsEditTax.ascx.cs">
       <DependentUpon>TaxationsEditTax.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TaxationsEditTax.ascx.designer.cs">
       <DependentUpon>TaxationsEditTax.ascx</DependentUpon>
     </Compile>
     <Compile Include="TermsAndConditions.ascx.cs">
       <DependentUpon>TermsAndConditions.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TermsAndConditions.ascx.designer.cs">
       <DependentUpon>TermsAndConditions.ascx</DependentUpon>
     </Compile>
     <Compile Include="TermsAndConditionsEdit.ascx.cs">
       <DependentUpon>TermsAndConditionsEdit.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TermsAndConditionsEdit.ascx.designer.cs">
       <DependentUpon>TermsAndConditionsEdit.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\AddonProducts.ascx.cs">
       <DependentUpon>AddonProducts.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\AddonProducts.ascx.designer.cs">
       <DependentUpon>AddonProducts.ascx</DependentUpon>
@@ -633,140 +565,120 @@
     </Compile>
     <Compile Include="UserControls\ChoosePaymentMethod.ascx.cs">
       <DependentUpon>ChoosePaymentMethod.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\ChoosePaymentMethod.ascx.designer.cs">
       <DependentUpon>ChoosePaymentMethod.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\CreateUserAccount.ascx.cs">
       <DependentUpon>CreateUserAccount.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\CreateUserAccount.ascx.designer.cs">
       <DependentUpon>CreateUserAccount.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\CustomerInvoiceTemplated.ascx.cs">
       <DependentUpon>CustomerInvoiceTemplated.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\CustomerInvoiceTemplated.ascx.designer.cs">
       <DependentUpon>CustomerInvoiceTemplated.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\DomainNameBillingCycles.ascx.cs">
       <DependentUpon>DomainNameBillingCycles.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\DomainNameBillingCycles.ascx.designer.cs">
       <DependentUpon>DomainNameBillingCycles.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\EmailNotificationEditor.ascx.cs">
       <DependentUpon>EmailNotificationEditor.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\EmailNotificationEditor.ascx.designer.cs">
       <DependentUpon>EmailNotificationEditor.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\HostingAddonOneTimeFee.ascx.cs">
       <DependentUpon>HostingAddonOneTimeFee.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\HostingAddonOneTimeFee.ascx.designer.cs">
       <DependentUpon>HostingAddonOneTimeFee.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\HostingPlanBillingCycles.ascx.cs">
       <DependentUpon>HostingPlanBillingCycles.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\HostingPlanBillingCycles.ascx.designer.cs">
       <DependentUpon>HostingPlanBillingCycles.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\HostingPlanQuotas.ascx.cs">
       <DependentUpon>HostingPlanQuotas.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\HostingPlanQuotas.ascx.designer.cs">
       <DependentUpon>HostingPlanQuotas.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\LoginUserAccount.ascx.cs">
       <DependentUpon>LoginUserAccount.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\LoginUserAccount.ascx.designer.cs">
       <DependentUpon>LoginUserAccount.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\ManualPaymentAdd.ascx.cs">
       <DependentUpon>ManualPaymentAdd.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\ManualPaymentAdd.ascx.designer.cs">
       <DependentUpon>ManualPaymentAdd.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\PlanDomainOption.ascx.cs">
       <DependentUpon>PlanDomainOption.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\PlanDomainOption.ascx.designer.cs">
       <DependentUpon>PlanDomainOption.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\PlanHostingAddons.ascx.cs">
       <DependentUpon>PlanHostingAddons.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\PlanHostingAddons.ascx.designer.cs">
       <DependentUpon>PlanHostingAddons.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\ProductHighlights.ascx.cs">
       <DependentUpon>ProductHighlights.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\ProductHighlights.ascx.designer.cs">
       <DependentUpon>ProductHighlights.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\QuickHostingAddon.ascx.cs">
       <DependentUpon>QuickHostingAddon.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\QuickHostingAddon.ascx.designer.cs">
       <DependentUpon>QuickHostingAddon.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\QuickHostingPlanCycles.ascx.cs">
       <DependentUpon>QuickHostingPlanCycles.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\QuickHostingPlanCycles.ascx.designer.cs">
       <DependentUpon>QuickHostingPlanCycles.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\QuickHostingPlans.ascx.cs">
       <DependentUpon>QuickHostingPlans.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\QuickHostingPlans.ascx.designer.cs">
       <DependentUpon>QuickHostingPlans.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\PathBreadCrumb.ascx.cs">
       <DependentUpon>PathBreadCrumb.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\PathBreadCrumb.ascx.designer.cs">
       <DependentUpon>PathBreadCrumb.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\ProductCategories.ascx.cs">
       <DependentUpon>ProductCategories.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\ProductCategories.ascx.designer.cs">
       <DependentUpon>ProductCategories.ascx</DependentUpon>
     </Compile>
     <Compile Include="UserControls\UserAccountDetails.ascx.cs">
       <DependentUpon>UserAccountDetails.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="UserControls\UserAccountDetails.ascx.designer.cs">
       <DependentUpon>UserAccountDetails.ascx</DependentUpon>
     </Compile>
     <Compile Include="ViewProductDetails.ascx.cs">
       <DependentUpon>ViewProductDetails.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="ViewProductDetails.ascx.designer.cs">
       <DependentUpon>ViewProductDetails.ascx</DependentUpon>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangePublicFolderGeneralSettings.ascx

@@ -7,6 +7,7 @@
 <%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
 <%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register src="UserControls/AccountsListWithPermissions.ascx" tagname="AccountsListWithPermissions" tagprefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
@@ -48,17 +49,20 @@
 							    <asp:Button ID="btnMailDisable" runat="server" Text="Mail Disable Folder" meta:resourcekey="btnMailDisable" CssClass="Button1" CausesValidation="false" OnClick="btnMailDisable_Click" />
 							</td>
 						</tr>
+					    
+					    <tr><td>&nbsp;</td></tr>
                         					    <tr><td>&nbsp;</td></tr>
 						<tr>
-							<td colspan="2"><asp:Localize ID="locAuthors" runat="server" meta:resourcekey="locAuthors" Text="Authors:"></asp:Localize></td>
+							<td colspan="2"><asp:Localize ID="locAllAccounts" runat="server" meta:resourcekey="locAllAccounts" Text="Accounts:"></asp:Localize></td>
 						</tr>
 						<tr>
 						    <td colspan="2">                                
-                                <wsp:AccountsList id="authors" runat="server"
+                            	<wsp:AccountsListWithPermissions ID="allAccounts" runat="server" MailboxesEnabled="true"/>
-										MailboxesEnabled="true" />
+                                
                             </td>
 						</tr>
 						<tr><td>&nbsp;</td></tr>
+						
 						<tr>
 						    <td>
 						        <br />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangePublicFolderGeneralSettings.ascx.cs

@@ -30,6 +30,9 @@ using System;
 using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.EnterpriseServer;
 using Microsoft.Security.Application;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
 
 namespace WebsitePanel.Portal.ExchangeServer
 {
@@ -65,8 +68,26 @@ namespace WebsitePanel.Portal.ExchangeServer
                 // bind form
                 txtName.Text = folder.Name;
                 chkHideAddressBook.Checked = folder.HideFromAddressBook;
+				List<ExchangeAccount> list = new List<ExchangeAccount>();
 				
-                authors.SetAccounts(folder.AuthorsAccounts);
+					foreach (ExchangeAccount ex in folder.Accounts)
+					{ 
+                      try
+                        {
+                            if (ex != null) 
+                            { 
+                            list.Add(ex);
+                           
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            continue;
+                        }
+					}
+				
+                    ExchangeAccount[] accounts = list.ToArray();
+                    allAccounts.SetAccounts(accounts);                   	
             }
             catch (Exception ex)
             {
@@ -85,8 +106,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                     PanelRequest.ItemID, PanelRequest.AccountID,
                     txtName.Text,
                     chkHideAddressBook.Checked,
-
+					allAccounts.GetAccounts());
-                    authors.GetAccounts());
                
                 if (result < 0)
                 {
@@ -101,6 +121,8 @@ namespace WebsitePanel.Portal.ExchangeServer
                 origName = origName.Substring(0, origName.LastIndexOf("\\"));
 
                 litDisplayName.Text = AntiXss.HtmlEncode(origName + txtName.Text);
+
+				BindSettings();
             }
             catch (Exception ex)
             {

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangePublicFolderGeneralSettings.ascx.designer.cs

@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated. 
@@ -10,25 +9,178 @@
 
 namespace WebsitePanel.Portal.ExchangeServer {
     
+    
     public partial class ExchangePublicFolderGeneralSettings {
-        protected WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
-        protected WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
+        /// <summary>
-        protected WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+        /// asyncTasks control.
-        protected System.Web.UI.WebControls.Image Image1;
+        /// </summary>
-        protected System.Web.UI.WebControls.Localize locTitle;
+        /// <remarks>
-        protected System.Web.UI.WebControls.Literal litDisplayName;
+        /// Auto-generated field.
-        protected WebsitePanel.Portal.ExchangeServer.UserControls.PublicFolderTabs tabs;
+        /// To modify move field declaration from designer file to code-behind file.
-        protected WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        /// </remarks>
-        protected System.Web.UI.WebControls.Localize locName;
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
-        protected System.Web.UI.WebControls.TextBox txtName;
+        
-        protected System.Web.UI.WebControls.RequiredFieldValidator valDisplayName;
+        /// <summary>
-        protected System.Web.UI.WebControls.Button btnMailEnable;
+        /// breadcrumb control.
-        protected System.Web.UI.WebControls.Button btnMailDisable;
+        /// </summary>
-        protected System.Web.UI.WebControls.Localize locAuthors;
+        /// <remarks>
-        protected WebsitePanel.Portal.ExchangeServer.UserControls.AccountsList authors;
+        /// Auto-generated field.
-        protected System.Web.UI.WebControls.CheckBox chkHideAddressBook;
+        /// To modify move field declaration from designer file to code-behind file.
-        protected System.Web.UI.WebControls.Button btnSave;
+        /// </remarks>
-        protected System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
-        protected System.Web.UI.WebControls.Localize FormComments;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// litDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal litDisplayName;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.PublicFolderTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locName;
+        
+        /// <summary>
+        /// txtName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtName;
+        
+        /// <summary>
+        /// valDisplayName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valDisplayName;
+        
+        /// <summary>
+        /// btnMailEnable control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnMailEnable;
+        
+        /// <summary>
+        /// btnMailDisable control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnMailDisable;
+        
+        /// <summary>
+        /// locAllAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locAllAccounts;
+        
+        /// <summary>
+        /// allAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.AccountsListWithPermissions allAccounts;
+        
+        /// <summary>
+        /// chkHideAddressBook control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkHideAddressBook;
+        
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSave;
+        
+        /// <summary>
+        /// ValidationSummary1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+        
+        /// <summary>
+        /// FormComments control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize FormComments;
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/AccountsListWithPermissions.ascx

@@ -0,0 +1,152 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="AccountsListWithPermissions.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.AccountsListWithPermissions" %>
+<%@ Register Src="../../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+
+<asp:UpdatePanel ID="AccountsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+    
+	<div class="FormButtonsBarClean">
+		<asp:Button ID="btnAdd" runat="server" Text="Add..." CssClass="Button1" OnClick="btnAdd_Click" meta:resourcekey="btnAdd"  />
+		<asp:Button ID="btnDelete" runat="server" Text="Delete" CssClass="Button1" OnClick="btnDelete_Click" meta:resourcekey="btnDelete"/>
+	</div>
+    
+	<asp:GridView ID="gvAccounts" runat="server" meta:resourcekey="gvAccounts" AutoGenerateColumns="False"
+		Width="600px" CssSelectorClass="NormalGridView" OnRowDataBound="gvAccounts_RowDataBound"
+		DataKeyNames="AccountName" >
+		<Columns>
+			<asp:TemplateField>
+				<HeaderTemplate>
+					<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+				</HeaderTemplate>
+				<ItemTemplate>
+					<asp:CheckBox ID="chkSelect" runat="server" />
+					<asp:Literal ID="litAccountType" runat="server" Visible="false" Text='<%# Eval("AccountType") %>'></asp:Literal>
+				</ItemTemplate>
+				<ItemStyle Width="10px" />
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvAccountsDisplayName" HeaderText="gvAccountsDisplayName">
+				<HeaderStyle Wrap="false" />
+				<ItemStyle Width="50%" Wrap="false"></ItemStyle>
+				<ItemTemplate>
+					<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
+					<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+				</ItemTemplate>
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvAccountsEmail" HeaderText="gvAccountsEmail">
+				<HeaderStyle Wrap="false" />
+				<ItemStyle Width="50%" Wrap="false"></ItemStyle>
+				<ItemTemplate>
+					<asp:Literal ID="litPrimaryEmailAddress" runat="server" Text='<%# Eval("PrimaryEmailAddress") %>'></asp:Literal>
+				</ItemTemplate>
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvAccountsPermissions" HeaderText="Folder Permission">
+				<HeaderStyle Wrap="false" />
+				<ItemStyle Width="50%" Wrap="false"></ItemStyle>
+				<ItemTemplate>					
+					<asp:DropDownList ID="ddlPermissions" runat="server" AutoPostBack="true" OnSelectedIndexChanged="ddlPermissions_SelectedIndexChanged" >
+						<asp:ListItem Text="None" Value="None"></asp:ListItem>
+                        <asp:ListItem Text="Owner" Value="Owner"></asp:ListItem>
+						<asp:ListItem Text="Publishing Editor" Value="PublishingEditor"></asp:ListItem>
+						<asp:ListItem Text="Editor" Value="Editor"></asp:ListItem>
+						<asp:ListItem Text="Publishing Author" Value="PublishingAuthor"></asp:ListItem>
+						<asp:ListItem Text="Author" Value="Author" Selected="True"></asp:ListItem>
+						<asp:ListItem Text="Reviewer" Value="Reviewer"></asp:ListItem>
+						<asp:ListItem Text="Contributor" Value="Contributor"></asp:ListItem>
+					</asp:DropDownList>
+                    <asp:HiddenField runat="server" ID="PermissionLabel" />
+				</ItemTemplate>
+			</asp:TemplateField>
+		</Columns>
+	</asp:GridView>
+
+
+<asp:Panel ID="AddAccountsPanel" runat="server" CssClass="Popup" style="display:none">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="headerAddAccounts" runat="server" meta:resourcekey="headerAddAccounts"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+<asp:UpdatePanel ID="AddAccountsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+	</ContentTemplate>
+</asp:UpdatePanel>
+	            <div style="text-align:right;margin-bottom: 4px;">
+					<asp:Localize ID="locIncludeSearch" runat="server" Text="Include in search:"></asp:Localize>
+					<asp:CheckBox ID="chkIncludeMailboxes" runat="server" Text="Accounts" Checked="true"
+							meta:resourcekey="chkIncludeMailboxes" AutoPostBack="true" CssClass="Normal" OnCheckedChanged="chkIncludeMailboxes_CheckedChanged" />
+                    <asp:CheckBox ID="chkIncludeRooms" runat="server" Text="Rooms" Checked="true"
+						    meta:resourcekey="chkIncludeRooms" AutoPostBack="true" CssClass="Normal" OnCheckedChanged="chkIncludeMailboxes_CheckedChanged" />
+                    <asp:CheckBox ID="chkIncludeEquipment" runat="server" Text="Equipment" Checked="true"
+							meta:resourcekey="chkIncludeEquipment" AutoPostBack="true" CssClass="Normal" OnCheckedChanged="chkIncludeMailboxes_CheckedChanged" />
+							
+					<asp:CheckBox ID="chkIncludeContacts" runat="server" Text="Contacts" Checked="true"
+							meta:resourcekey="chkIncludeContacts" AutoPostBack="true" CssClass="Normal" OnCheckedChanged="chkIncludeMailboxes_CheckedChanged" />
+					<asp:CheckBox ID="chkIncludeLists" runat="server" Text="Distribution Lists" Checked="true"
+							meta:resourcekey="chkIncludeLists" AutoPostBack="true" CssClass="Normal" OnCheckedChanged="chkIncludeMailboxes_CheckedChanged" />
+                </div>
+                <div class="FormButtonsBarClean">
+                    <div class="FormButtonsBarCleanRight">
+                        <asp:Panel ID="SearchPanel" runat="server" DefaultButton="cmdSearch">
+                            <asp:DropDownList ID="ddlSearchColumn" runat="server" CssClass="NormalTextBox">
+                                <asp:ListItem Value="DisplayName" meta:resourcekey="ddlSearchColumnDisplayName">DisplayName</asp:ListItem>
+                                <asp:ListItem Value="PrimaryEmailAddress" meta:resourcekey="ddlSearchColumnEmail">Email</asp:ListItem>
+                            </asp:DropDownList><asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100"></asp:TextBox><asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton"
+	                            CausesValidation="false" OnClick="cmdSearch_Click"/>
+                        </asp:Panel>
+                    </div>
+                </div>
+                <div class="Popup-Scroll">
+					<asp:GridView ID="gvPopupAccounts" runat="server" meta:resourcekey="gvPopupAccounts" AutoGenerateColumns="False"
+						Width="100%" CssSelectorClass="NormalGridView"
+						DataKeyNames="AccountName">
+						<Columns>
+							<asp:TemplateField>
+								<HeaderTemplate>
+									<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+								</HeaderTemplate>
+								<ItemTemplate>
+									<asp:CheckBox ID="chkSelect" runat="server" />
+									<asp:Literal ID="litAccountType" runat="server" Visible="false" Text='<%# Eval("AccountType") %>'></asp:Literal>
+								</ItemTemplate>
+								<ItemStyle Width="10px" />
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsDisplayName">
+								<ItemStyle Width="50%"></ItemStyle>
+								<ItemTemplate>
+									<asp:Image ID="img1" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
+									<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+								</ItemTemplate>
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsEmail">
+								<ItemStyle Width="50%"></ItemStyle>
+								<ItemTemplate>
+									<asp:Literal ID="litPrimaryEmailAddress" runat="server" Text='<%# Eval("PrimaryEmailAddress") %>'></asp:Literal>
+								</ItemTemplate>
+							</asp:TemplateField>
+						</Columns>
+					</asp:GridView>
+				</div>
+	
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+			<asp:Button ID="btnAddSelected" runat="server" CssClass="Button1" meta:resourcekey="btnAddSelected" Text="Add Accounts" OnClick="btnAddSelected_Click" />
+			<asp:Button ID="btnCancelAdd" runat="server" CssClass="Button1" meta:resourcekey="btnCancel" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+
+<asp:Button ID="btnAddAccountsFake" runat="server" style="display:none;" />
+<ajaxToolkit:ModalPopupExtender ID="AddAccountsModal" runat="server"
+	TargetControlID="btnAddAccountsFake" PopupControlID="AddAccountsPanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelAdd" />
+
+	</ContentTemplate>
+</asp:UpdatePanel>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/AccountsListWithPermissions.ascx.cs

@@ -0,0 +1,320 @@
+// Copyright (c) 2011, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Collections.Generic;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+using System.Data;
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+	public partial class AccountsListWithPermissions : WebsitePanelControlBase
+	{
+		private enum SelectedState
+		{
+			All,
+			Selected,
+			Unselected
+		}
+
+	    public bool EnableMailboxOnly
+	    {
+            get {return ViewState["EnableMailboxOnly"] != null ? (bool)ViewState["EnableMailboxOnly"]: false; }
+            set { ViewState["EnableMailboxOnly"] = value; }
+	    }
+        
+        public bool MailboxesEnabled
+		{
+			get { return ViewState["MailboxesEnabled"] != null ? (bool)ViewState["MailboxesEnabled"] : false; }
+			set { ViewState["MailboxesEnabled"] = value; }
+		}
+
+		public bool ContactsEnabled
+		{
+			get { return ViewState["ContactsEnabled"] != null ? (bool)ViewState["ContactsEnabled"] : false; }
+			set { ViewState["ContactsEnabled"] = value; }
+		}
+
+		public bool DistributionListsEnabled
+		{
+			get { return ViewState["DistributionListsEnabled"] != null ? (bool)ViewState["DistributionListsEnabled"] : false; }
+			set { ViewState["DistributionListsEnabled"] = value; }
+		}
+
+		public int ExcludeAccountId
+		{
+			get { return PanelRequest.AccountID; }
+		}
+
+		public void SetAccounts(ExchangeAccount[] accounts)
+		{
+			BindAccounts(accounts, false);
+		}
+
+		public ExchangeAccount[] GetAccounts()
+		{
+			// get selected accounts
+			List<ExchangeAccount> selectedAccounts = GetGridViewAccounts(gvAccounts, SelectedState.All);
+
+            List<ExchangeAccount> accountNames = new List<ExchangeAccount>();
+            foreach (ExchangeAccount account in selectedAccounts)
+            { 
+                accountNames.Add(account); 
+            }
+            ExchangeAccount[] accounts = accountNames.ToArray();
+            return accounts;
+		}
+
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			
+			// toggle controls
+			if (!IsPostBack)
+			{
+				chkIncludeMailboxes.Visible = chkIncludeRooms.Visible = chkIncludeEquipment.Visible = MailboxesEnabled;
+                chkIncludeMailboxes.Checked = chkIncludeRooms.Checked = chkIncludeEquipment.Checked = MailboxesEnabled;
+				
+                if (EnableMailboxOnly)
+				{
+				    chkIncludeRooms.Checked = false;
+				    chkIncludeRooms.Visible = false;
+				    chkIncludeEquipment.Checked = false;
+				    chkIncludeEquipment.Visible = false;
+				}
+                
+                chkIncludeContacts.Visible = ContactsEnabled;
+				chkIncludeContacts.Checked = ContactsEnabled;
+				chkIncludeLists.Visible = DistributionListsEnabled;
+				chkIncludeLists.Checked = DistributionListsEnabled;
+			}
+
+			// register javascript
+			if (!Page.ClientScript.IsClientScriptBlockRegistered("SelectAllCheckboxes"))
+			{
+				string script = @"    function SelectAllCheckboxes(box)
+    {
+		var state = box.checked;
+        var elm = box.parentElement.parentElement.parentElement.parentElement.getElementsByTagName(""INPUT"");
+        for(i = 0; i < elm.length; i++)
+            if(elm[i].type == ""checkbox"" && elm[i].id != box.id && elm[i].checked != state && !elm[i].disabled)
+		        elm[i].checked = state;
+    }";
+				Page.ClientScript.RegisterClientScriptBlock(typeof(AccountsList), "SelectAllCheckboxes",
+					script, true);
+			}
+		}
+
+		public string GetAccountImage(int accountTypeId)
+		{
+			ExchangeAccountType accountType = (ExchangeAccountType)accountTypeId;
+			string imgName = "mailbox_16.gif";
+			if (accountType == ExchangeAccountType.Contact)
+				imgName = "contact_16.gif";
+			else if (accountType == ExchangeAccountType.DistributionList)
+				imgName = "dlist_16.gif";
+            else if (accountType == ExchangeAccountType.Room)
+                imgName = "room_16.gif";
+            else if (accountType == ExchangeAccountType.Equipment)
+                imgName = "equipment_16.gif";
+
+			return GetThemedImage("Exchange/" + imgName);
+		}
+
+		protected void btnAdd_Click(object sender, EventArgs e)
+		{
+			// bind all accounts
+			BindPopupAccounts();
+
+			// show modal
+			AddAccountsModal.Show();
+		}
+
+		protected void btnDelete_Click(object sender, EventArgs e)
+		{
+			// get selected accounts
+			List<ExchangeAccount> selectedAccounts = GetGridViewAccounts(gvAccounts, SelectedState.Unselected);
+
+			// add to the main list
+			BindAccounts(selectedAccounts.ToArray(), false);
+		}
+
+		protected void btnAddSelected_Click(object sender, EventArgs e)
+		{
+			// get selected accounts
+			List<ExchangeAccount> selectedAccounts = GetGridViewAccounts(gvPopupAccounts, SelectedState.Selected);
+            List<ExchangeAccount> selectedAccountsWithPermissions = new List<ExchangeAccount>();
+            foreach (ExchangeAccount account in selectedAccounts)
+            {
+                if (account.AccountId != ExcludeAccountId)
+                    account.PublicFolderPermission = "Reviewer";
+                selectedAccountsWithPermissions.Add(account);
+            }
+            // add to the main list
+            BindAccounts(selectedAccountsWithPermissions.ToArray(), true);
+		}
+
+		private void BindPopupAccounts()
+		{
+			ExchangeAccount[] accounts = ES.Services.ExchangeServer.SearchAccounts(PanelRequest.ItemID,
+				chkIncludeMailboxes.Checked, chkIncludeContacts.Checked, chkIncludeLists.Checked,
+                chkIncludeRooms.Checked, chkIncludeEquipment.Checked,
+				ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", "");
+
+			if (ExcludeAccountId > 0)
+			{
+				List<ExchangeAccount> updatedAccounts = new List<ExchangeAccount>();
+                foreach (ExchangeAccount account in accounts)
+                {
+                    if (account.AccountId != ExcludeAccountId)
+                        account.PublicFolderPermission = "Reviewer";
+                        updatedAccounts.Add(account);
+                }
+				accounts = updatedAccounts.ToArray();
+			}
+
+			gvPopupAccounts.DataSource = accounts;
+			gvPopupAccounts.DataBind();
+		}
+
+		private void BindAccounts(ExchangeAccount[] newAccounts, bool preserveExisting)
+		{
+			// get binded addresses
+			List<ExchangeAccount> accounts = new List<ExchangeAccount>();
+			if(preserveExisting)
+				accounts.AddRange(GetGridViewAccounts(gvAccounts, SelectedState.All));
+
+			// add new accounts
+			if (newAccounts != null)
+			{
+				foreach (ExchangeAccount newAccount in newAccounts)
+				{
+					// check if exists
+					bool exists = false;
+					foreach (ExchangeAccount account in accounts)
+					{
+						if (String.Compare(newAccount.AccountName, account.AccountName, true) == 0)
+						{
+							exists = true;
+							break;
+						}
+					}
+
+					if (exists)
+						continue;
+
+					accounts.Add(newAccount);
+				}
+			}
+
+			gvAccounts.DataSource = accounts;
+			gvAccounts.DataBind();
+
+            btnDelete.Visible = gvAccounts.Rows.Count > 0;
+		}
+
+		private List<ExchangeAccount> GetGridViewAccounts(GridView gv, SelectedState state)
+		{
+			List<ExchangeAccount> accounts = new List<ExchangeAccount>();
+			
+			for (int i = 0; i < gv.Rows.Count; i++)
+			{
+				GridViewRow row = gv.Rows[i];
+				CheckBox chkSelect = (CheckBox)row.FindControl("chkSelect");
+						if (chkSelect == null)
+						continue;			
+				
+				ExchangeAccount account = new ExchangeAccount();
+				account.AccountType = (ExchangeAccountType)Enum.Parse(typeof(ExchangeAccountType), ((Literal)row.FindControl("litAccountType")).Text);
+				account.AccountName = (string)gv.DataKeys[i][0];
+				account.DisplayName = ((Literal)row.FindControl("litDisplayName")).Text;
+				account.PrimaryEmailAddress = ((Literal)row.FindControl("litPrimaryEmailAddress")).Text;
+                if (gv != gvPopupAccounts)
+                {
+                    DropDownList ddlPermissions = (DropDownList)row.FindControl("ddlPermissions");
+                    //HiddenField PermissionLabel = (HiddenField)row.FindControl("PermissionLabel");
+                    //account.PublicFolderPermission = PermissionLabel.Value;
+                    account.PublicFolderPermission = ddlPermissions.SelectedValue;
+                }
+				if(state == SelectedState.All || 
+					(state == SelectedState.Selected && chkSelect.Checked) ||
+					(state == SelectedState.Unselected && !chkSelect.Checked))
+					accounts.Add(account);
+			}
+			return accounts;
+		}
+
+		protected void chkIncludeMailboxes_CheckedChanged(object sender, EventArgs e)
+		{
+			BindPopupAccounts();
+		}
+
+		protected void cmdSearch_Click(object sender, ImageClickEventArgs e)
+		{
+			BindPopupAccounts();
+		}
+
+        protected void gvAccounts_RowDataBound(object sender, GridViewRowEventArgs e)
+        {
+            if (e.Row.RowType == DataControlRowType.DataRow)
+            {
+
+                DropDownList ddlPermissions = (DropDownList)e.Row.FindControl("ddlPermissions");
+                HiddenField PermissionLabel = (HiddenField)e.Row.FindControl("PermissionLabel");
+
+                ExchangeAccount dRow = (ExchangeAccount)e.Row.DataItem as ExchangeAccount;
+                ListItem itm = new ListItem(dRow.PublicFolderPermission, dRow.PublicFolderPermission);
+
+                if (ddlPermissions.Items.Contains(itm))
+                {
+                    PermissionLabel.Value = dRow.PublicFolderPermission;
+                    ddlPermissions.SelectedValue = dRow.PublicFolderPermission;
+                }
+                else
+                {
+                    PermissionLabel.Value = dRow.PublicFolderPermission;
+                    ddlPermissions.Items.Add(itm);
+                    ddlPermissions.SelectedValue = dRow.PublicFolderPermission;
+                    ddlPermissions.DataBind();
+                }
+
+            }
+        }
+
+        protected void ddlPermissions_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            DropDownList ddlCurrentDropDownList = (DropDownList)sender;
+            GridViewRow grdrDropDownRow = ((GridViewRow)ddlCurrentDropDownList.Parent.Parent);
+            
+            ExchangeAccount ex = (ExchangeAccount)grdrDropDownRow.DataItem as ExchangeAccount;
+            if (ex != null)
+                ex.PublicFolderPermission = ddlCurrentDropDownList.SelectedValue;
+        }					
+	}
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/AccountsListWithPermissions.ascx.designer.cs

@@ -0,0 +1,213 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class AccountsListWithPermissions {
+        
+        /// <summary>
+        /// AccountsUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel AccountsUpdatePanel;
+        
+        /// <summary>
+        /// btnAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAdd;
+        
+        /// <summary>
+        /// btnDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnDelete;
+        
+        /// <summary>
+        /// gvAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvAccounts;
+        
+        /// <summary>
+        /// AddAccountsPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel AddAccountsPanel;
+        
+        /// <summary>
+        /// headerAddAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize headerAddAccounts;
+        
+        /// <summary>
+        /// AddAccountsUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel AddAccountsUpdatePanel;
+        
+        /// <summary>
+        /// locIncludeSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locIncludeSearch;
+        
+        /// <summary>
+        /// chkIncludeMailboxes control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkIncludeMailboxes;
+        
+        /// <summary>
+        /// chkIncludeRooms control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkIncludeRooms;
+        
+        /// <summary>
+        /// chkIncludeEquipment control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkIncludeEquipment;
+        
+        /// <summary>
+        /// chkIncludeContacts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkIncludeContacts;
+        
+        /// <summary>
+        /// chkIncludeLists control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkIncludeLists;
+        
+        /// <summary>
+        /// SearchPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel SearchPanel;
+        
+        /// <summary>
+        /// ddlSearchColumn control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlSearchColumn;
+        
+        /// <summary>
+        /// txtSearchValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtSearchValue;
+        
+        /// <summary>
+        /// cmdSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
+        
+        /// <summary>
+        /// gvPopupAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvPopupAccounts;
+        
+        /// <summary>
+        /// btnAddSelected control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddSelected;
+        
+        /// <summary>
+        /// btnCancelAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCancelAdd;
+        
+        /// <summary>
+        /// btnAddAccountsFake control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddAccountsFake;
+        
+        /// <summary>
+        /// AddAccountsModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender AddAccountsModal;
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/AccountsListWithPermissions.ascx.resx

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Add...</value>
+  </data>
+  <data name="btnAddSelected.Text" xml:space="preserve">
+    <value>Add Accounts</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="chkIncludeContacts.Text" xml:space="preserve">
+    <value>Contacts</value>
+  </data>
+  <data name="chkIncludeEquipment.Text" xml:space="preserve">
+    <value>Equipment</value>
+  </data>
+  <data name="chkIncludeLists.Text" xml:space="preserve">
+    <value>Distribution Lists</value>
+  </data>
+  <data name="chkIncludeMailboxes.Text" xml:space="preserve">
+    <value>Mailboxes</value>
+  </data>
+  <data name="chkIncludeRooms.Text" xml:space="preserve">
+    <value>Rooms</value>
+  </data>
+  <data name="ddlSearchColumnDisplayName.Text" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="ddlSearchColumnEmail.Text" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="gvAccounts.EmptyDataText" xml:space="preserve">
+    <value>The list of accounts is empty. Click "Add..." button to add accounts.</value>
+  </data>
+  <data name="gvAccountsDisplayName.HeaderText" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="gvAccountsEmail.HeaderText" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="gvPopupAccounts.EmptyDataText" xml:space="preserve">
+    <value>No accounts found.</value>
+  </data>
+  <data name="headerAddAccounts.Text" xml:space="preserve">
+    <value>Exchange Address Book</value>
+  </data>
+  <data name="locIncludeSearch.Text" xml:space="preserve">
+    <value>Include in search:</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj

@@ -75,15 +75,15 @@
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Client, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.EnterpriseServer.Client, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.Providers.Base, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.Providers.Base, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
     </Reference>
@@ -199,10 +199,17 @@
     <Compile Include="Code\ReportingServices\FileSystemReportLocalizer.cs" />
     <Compile Include="Code\ReportingServices\IResourceStorage.cs" />
     <Compile Include="Code\ReportingServices\ReportingServicesUtils.cs" />
+    <Compile Include="ExchangeServer\UserControls\AccountsListWithPermissions.ascx.cs">
+      <DependentUpon>AccountsListWithPermissions.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="ProviderControls\hMailServer5_EditAccount.ascx.cs">
       <DependentUpon>hMailServer5_EditAccount.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="ExchangeServer\UserControls\AccountsListWithPermissions.ascx.designer.cs">
+      <DependentUpon>AccountsListWithPermissions.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ProviderControls\hMailServer5_EditAccount.ascx.designer.cs">
       <DependentUpon>hMailServer5_EditAccount.ascx</DependentUpon>
     </Compile>
@@ -3749,6 +3756,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ExchangeServer\UserControls\AccountsListWithPermissions.ascx" />
     <Content Include="ProviderControls\hMailServer5_EditAccount.ascx" />
     <Content Include="ProviderControls\hMailServer5_EditDomain.ascx" />
     <Content Include="ProviderControls\hMailServer5_EditForwarding.ascx" />

WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj

@@ -18,6 +18,7 @@
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -87,11 +88,11 @@
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Client, Version=1.0.1.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.EnterpriseServer.Client, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
     </Reference>