Merge

WebsitePanel/Database/update_db.sql

@@ -5462,20 +5462,6 @@ CREATE TABLE RDSCollections
 )
 GO
 
-ALTER TABLE [dbo].[RDSCollectionUsers]
-DROP CONSTRAINT [FK_RDSCollectionUsers_RDSCollectionId]
-GO
-
-
-ALTER TABLE [dbo].[RDSCollectionUsers]
-DROP CONSTRAINT [FK_RDSCollectionUsers_UserId]
-GO
-
-ALTER TABLE [dbo].[RDSServers]
-DROP CONSTRAINT [FK_RDSServers_RDSCollectionId]
-GO
-
-
 ALTER TABLE [dbo].[RDSCollectionUsers]  WITH CHECK ADD  CONSTRAINT [FK_RDSCollectionUsers_RDSCollectionId] FOREIGN KEY([RDSCollectionId])
 REFERENCES [dbo].[RDSCollections] ([ID])
 ON DELETE CASCADE
@@ -5985,44 +5971,6 @@ RETURN
 GO
 
 
-
-IF OBJECTPROPERTY(object_id('dbo.GetExchangeAccountByAccountNameWithoutItemId'), N'IsProcedure') = 1
-DROP PROCEDURE [dbo].[GetExchangeAccountByAccountNameWithoutItemId]
-GO
-CREATE PROCEDURE [dbo].[GetExchangeAccountByAccountNameWithoutItemId] 
-(
-	@PrimaryEmailAddress nvarchar(300)
-)
-AS
-SELECT
-	E.AccountID,
-	E.ItemID,
-	E.AccountType,
-	E.AccountName,
-	E.DisplayName,
-	E.PrimaryEmailAddress,
-	E.MailEnabledPublicFolder,
-	E.MailboxManagerActions,
-	E.SamAccountName,
-	E.AccountPassword,
-	E.MailboxPlanId,
-	P.MailboxPlan,
-	E.SubscriberNumber,
-	E.UserPrincipalName,
-	E.ArchivingMailboxPlanId, 
-	AP.MailboxPlan as 'ArchivingMailboxPlan',
-	E.EnableArchiving
-FROM
-	ExchangeAccounts AS E
-LEFT OUTER JOIN ExchangeMailboxPlans AS P ON E.MailboxPlanId = P.MailboxPlanId	
-LEFT OUTER JOIN ExchangeMailboxPlans AS AP ON E.ArchivingMailboxPlanId = AP.MailboxPlanId
-WHERE
-	E.PrimaryEmailAddress = @PrimaryEmailAddress
-RETURN
-GO
-
-
-
 -- wsp-10269: Changed php extension path in default properties for IIS70 and IIS80 provider
 update ServiceDefaultProperties
 set PropertyValue='%PROGRAMFILES(x86)%\PHP\php-cgi.exe'
@@ -7412,4 +7360,209 @@ LEFT OUTER JOIN ServiceItems AS MD ON D.MailDomainID = MD.ItemID
 LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID
 RETURN
 
-GO
+GO
+
+IF NOT EXISTS(select 1 from sys.columns COLS INNER JOIN sys.objects OBJS ON OBJS.object_id=COLS.object_id and OBJS.type='U' AND OBJS.name='Packages' AND COLS.name='DefaultTopPackage')
+BEGIN
+ALTER TABLE [dbo].[Packages] ADD
+	[DefaultTopPackage] [bit] DEFAULT 0 NOT NULL
+END
+GO
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetMyPackages')
+DROP PROCEDURE GetMyPackages
+GO
+CREATE PROCEDURE [dbo].[GetMyPackages]
+(
+	@ActorID int,
+	@UserID int
+)
+AS
+
+-- check rights
+IF dbo.CheckActorUserRights(@ActorID, @UserID) = 0
+RAISERROR('You are not allowed to access this account', 16, 1)
+
+SELECT
+	P.PackageID,
+	P.ParentPackageID,
+	P.PackageName,
+	P.StatusID,
+	P.PlanID,
+	P.PurchaseDate,
+	
+	dbo.GetItemComments(P.PackageID, 'PACKAGE', @ActorID) AS Comments,
+	
+	-- server
+	ISNULL(P.ServerID, 0) AS ServerID,
+	ISNULL(S.ServerName, 'None') AS ServerName,
+	ISNULL(S.Comments, '') AS ServerComments,
+	ISNULL(S.VirtualServer, 1) AS VirtualServer,
+	
+	-- hosting plan
+	HP.PlanName,
+	
+	-- user
+	P.UserID,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.FullName,
+	U.RoleID,
+	U.Email,
+
+	P.DefaultTopPackage
+FROM Packages AS P
+INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID
+LEFT OUTER JOIN Servers AS S ON P.ServerID = S.ServerID
+LEFT OUTER JOIN HostingPlans AS HP ON P.PlanID = HP.PlanID
+WHERE P.UserID = @UserID
+RETURN
+GO
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetPackages')
+DROP PROCEDURE GetPackages
+GO
+CREATE PROCEDURE [dbo].[GetPackages]
+(
+	@ActorID int,
+	@UserID int
+)
+AS
+
+SELECT
+	P.PackageID,
+	P.ParentPackageID,
+	P.PackageName,
+	P.StatusID,
+	P.PurchaseDate,
+	
+	-- server
+	ISNULL(P.ServerID, 0) AS ServerID,
+	ISNULL(S.ServerName, 'None') AS ServerName,
+	ISNULL(S.Comments, '') AS ServerComments,
+	ISNULL(S.VirtualServer, 1) AS VirtualServer,
+	
+	-- hosting plan
+	P.PlanID,
+	HP.PlanName,
+	
+	-- user
+	P.UserID,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.RoleID,
+	U.Email,
+
+	P.DefaultTopPackage
+FROM Packages AS P
+INNER JOIN Users AS U ON P.UserID = U.UserID
+INNER JOIN Servers AS S ON P.ServerID = S.ServerID
+INNER JOIN HostingPlans AS HP ON P.PlanID = HP.PlanID
+WHERE
+	P.UserID = @UserID	
+RETURN
+
+GO
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetPackage')
+DROP PROCEDURE GetPackage
+GO
+CREATE PROCEDURE [dbo].[GetPackage]
+(
+	@PackageID int,
+	@ActorID int
+)
+AS
+
+-- Note: ActorID is not verified
+-- check both requested and parent package
+
+SELECT
+	P.PackageID,
+	P.ParentPackageID,
+	P.UserID,
+	P.PackageName,
+	P.PackageComments,
+	P.ServerID,
+	P.StatusID,
+	P.PlanID,
+	P.PurchaseDate,
+	P.OverrideQuotas,
+	P.DefaultTopPackage
+FROM Packages AS P
+WHERE P.PackageID = @PackageID
+RETURN
+
+GO
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'UpdatePackage')
+DROP PROCEDURE UpdatePackage
+GO
+CREATE PROCEDURE [dbo].[UpdatePackage]
+(
+	@ActorID int,
+	@PackageID int,
+	@PackageName nvarchar(300),
+	@PackageComments ntext,
+	@StatusID int,
+	@PlanID int,
+	@PurchaseDate datetime,
+	@OverrideQuotas bit,
+	@QuotasXml ntext,
+	@DefaultTopPackage bit
+)
+AS
+
+-- check rights
+IF dbo.CheckActorPackageRights(@ActorID, @PackageID) = 0
+RAISERROR('You are not allowed to access this package', 16, 1)
+
+BEGIN TRAN
+
+DECLARE @ParentPackageID int
+DECLARE @OldPlanID int
+
+SELECT @ParentPackageID = ParentPackageID, @OldPlanID = PlanID FROM Packages
+WHERE PackageID = @PackageID
+
+-- update package
+UPDATE Packages SET
+	PackageName = @PackageName,
+	PackageComments = @PackageComments,
+	StatusID = @StatusID,
+	PlanID = @PlanID,
+	PurchaseDate = @PurchaseDate,
+	OverrideQuotas = @OverrideQuotas,
+	DefaultTopPackage = @DefaultTopPackage
+WHERE
+	PackageID = @PackageID
+
+-- update quotas (if required)
+EXEC UpdatePackageQuotas @ActorID, @PackageID, @QuotasXml
+
+-- check resulting quotas
+DECLARE @ExceedingQuotas AS TABLE (QuotaID int, QuotaName nvarchar(50), QuotaValue int)
+
+-- check exceeding quotas if plan has been changed
+IF (@OldPlanID <> @PlanID) OR (@OverrideQuotas = 1)
+BEGIN
+	INSERT INTO @ExceedingQuotas
+	SELECT * FROM dbo.GetPackageExceedingQuotas(@ParentPackageID) WHERE QuotaValue > 0
+END
+
+SELECT * FROM @ExceedingQuotas
+
+IF EXISTS(SELECT * FROM @ExceedingQuotas)
+BEGIN
+	ROLLBACK TRAN
+	RETURN
+END
+
+
+COMMIT TRAN
+RETURN
+
+GO

WebsitePanel/Sources/VersionInfo.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18051
+'     Runtime Version:4.0.30319.34014
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -15,9 +15,9 @@ Imports System
 Imports System.Reflection
 Imports System.Runtime.CompilerServices
 Imports System.Runtime.InteropServices
-<Assembly: AssemblyCompany("Outercurve Foundation"), _
+<Assembly: AssemblyCompany("Outercurve Foundation"),  _
- Assembly: AssemblyCopyright("Copyright © 2014 Outercurve Foundation."), _
+ Assembly: AssemblyCopyright("Copyright © 2014 Outercurve Foundation."),  _
- Assembly: AssemblyVersion("2.1.0.1"), _
+ Assembly: AssemblyVersion("2.1.0.1"),  _
- Assembly: AssemblyFileVersion("2.1.0.1"), _
+ Assembly: AssemblyFileVersion("2.1.0.1"),  _
  Assembly: AssemblyInformationalVersion("2.1.0")> 
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageInfo.cs

@@ -52,6 +52,7 @@ namespace WebsitePanel.EnterpriseServer
         int diskSpaceQuota;
         int bandWidthQuota;
         bool overrideQuotas;
+        bool defaultTopPackage;
         HostingPlanGroupInfo[] groups;
         HostingPlanQuotaInfo[] quotas;
 
@@ -155,6 +156,12 @@ namespace WebsitePanel.EnterpriseServer
             set { this.overrideQuotas = value; }
         }
 
+        public bool DefaultTopPackage 
+        {
+            get { return this.defaultTopPackage;  }
+            set { this.defaultTopPackage = value; }
+        }
+
         public HostingPlanGroupInfo[] Groups
         {
             get { return this.groups; }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/System/SystemSettings.cs

@@ -43,7 +43,8 @@ namespace WebsitePanel.EnterpriseServer
 		public const string SETUP_SETTINGS = "SetupSettings";
         public const string WPI_SETTINGS = "WpiSettings";
         public const string FILEMANAGER_SETTINGS = "FileManagerSettings";
-        
+        public const string PACKAGE_DISPLAY_SETTINGS = "PackageDisplaySettings";
+
         // key to access to wpi main & custom feed in wpi settings
         public const string WPI_MAIN_FEED_KEY = "WpiMainFeedUrl";
         public const string FEED_ULS_KEY = "FeedUrls";

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs

@@ -1,35 +1,7 @@
-// Copyright (c) 2015, 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.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.6387
+//     Runtime Version:2.0.50727.8009
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -37,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// 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.
 // 
 namespace WebsitePanel.EnterpriseServer {
     using System.Xml.Serialization;
@@ -50,7 +22,7 @@ namespace WebsitePanel.EnterpriseServer {
     
     
     /// <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="esPackagesSoap", Namespace="http://smbsaas/websitepanel/enterpriseserver")]
@@ -120,6 +92,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback UpdatePackageSettingsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback SetDefaultTopPackageOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetPackageAddonsOperationCompleted;
         
         private System.Threading.SendOrPostCallback GetPackageAddonOperationCompleted;
@@ -277,6 +251,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event UpdatePackageSettingsCompletedEventHandler UpdatePackageSettingsCompleted;
         
+        /// <remarks/>
+        public event SetDefaultTopPackageCompletedEventHandler SetDefaultTopPackageCompleted;
+        
         /// <remarks/>
         public event GetPackageAddonsCompletedEventHandler GetPackageAddonsCompleted;
         
@@ -1781,6 +1758,50 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDefaultTopPackage", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool SetDefaultTopPackage(int userId, int packageId) {
+            object[] results = this.Invoke("SetDefaultTopPackage", new object[] {
+                        userId,
+                        packageId});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetDefaultTopPackage(int userId, int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetDefaultTopPackage", new object[] {
+                        userId,
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public bool EndSetDefaultTopPackage(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetDefaultTopPackageAsync(int userId, int packageId) {
+            this.SetDefaultTopPackageAsync(userId, packageId, null);
+        }
+        
+        /// <remarks/>
+        public void SetDefaultTopPackageAsync(int userId, int packageId, object userState) {
+            if ((this.SetDefaultTopPackageOperationCompleted == null)) {
+                this.SetDefaultTopPackageOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetDefaultTopPackageOperationCompleted);
+            }
+            this.InvokeAsync("SetDefaultTopPackage", new object[] {
+                        userId,
+                        packageId}, this.SetDefaultTopPackageOperationCompleted, userState);
+        }
+        
+        private void OnSetDefaultTopPackageOperationCompleted(object arg) {
+            if ((this.SetDefaultTopPackageCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetDefaultTopPackageCompleted(this, new SetDefaultTopPackageCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPackageAddons", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public System.Data.DataSet GetPackageAddons(int packageId) {
@@ -2743,7 +2764,7 @@ namespace WebsitePanel.EnterpriseServer {
                     bool createFtpAccount, 
                     string ftpAccountName, 
                     bool createMailAccount, 
-                    string hostName,
+                    string hostName, 
                     bool createZoneRecord) {
             object[] results = this.Invoke("CreateUserWizard", new object[] {
                         parentPackageId,
@@ -2791,8 +2812,8 @@ namespace WebsitePanel.EnterpriseServer {
                     bool createFtpAccount, 
                     string ftpAccountName, 
                     bool createMailAccount, 
-                    string hostName,
+                    string hostName, 
-                    bool createZoneRecord,
+                    bool createZoneRecord, 
                     System.AsyncCallback callback, 
                     object asyncState) {
             return this.BeginInvoke("CreateUserWizard", new object[] {
@@ -2846,7 +2867,7 @@ namespace WebsitePanel.EnterpriseServer {
                     bool createFtpAccount, 
                     string ftpAccountName, 
                     bool createMailAccount, 
-                    string hostName,
+                    string hostName, 
                     bool createZoneRecord) {
             this.CreateUserWizardAsync(parentPackageId, username, password, roleId, firstName, lastName, email, secondaryEmail, htmlMail, sendAccountLetter, createPackage, planId, sendPackageLetter, domainName, tempDomain, createWebSite, createFtpAccount, ftpAccountName, createMailAccount, hostName, createZoneRecord, null);
         }
@@ -2872,8 +2893,8 @@ namespace WebsitePanel.EnterpriseServer {
                     bool createFtpAccount, 
                     string ftpAccountName, 
                     bool createMailAccount, 
-                    string hostName,
+                    string hostName, 
-                    bool createZoneRecord,
+                    bool createZoneRecord, 
                     object userState) {
             if ((this.CreateUserWizardOperationCompleted == null)) {
                 this.CreateUserWizardOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateUserWizardOperationCompleted);
@@ -3260,11 +3281,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetHostingPlansCompletedEventHandler(object sender, GetHostingPlansCompletedEventArgs 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 GetHostingPlansCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3286,11 +3307,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetHostingAddonsCompletedEventHandler(object sender, GetHostingAddonsCompletedEventArgs 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 GetHostingAddonsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3312,11 +3333,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetHostingPlanCompletedEventHandler(object sender, GetHostingPlanCompletedEventArgs 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 GetHostingPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3338,11 +3359,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetHostingPlanQuotasCompletedEventHandler(object sender, GetHostingPlanQuotasCompletedEventArgs 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 GetHostingPlanQuotasCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3364,11 +3385,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetHostingPlanContextCompletedEventHandler(object sender, GetHostingPlanContextCompletedEventArgs 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 GetHostingPlanContextCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3390,11 +3411,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetUserAvailableHostingPlansCompletedEventHandler(object sender, GetUserAvailableHostingPlansCompletedEventArgs 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 GetUserAvailableHostingPlansCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3416,11 +3437,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetUserAvailableHostingAddonsCompletedEventHandler(object sender, GetUserAvailableHostingAddonsCompletedEventArgs 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 GetUserAvailableHostingAddonsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3442,11 +3463,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddHostingPlanCompletedEventHandler(object sender, AddHostingPlanCompletedEventArgs 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 AddHostingPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3468,11 +3489,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdateHostingPlanCompletedEventHandler(object sender, UpdateHostingPlanCompletedEventArgs 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 UpdateHostingPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3494,11 +3515,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteHostingPlanCompletedEventHandler(object sender, DeleteHostingPlanCompletedEventArgs 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 DeleteHostingPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3520,11 +3541,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackagesCompletedEventHandler(object sender, GetPackagesCompletedEventArgs 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 GetPackagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3546,11 +3567,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetNestedPackagesSummaryCompletedEventHandler(object sender, GetNestedPackagesSummaryCompletedEventArgs 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 GetNestedPackagesSummaryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3572,11 +3593,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawPackagesCompletedEventHandler(object sender, GetRawPackagesCompletedEventArgs 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 GetRawPackagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3598,11 +3619,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SearchServiceItemsPagedCompletedEventHandler(object sender, SearchServiceItemsPagedCompletedEventArgs 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 SearchServiceItemsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3624,11 +3645,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackagesPagedCompletedEventHandler(object sender, GetPackagesPagedCompletedEventArgs 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 GetPackagesPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3650,11 +3671,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetNestedPackagesPagedCompletedEventHandler(object sender, GetNestedPackagesPagedCompletedEventArgs 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 GetNestedPackagesPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3676,11 +3697,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackagePackagesCompletedEventHandler(object sender, GetPackagePackagesCompletedEventArgs 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 GetPackagePackagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3702,11 +3723,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMyPackagesCompletedEventHandler(object sender, GetMyPackagesCompletedEventArgs 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 GetMyPackagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3728,11 +3749,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawMyPackagesCompletedEventHandler(object sender, GetRawMyPackagesCompletedEventArgs 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 GetRawMyPackagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3754,11 +3775,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageCompletedEventHandler(object sender, GetPackageCompletedEventArgs 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 GetPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3780,11 +3801,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageContextCompletedEventHandler(object sender, GetPackageContextCompletedEventArgs 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 GetPackageContextCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3806,11 +3827,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageQuotasCompletedEventHandler(object sender, GetPackageQuotasCompletedEventArgs 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 GetPackageQuotasCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3832,11 +3853,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageQuotasForEditCompletedEventHandler(object sender, GetPackageQuotasForEditCompletedEventArgs 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 GetPackageQuotasForEditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3858,11 +3879,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPackageCompletedEventHandler(object sender, AddPackageCompletedEventArgs 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 AddPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3884,11 +3905,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageCompletedEventHandler(object sender, UpdatePackageCompletedEventArgs 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 UpdatePackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3910,11 +3931,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageLiteralCompletedEventHandler(object sender, UpdatePackageLiteralCompletedEventArgs 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 UpdatePackageLiteralCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3936,11 +3957,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageNameCompletedEventHandler(object sender, UpdatePackageNameCompletedEventArgs 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 UpdatePackageNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3962,11 +3983,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePackageCompletedEventHandler(object sender, DeletePackageCompletedEventArgs 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 DeletePackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -3988,11 +4009,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void ChangePackageStatusCompletedEventHandler(object sender, ChangePackageStatusCompletedEventArgs 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 ChangePackageStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4014,11 +4035,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void EvaluateUserPackageTempateCompletedEventHandler(object sender, EvaluateUserPackageTempateCompletedEventArgs 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 EvaluateUserPackageTempateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4040,11 +4061,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageSettingsCompletedEventHandler(object sender, GetPackageSettingsCompletedEventArgs 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 GetPackageSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4066,11 +4087,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageSettingsCompletedEventHandler(object sender, UpdatePackageSettingsCompletedEventArgs 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 UpdatePackageSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4092,11 +4113,37 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void SetDefaultTopPackageCompletedEventHandler(object sender, SetDefaultTopPackageCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetDefaultTopPackageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetDefaultTopPackageCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageAddonsCompletedEventHandler(object sender, GetPackageAddonsCompletedEventArgs 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 GetPackageAddonsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4118,11 +4165,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageAddonCompletedEventHandler(object sender, GetPackageAddonCompletedEventArgs 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 GetPackageAddonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4144,11 +4191,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPackageAddonByIdCompletedEventHandler(object sender, AddPackageAddonByIdCompletedEventArgs 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 AddPackageAddonByIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4170,11 +4217,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPackageAddonCompletedEventHandler(object sender, AddPackageAddonCompletedEventArgs 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 AddPackageAddonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4196,11 +4243,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPackageAddonLiteralCompletedEventHandler(object sender, AddPackageAddonLiteralCompletedEventArgs 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 AddPackageAddonLiteralCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4222,11 +4269,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageAddonCompletedEventHandler(object sender, UpdatePackageAddonCompletedEventArgs 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 UpdatePackageAddonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4248,11 +4295,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdatePackageAddonLiteralCompletedEventHandler(object sender, UpdatePackageAddonLiteralCompletedEventArgs 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 UpdatePackageAddonLiteralCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4274,11 +4321,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePackageAddonCompletedEventHandler(object sender, DeletePackageAddonCompletedEventArgs 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 DeletePackageAddonCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4300,11 +4347,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetSearchableServiceItemTypesCompletedEventHandler(object sender, GetSearchableServiceItemTypesCompletedEventArgs 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 GetSearchableServiceItemTypesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4326,11 +4373,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawPackageItemsByTypeCompletedEventHandler(object sender, GetRawPackageItemsByTypeCompletedEventArgs 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 GetRawPackageItemsByTypeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4352,11 +4399,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawPackageItemsPagedCompletedEventHandler(object sender, GetRawPackageItemsPagedCompletedEventArgs 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 GetRawPackageItemsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4378,11 +4425,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawPackageItemsCompletedEventHandler(object sender, GetRawPackageItemsCompletedEventArgs 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 GetRawPackageItemsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4404,11 +4451,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DetachPackageItemCompletedEventHandler(object sender, DetachPackageItemCompletedEventArgs 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 DetachPackageItemCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4430,11 +4477,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void MovePackageItemCompletedEventHandler(object sender, MovePackageItemCompletedEventArgs 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 MovePackageItemCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4456,11 +4503,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageQuotaCompletedEventHandler(object sender, GetPackageQuotaCompletedEventArgs 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 GetPackageQuotaCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4482,11 +4529,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SendAccountSummaryLetterCompletedEventHandler(object sender, SendAccountSummaryLetterCompletedEventArgs 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 SendAccountSummaryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4508,11 +4555,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SendPackageSummaryLetterCompletedEventHandler(object sender, SendPackageSummaryLetterCompletedEventArgs 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 SendPackageSummaryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4534,11 +4581,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetEvaluatedPackageTemplateBodyCompletedEventHandler(object sender, GetEvaluatedPackageTemplateBodyCompletedEventArgs 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 GetEvaluatedPackageTemplateBodyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4560,11 +4607,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetEvaluatedAccountTemplateBodyCompletedEventHandler(object sender, GetEvaluatedAccountTemplateBodyCompletedEventArgs 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 GetEvaluatedAccountTemplateBodyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4586,11 +4633,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPackageWithResourcesCompletedEventHandler(object sender, AddPackageWithResourcesCompletedEventArgs 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 AddPackageWithResourcesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4612,11 +4659,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateUserWizardCompletedEventHandler(object sender, CreateUserWizardCompletedEventArgs 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 CreateUserWizardCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4638,11 +4685,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackagesBandwidthPagedCompletedEventHandler(object sender, GetPackagesBandwidthPagedCompletedEventArgs 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 GetPackagesBandwidthPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4664,11 +4711,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackagesDiskspacePagedCompletedEventHandler(object sender, GetPackagesDiskspacePagedCompletedEventArgs 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 GetPackagesDiskspacePagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4690,11 +4737,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageBandwidthCompletedEventHandler(object sender, GetPackageBandwidthCompletedEventArgs 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 GetPackageBandwidthCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4716,11 +4763,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPackageDiskspaceCompletedEventHandler(object sender, GetPackageDiskspaceCompletedEventArgs 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 GetPackageDiskspaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4742,11 +4789,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOverusageSummaryReportCompletedEventHandler(object sender, GetOverusageSummaryReportCompletedEventArgs 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 GetOverusageSummaryReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4768,11 +4815,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDiskspaceOverusageDetailsReportCompletedEventHandler(object sender, GetDiskspaceOverusageDetailsReportCompletedEventArgs 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 GetDiskspaceOverusageDetailsReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -4794,11 +4841,11 @@ namespace WebsitePanel.EnterpriseServer {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetBandwidthOverusageDetailsReportCompletedEventHandler(object sender, GetBandwidthOverusageDetailsReportCompletedEventArgs 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 GetBandwidthOverusageDetailsReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs

@@ -543,8 +543,9 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetFreeRdsServersPaged", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetFreeRdsServersPaged", new object[] {
+                        packageId,
                         filterColumn,
                         filterValue,
                         sortColumn,
@@ -554,8 +555,9 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetFreeRdsServersPaged", new object[] {
+                        packageId,
                         filterColumn,
                         filterValue,
                         sortColumn,
@@ -570,16 +572,17 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetFreeRdsServersPagedAsync(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        public void GetFreeRdsServersPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
-            this.GetFreeRdsServersPagedAsync(filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+            this.GetFreeRdsServersPagedAsync(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
         
         /// <remarks/>
-        public void GetFreeRdsServersPagedAsync(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+        public void GetFreeRdsServersPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
             if ((this.GetFreeRdsServersPagedOperationCompleted == null)) {
                 this.GetFreeRdsServersPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFreeRdsServersPagedOperationCompleted);
             }
             this.InvokeAsync("GetFreeRdsServersPaged", new object[] {
+                        packageId,
                         filterColumn,
                         filterValue,
                         sortColumn,

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs

@@ -1580,7 +1580,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static DataSet UpdatePackage(int actorId, int packageId, int planId, string packageName,
             string packageComments, int statusId, DateTime purchaseDate,
-            bool overrideQuotas, string quotasXml)
+            bool overrideQuotas, string quotasXml, bool defaultTopPackage)
         {
             return SqlHelper.ExecuteDataset(ConnectionString, CommandType.StoredProcedure,
                 ObjectQualifier + "UpdatePackage",
@@ -1592,7 +1592,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@planId", planId),
                 new SqlParameter("@purchaseDate", purchaseDate),
                 new SqlParameter("@overrideQuotas", overrideQuotas),
-                new SqlParameter("@quotasXml", quotasXml));
+                new SqlParameter("@quotasXml", quotasXml),
+                new SqlParameter("@defaultTopPackage", defaultTopPackage));
         }
 
         public static void UpdatePackageName(int actorId, int packageId, string packageName,
@@ -4509,7 +4510,7 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
-        public static int AddRDSCollection(int itemId, string name, string description)
+        public static int AddRDSCollection(int itemId, string name, string description, string displayName)
         {
             SqlParameter rdsCollectionId = new SqlParameter("@RDSCollectionID", SqlDbType.Int);
             rdsCollectionId.Direction = ParameterDirection.Output;
@@ -4521,7 +4522,8 @@ namespace WebsitePanel.EnterpriseServer
                 rdsCollectionId,
                 new SqlParameter("@ItemID", itemId),
                 new SqlParameter("@Name", name),
-                new SqlParameter("@Description", description)
+                new SqlParameter("@Description", description),
+                new SqlParameter("DisplayName", displayName)
             );
 
             // read identity
@@ -4544,10 +4546,10 @@ namespace WebsitePanel.EnterpriseServer
 
         public static void UpdateRDSCollection(RdsCollection collection)
         {
-            UpdateRDSCollection(collection.Id, collection.ItemId, collection.Name, collection.Description);
+            UpdateRDSCollection(collection.Id, collection.ItemId, collection.Name, collection.Description, collection.DisplayName);
         }
 
-        public static void UpdateRDSCollection(int id, int itemId, string name, string description)
+        public static void UpdateRDSCollection(int id, int itemId, string name, string description, string displayName)
         {
             SqlHelper.ExecuteNonQuery(
                 ConnectionString,
@@ -4556,7 +4558,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@Id", id),
                 new SqlParameter("@ItemID", itemId),
                 new SqlParameter("@Name", name),
-                new SqlParameter("@Description", description)
+                new SqlParameter("@Description", description),
+                new SqlParameter("@DisplayName", displayName)
             );
         }
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs

@@ -392,13 +392,62 @@ namespace WebsitePanel.EnterpriseServer
 
             if (itemType == typeof(DnsZone))
             {
+                // Get ascii form in punycode
+                var zoneName = GetAsciiZoneName(itemName);
+
                 // add DNS zone
                 DnsZone zone = new DnsZone();
-                zone.Name = GetAsciiZoneName(itemName);
+                zone.Name = zoneName;
                 zone.ServiceId = serviceId;
                 zone.PackageId = packageId;
                 int zoneId = PackageController.AddPackageItem(zone);
 
+                // Add secondary zone(s)
+                try
+                {
+                    // get secondary DNS services
+                    var primSettings = ServerController.GetServiceSettings(serviceId);
+                    var secondaryServiceIds = new List<int>();
+                    var strSecondaryServices = primSettings["SecondaryDNSServices"];
+                    if (!String.IsNullOrEmpty(strSecondaryServices))
+                    {
+                        var secondaryServices = strSecondaryServices.Split(',');
+                        secondaryServiceIds.AddRange(secondaryServices.Select(strSecondaryId => Utils.ParseInt(strSecondaryId, 0)).Where(secondaryId => secondaryId != 0));
+                    }
+
+                    // add secondary zones
+                    var secondaryZoneFound = false;
+
+                    foreach (var secondaryId in secondaryServiceIds)
+                    {
+                        var secDns = GetDNSServer(secondaryId);
+                        if (secDns.ZoneExists(zoneName))
+                        {
+                            secondaryZoneFound = true;
+
+                            var secondaryZone = new SecondaryDnsZone
+                            {
+                                Name = zoneName,
+                                ServiceId = secondaryId,
+                                PackageId = packageId
+                            };
+
+                            PackageController.AddPackageItem(secondaryZone);
+                        }
+                    }
+
+                    if (!secondaryZoneFound)
+                    {
+                        TaskManager.WriteWarning("No secondary zone(s) found when importing zone " + itemName);
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "Error importing secondary zone(s)");
+                }
+
+
                 // add/update domains/pointers
                 RestoreDomainByZone(itemName, packageId, zoneId);
             }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs

@@ -778,7 +778,7 @@ namespace WebsitePanel.EnterpriseServer
                 // update package
                 result.ExceedingQuotas = DataProvider.UpdatePackage(SecurityContext.User.UserId,
                     package.PackageId, package.PlanId, package.PackageName, package.PackageComments, package.StatusId,
-                    package.PurchaseDate, package.OverrideQuotas, quotasXml);
+                    package.PurchaseDate, package.OverrideQuotas, quotasXml, package.DefaultTopPackage);
 
                 if (result.ExceedingQuotas.Tables[0].Rows.Count > 0)
                     result.Result = BusinessErrorCodes.ERROR_PACKAGE_QUOTA_EXCEED;
@@ -1742,6 +1742,21 @@ namespace WebsitePanel.EnterpriseServer
             //}
         }
 
+        public static bool SetDefaultTopPackage(int userId, int packageId) {
+            List<PackageInfo> lpi = GetPackages(userId);
+            foreach(PackageInfo pi in lpi) {
+                if(pi.DefaultTopPackage) {
+                    pi.DefaultTopPackage = false;
+                    UpdatePackage(pi);
+                }
+                if(pi.PackageId == packageId) {
+                    pi.DefaultTopPackage = true;
+                    UpdatePackage(pi);
+                }
+            }
+            return true;
+        }
+
         #endregion
 
         #region Quotas

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs

@@ -93,9 +93,9 @@ namespace WebsitePanel.EnterpriseServer
             return GetRdsServersPagedInternal(filterColumn, filterValue, sortColumn, startRow, maximumRows);
         }
 
-        public static RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        public static RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
-            return GetFreeRdsServersPagedInternal(filterColumn, filterValue, sortColumn, startRow, maximumRows);
+            return GetFreeRdsServersPagedInternal(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
         }
 
         public static RdsServersPaged GetOrganizationRdsServersPaged(int itemId, int? collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
@@ -271,10 +271,9 @@ namespace WebsitePanel.EnterpriseServer
                 }
 
                 var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
-
+                collection.Name = GetFormattedCollectionName(collection.DisplayName, org.OrganizationId);
-                rds.CreateCollection(org.OrganizationId, collection);
+                rds.CreateCollection(org.OrganizationId, collection);                
-
+                collection.Id = DataProvider.AddRDSCollection(itemId, collection.Name, collection.Description, collection.DisplayName);
-                collection.Id = DataProvider.AddRDSCollection(itemId, collection.Name, collection.Description);
 
                 foreach (var server in collection.Servers)
                 {
@@ -477,17 +476,26 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
-        private static RdsServersPaged GetFreeRdsServersPagedInternal(string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        private static RdsServersPaged GetFreeRdsServersPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
-            DataSet ds = DataProvider.GetRDSServersPaged(null, null, filterColumn, filterValue, sortColumn, startRow, maximumRows);
-
             RdsServersPaged result = new RdsServersPaged();
+            Organization org = OrganizationController.GetOrganization(itemId);
+
+            if (org == null)
+            {
+                return result;
+            }
+
+            var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+            var existingServers = rds.GetServersExistingInCollections();
+
+            DataSet ds = DataProvider.GetRDSServersPaged(null, null, filterColumn, filterValue, sortColumn, startRow, maximumRows);            
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
 
             List<RdsServer> tmpServers = new List<RdsServer>();
 
             ObjectUtils.FillCollectionFromDataView(tmpServers, ds.Tables[1].DefaultView);
-
+            tmpServers = tmpServers.Where(x => !existingServers.Select(y => y.ToUpper()).Contains(x.FqdName.ToUpper())).ToList();
             result.Servers = tmpServers.ToArray();
 
             return result;
@@ -1238,5 +1246,10 @@ namespace WebsitePanel.EnterpriseServer
 
             return rds;
         }
+
+        private static string GetFormattedCollectionName(string displayName, string organizationId)
+        {
+            return string.Format("{0}-{1}", organizationId, displayName.Replace(" ", "_"));
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Outercurve Foundation.
+// Copyright (c) 2015, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -57,7 +57,7 @@ namespace WebsitePanel.EnterpriseServer
         {
             BackgroundTask topTask = TaskManager.TopTask;
             var domainUsers = new Dictionary<int, UserInfo>();
-            var checkedDomains = new List<int>();
+            var checkedDomains = new List<DomainInfo>();
             var expiredDomains = new List<DomainInfo>();
             var nonExistenDomains = new List<DomainInfo>();
             var allDomains = new List<DomainInfo>();
@@ -101,12 +101,12 @@ namespace WebsitePanel.EnterpriseServer
 
                 foreach (var domain in domains)
                 {
-                    if (checkedDomains.Contains(domain.DomainId))
+                    if (checkedDomains.Any(x=> x.DomainId == domain.DomainId))
                     {
                         continue;
                     }
 
-                    checkedDomains.Add(domain.DomainId);
+                    checkedDomains.Add(domain);
 
                     ServerController.UpdateDomainWhoisData(domain);
 
@@ -124,12 +124,11 @@ namespace WebsitePanel.EnterpriseServer
                 }
             }
 
-            var subDomains = allDomains.Where(x => x.ExpirationDate == null || CheckDomainExpiration(x.ExpirationDate, daysBeforeNotify)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList();
+            var subDomains = allDomains.Where(x => !checkedDomains.Any(z => z.DomainId == x.DomainId && z.ExpirationDate != null)).GroupBy(p => p.DomainId).Select(g => g.First()).ToList();
-            allTopLevelDomains = allTopLevelDomains.GroupBy(p => p.DomainId).Select(g => g.First()).ToList();
 
             foreach (var subDomain in subDomains)
             {
-                var mainDomain = allTopLevelDomains.Where(x => subDomain.DomainId != x.DomainId && subDomain.DomainName.ToLowerInvariant().Contains(x.DomainName.ToLowerInvariant())).OrderByDescending(s => s.DomainName.Length).FirstOrDefault(); ;
+                var mainDomain = checkedDomains.Where(x => subDomain.DomainId != x.DomainId && subDomain.DomainName.ToLowerInvariant().Contains(x.DomainName.ToLowerInvariant())).OrderByDescending(s => s.DomainName.Length).FirstOrDefault(); ;
 
                 if (mainDomain != null)
                 {

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs

@@ -2709,6 +2709,7 @@ namespace WebsitePanel.EnterpriseServer
                 domain.CreationDate = ParseDate(creationDateString);
                 domain.ExpirationDate = ParseDate(expirationDateString);
                 domain.RegistrarName = ParseWhoisDomainInfo(whoisResult.Raw, _registrarNamePatterns);
+                domain.LastUpdateDate = DateTime.Now;
 
                 DataProvider.UpdateWhoisDomainInfo(domain.DomainId, domain.CreationDate, domain.ExpirationDate, DateTime.Now, domain.RegistrarName);
             }
@@ -2727,6 +2728,7 @@ namespace WebsitePanel.EnterpriseServer
             domain.CreationDate = creationDate;
             domain.ExpirationDate = expirationDate;
             domain.RegistrarName = registrarName;
+            domain.LastUpdateDate = DateTime.Now;
 
             return domain;
         }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs

@@ -262,6 +262,11 @@ namespace WebsitePanel.EnterpriseServer
             return PackageController.UpdatePackageSettings(settings);
         }
 
+        [WebMethod]
+        public bool SetDefaultTopPackage(int userId, int packageId) {
+            return PackageController.SetDefaultTopPackage(userId, packageId);
+        }
+
         #endregion
 
         #region Package Add-ons

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs

@@ -99,10 +99,10 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue,
+        public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue,
             string sortColumn, int startRow, int maximumRows)
         {
-            return RemoteDesktopServicesController.GetFreeRdsServersPaged(filterColumn, filterValue,
+            return RemoteDesktopServicesController.GetFreeRdsServersPaged(packageId, filterColumn, filterValue,
                 sortColumn, startRow, maximumRows);
         }
 

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs

@@ -64,5 +64,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         string[] GetApplicationUsers(string collectionName, string applicationName);
         bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users);
         bool CheckRDSServerAvaliable(string hostname);
+        List<string> GetServersExistingInCollections();
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCollection.cs

@@ -43,7 +43,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         public int ItemId { get; set; }
         public string Name { get; set; }
         public string Description { get; set; }
+        public string DisplayName { get; set; }
         public List<RdsServer> Servers { get; set; }
-
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs

@@ -477,7 +477,7 @@ namespace WebsitePanel.Providers.Mail
 			        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
 			        // calculate disk space
 			        var accountObject = GetAccountObject(item.Name);
-			        var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize"));
+			        var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize")) * 1024;
 
                     var diskspace = new ServiceProviderItemDiskSpace {ItemId = item.Id, DiskSpace = size};
 			        itemsDiskspace.Add(diskspace);
@@ -564,8 +564,8 @@ namespace WebsitePanel.Providers.Mail
                                     Year = date.Year, 
                                     Month = date.Month, 
                                     Day = date.Day, 
-                                    BytesSent = line[mailSentField], 
+                                    BytesSent = Convert.ToInt64(fields[mailSentField])*1024, 
-                                    BytesReceived = line[mailReceivedField]
+                                    BytesReceived = Convert.ToInt64(fields[mailReceivedField])*1024
                                 };
                                 days.Add(dailyStats);
                                 continue;
@@ -1035,7 +1035,7 @@ namespace WebsitePanel.Providers.Mail
                 {
                     var forwardTo = GetForwardToAddressFromAccountObject(accountObject);
                     var aliases = GetAliasListFromAccountObject(accountObject) as IEnumerable<string>;
-                    aliasList.AddRange(aliases.Where(a => a != forwardTo).Select(alias => new MailAlias {Name = alias + "@" + domainName, ForwardTo = forwardTo + "@" + domainName}));
+                    aliasList.AddRange(aliases.Where(a => a + "@" + domainName != forwardTo).Select(alias => new MailAlias {Name = alias + "@" + domainName, ForwardTo = forwardTo}));
                 }
 
                 accountObject.FindDone();

WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs

@@ -220,7 +220,15 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             try
             {                
-                runSpace = OpenRunspace();                
+                runSpace = OpenRunspace();
+
+                var existingServers = GetServersExistingInCollections(runSpace);
+                existingServers = existingServers.Select(x => x.ToUpper()).Intersect(collection.Servers.Select(x => x.FqdName.ToUpper())).ToList();
+
+                if (existingServers.Any())
+                {                                        
+                    throw new Exception(string.Format("Server{0} {1} already added to another collection", existingServers.Count == 1 ? "" : "s", string.Join(" ,", existingServers.ToArray())));
+                }
 
                 foreach (var server in collection.Servers)
                 {
@@ -302,6 +310,24 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return result;
         }
 
+        public List<string> GetServersExistingInCollections()
+        {
+            Runspace runSpace = null;
+            List<string> existingServers = new List<string>();
+
+            try
+            {                
+                runSpace = OpenRunspace();
+                existingServers = GetServersExistingInCollections(runSpace);
+            }
+            finally
+            {
+                CloseRunspace(runSpace);
+            }
+
+            return existingServers;
+        }
+
         public RdsCollection GetCollection(string collectionName)
         {
             RdsCollection collection =null;
@@ -1097,7 +1123,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         private string GetPolicyName(string organizationId, string collectionName, RdsPolicyTypes policyType)
         {
-            string policyName = string.Format("{0}-{1}-", organizationId, collectionName);
+            string policyName = string.Format("{0}-", collectionName);
 
             switch (policyType)
             {
@@ -1380,6 +1406,23 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return ExecuteShellCommand(runSpace, invokeCommand, false);
         }
 
+        internal Collection<PSObject> ExecuteRemoteShellCommand(Runspace runSpace, string hostName, List<string> scripts, params string[] moduleImports)
+        {
+            Command invokeCommand = new Command("Invoke-Command");
+            invokeCommand.Parameters.Add("ComputerName", hostName);
+
+            RunspaceInvoke invoke = new RunspaceInvoke();
+            string commandString = moduleImports.Any() ? string.Format("import-module {0};", string.Join(",", moduleImports)) : string.Empty;
+
+            commandString = string.Format("{0};{1}", commandString, string.Join(";", scripts.ToArray()));            
+
+            ScriptBlock sb = invoke.Invoke(string.Format("{{{0}}}", commandString))[0].BaseObject as ScriptBlock;
+
+            invokeCommand.Parameters.Add("ScriptBlock", sb);
+
+            return ExecuteShellCommand(runSpace, invokeCommand, false);
+        }
+
         internal Collection<PSObject> ExecuteShellCommand(Runspace runSpace, Command cmd)
         {
             return ExecuteShellCommand(runSpace, cmd, true);
@@ -1396,6 +1439,38 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return ExecuteShellCommand(runSpace, cmd, true, out errors);
         }
 
+        internal Collection<PSObject> ExecuteShellCommand(Runspace runspace, List<string> scripts, out object[] errors)
+        {
+            Log.WriteStart("ExecuteShellCommand");
+            var errorList = new List<object>();
+            Collection<PSObject> results;
+
+            using (Pipeline pipeLine = runspace.CreatePipeline())
+            {
+                foreach (string script in scripts)
+                {
+                    pipeLine.Commands.AddScript(script);
+                }
+
+                results = pipeLine.Invoke();
+
+                if (pipeLine.Error != null && pipeLine.Error.Count > 0)
+                {
+                    foreach (object item in pipeLine.Error.ReadToEnd())
+                    {
+                        errorList.Add(item);
+                        string errorMessage = string.Format("Invoke error: {0}", item);
+                        Log.WriteWarning(errorMessage);
+                    }
+                }
+            }
+
+            errors = errorList.ToArray();
+            Log.WriteEnd("ExecuteShellCommand");
+
+            return results;
+        }
+
         internal Collection<PSObject> ExecuteShellCommand(Runspace runSpace, Command cmd, bool useDomainController,
             out object[] errors)
         {
@@ -1517,6 +1592,29 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return result;
         }
 
+        internal List<string> GetServersExistingInCollections(Runspace runSpace)
+        {
+            var existingHosts = new List<string>();
+            var scripts = new List<string>();
+            scripts.Add(string.Format("$sessions = Get-RDSessionCollection -ConnectionBroker {0}", ConnectionBroker));
+            scripts.Add(string.Format("foreach($session in $sessions){{Get-RDSessionHost $session.CollectionName -ConnectionBroker {0}|Select SessionHost}}", ConnectionBroker));
+            object[] errors;
+
+            var sessionHosts = ExecuteShellCommand(runSpace, scripts, out errors);
+
+            foreach(var host in sessionHosts)
+            {
+                var sessionHost = GetPSObjectProperty(host, "SessionHost");
+
+                if (sessionHost != null)
+                {
+                    existingHosts.Add(sessionHost.ToString());
+                }
+            }
+
+            return existingHosts;
+        }
+
         #endregion
     }
 }

WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs

@@ -99,6 +99,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback CheckRDSServerAvaliableOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetServersExistingInCollectionsOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -167,6 +169,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event CheckRDSServerAvaliableCompletedEventHandler CheckRDSServerAvaliableCompleted;
         
+        /// <remarks/>
+        public event GetServersExistingInCollectionsCompletedEventHandler GetServersExistingInCollectionsCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CreateCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -1096,6 +1101,45 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetServersExistingInCollections", 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 string[] GetServersExistingInCollections() {
+            object[] results = this.Invoke("GetServersExistingInCollections", new object[0]);
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetServersExistingInCollections(System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetServersExistingInCollections", new object[0], callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string[] EndGetServersExistingInCollections(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetServersExistingInCollectionsAsync() {
+            this.GetServersExistingInCollectionsAsync(null);
+        }
+        
+        /// <remarks/>
+        public void GetServersExistingInCollectionsAsync(object userState) {
+            if ((this.GetServersExistingInCollectionsOperationCompleted == null)) {
+                this.GetServersExistingInCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetServersExistingInCollectionsOperationCompleted);
+            }
+            this.InvokeAsync("GetServersExistingInCollections", new object[0], this.GetServersExistingInCollectionsOperationCompleted, userState);
+        }
+        
+        private void OnGetServersExistingInCollectionsOperationCompleted(object arg) {
+            if ((this.GetServersExistingInCollectionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetServersExistingInCollectionsCompleted(this, new GetServersExistingInCollectionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -1537,4 +1581,30 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetServersExistingInCollectionsCompletedEventHandler(object sender, GetServersExistingInCollectionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetServersExistingInCollectionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetServersExistingInCollectionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string[])(this.results[0]));
+            }
+        }
+    }
 }

WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs

@@ -410,5 +410,22 @@ namespace WebsitePanel.Server
                 throw;
             }
         }
+
+        [WebMethod, SoapHeader("settings")]
+        public List<string> GetServersExistingInCollections()
+        {
+            try
+            {
+                Log.WriteStart("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName);
+                var result = RDSProvider.GetServersExistingInCollections();
+                Log.WriteEnd("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' GetServersExistingInCollections", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx

@@ -5626,4 +5626,7 @@
   <data name="ERROR.IDNDOMAIN_NO_ORGANIZATION" xml:space="preserve">
     <value>You cannot use a IDN domain name for organizations</value>
   </data>
+  <data name="ERROR.RDSCOLLECTION_NOT_CREATED" xml:space="preserve">
+    <value>Collection not created</value>
+  </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css

@@ -293,4 +293,5 @@ UL.ActionButtons LI {margin-bottom: 12px;}
 p.warningText {font-size:14px; color:Red; text-align:center;}
 .Hidden {display: none;}
 .LinkText {color:#428bca;}
-.WrapText { white-space: normal;}
+.WrapText { white-space: normal;}
+.chosen-container { margin-top: -30px; }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/PackagesHelper.cs

@@ -28,12 +28,14 @@
 
 using System;
 using System.Data;
+using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.Caching;
 
 using WebsitePanel.EnterpriseServer;
+using System.Collections;
 
 namespace WebsitePanel.Portal
 {
@@ -162,6 +164,33 @@ namespace WebsitePanel.Portal
             return ES.Services.Packages.GetRawMyPackages(PanelSecurity.SelectedUserId);
         }
 
+        public Hashtable GetMyPackages(int index, int PackagesPerPage) 
+        {
+            Hashtable ret = new Hashtable();
+
+            DataTable table = ES.Services.Packages.GetRawMyPackages(PanelSecurity.SelectedUserId).Tables[0];
+            if(table.Rows.Count > 0) {
+                System.Collections.Generic.IEnumerable<DataRow> dr = table.AsEnumerable().Skip(PackagesPerPage * index - PackagesPerPage).Take(PackagesPerPage);
+            
+                DataSet set = new DataSet();
+                set.Tables.Add(dr.CopyToDataTable());
+
+                ret.Add("DataSet", set);
+                ret.Add("RowCount", table.Rows.Count);
+            }
+            return ret;
+        }
+
+        public DataSet GetMyPackage(int packageid) {
+            DataSet ret = new DataSet();
+            DataTable table = ES.Services.Packages.GetRawMyPackages(PanelSecurity.SelectedUserId).Tables[0];
+            if(table.Rows.Count > 0) {
+                DataTable t = table.Select("PackageID = " + packageid).CopyToDataTable();
+                ret.Tables.Add(t);
+            }
+            return ret;
+        }
+
         #region Packages Paged ODS Methods
         DataSet dsPackagesPaged;
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs

@@ -71,9 +71,9 @@ namespace WebsitePanel.Portal
             return rdsServers.Servers;
         }
 
-        public RdsServer[] GetFreeRDSServers()
+        public RdsServer[] GetFreeRDSServers(int packageId)
         {
-            return ES.Services.RDS.GetFreeRdsServersPaged("", "", "", 0, 1000).Servers;
+            return ES.Services.RDS.GetFreeRdsServersPaged(packageId, "", "", "", 0, 1000).Servers;
         }
 
         #endregion

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AddRDSServer.ascx.cs

@@ -50,7 +50,7 @@ namespace WebsitePanel.Portal.RDS
 
         private void BindRDSServers()
         {
-            ddlServers.DataSource = new RDSHelper().GetFreeRDSServers();
+            ddlServers.DataSource = new RDSHelper().GetFreeRDSServers(PanelRequest.ItemID);
             ddlServers.DataTextField = "Name";
             ddlServers.DataValueField = "Id";
             ddlServers.DataBind();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx

@@ -45,10 +45,10 @@
 					    OnRowCommand="gvRDSCollections_RowCommand" AllowPaging="True" AllowSorting="True"
 					    DataSourceID="odsRDSCollectionsPaged" PageSize="20">
                         <Columns>
-                            <asp:TemplateField HeaderText="gvCollectionName" SortExpression="Name">
+                            <asp:TemplateField HeaderText="gvCollectionName" SortExpression="DisplayName">
 							    <ItemStyle Width="40%"></ItemStyle>
 							    <ItemTemplate>                                    
-                                    <asp:hyperlink id="lnkCollectionName" meta:resourcekey="lnkApps" runat="server" NavigateUrl='<%# GetCollectionEditUrl(Eval("Id").ToString()) %>'><%# Eval("Name").ToString() %></asp:hyperlink>
+                                    <asp:hyperlink id="lnkCollectionName" meta:resourcekey="lnkApps" runat="server" NavigateUrl='<%# GetCollectionEditUrl(Eval("Id").ToString()) %>'><%# Eval("DisplayName").ToString() %></asp:hyperlink>
 							    </ItemTemplate>
 						    </asp:TemplateField>
                             <asp:TemplateField HeaderText="gvServer">

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs

@@ -50,7 +50,9 @@ namespace WebsitePanel.Portal.RDS
         protected void btnSave_Click(object sender, EventArgs e)
         {
             if (!Page.IsValid)
+            {
                 return;
+            }
 
             try
             {
@@ -59,14 +61,15 @@ namespace WebsitePanel.Portal.RDS
                     messageBox.ShowErrorMessage("RDS_CREATE_COLLECTION_RDSSERVER_REQUAIRED");
                     return;
                 }
-                RdsCollection collection = new RdsCollection{ Name = txtCollectionName.Text, Servers = servers.GetServers(), Description = "" };
 
+                RdsCollection collection = new RdsCollection{ Name = txtCollectionName.Text, DisplayName = txtCollectionName.Text, Servers = servers.GetServers(), Description = "" };
                 ES.Services.RDS.AddRdsCollection(PanelRequest.ItemID, collection);
-
+                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_collections", "SpaceID=" + PanelSecurity.PackageId));
-                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_collections",
+            }
-                    "SpaceID=" + PanelSecurity.PackageId));
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("RDSCOLLECTION_NOT_CREATED", ex);
             }
-            catch { }
         }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceDetails.ascx

@@ -34,6 +34,9 @@
     <div class="ToolLink">
         <asp:HyperLink ID="lnkDelete" runat="server" meta:resourcekey="lnkDelete" Text="Delete"></asp:HyperLink>
     </div>
+    <div class="ToolLink">
+        <asp:CheckBox ID="chkDefault" runat="server" meta:resourcekey="chkDefaultSpace" AutoPostBack="true" OnCheckedChanged="chkDefault_CheckedChanged" Text="Default space" />
+    </div>
 </div>
 <br />
 <wsp:CollapsiblePanel id="StatusHeader" runat="server"

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceDetails.ascx.cs

@@ -45,20 +45,22 @@ namespace WebsitePanel.Portal
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            BindSpace();
+            if(!IsPostBack) { 
+                BindSpace();
 
-            UserInfo user = UsersHelper.GetUser(PanelSecurity.EffectiveUserId);
+                UserInfo user = UsersHelper.GetUser(PanelSecurity.EffectiveUserId);
 
-            if (user != null)
+                if (user != null)
-            {
-                PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
-                if ((user.Role == UserRole.User) & (Utils.CheckQouta(Quotas.EXCHANGE2007_ISCONSUMER, cntx)))
                 {
-                    lnkSummaryLetter.Visible = false;
+                    PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+                    if ((user.Role == UserRole.User) & (Utils.CheckQouta(Quotas.EXCHANGE2007_ISCONSUMER, cntx)))
+                    {
+                        lnkSummaryLetter.Visible = false;
+                    }
+
                 }
 
             }
-
         }
 
         private void BindSpace()
@@ -68,6 +70,7 @@ namespace WebsitePanel.Portal
             if (package != null)
             {
                 litSpaceName.Text = PortalAntiXSS.EncodeOld(package.PackageName);
+                chkDefault.Checked = package.DefaultTopPackage;
 
                 // bind space status
                 PackageStatus status = (PackageStatus)package.StatusId;
@@ -131,5 +134,10 @@ namespace WebsitePanel.Portal
                 return;
             }
         }
+
+        protected void chkDefault_CheckedChanged(object sender, EventArgs e) {
+            ES.Services.Packages.SetDefaultTopPackage(PanelSecurity.SelectedUserId, PanelSecurity.PackageId);
+            return;
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceDetails.ascx.designer.cs

@@ -29,10 +29,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1873
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -158,6 +157,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink lnkDelete;
         
+        /// <summary>
+        /// chkDefault 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 chkDefault;
+        
         /// <summary>
         /// StatusHeader control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs

@@ -95,7 +95,7 @@ namespace WebsitePanel.Portal
 				txtBackupsPath.Text = settings["BackupsPath"];
 			}
 
-
+            
             // WPI
             settings = ES.Services.System.GetSystemSettings(WSP.SystemSettings.WPI_SETTINGS);
 
@@ -175,6 +175,7 @@ namespace WebsitePanel.Portal
 				}
 
 
+
                 // WPI
                 /*
                 settings[FEED_ENABLE_MICROSOFT] = wpiMicrosoftFeed.Checked.ToString();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs

@@ -472,13 +472,7 @@ namespace WebsitePanel.Portal.UserControls
 
         private void PrepareEnterpriseStorageMenu(MenuItemCollection enterpriseStorageItems)
         {
-            enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageFolders", "enterprisestorage_folders", @"Icons/enterprisestorage_folders_48.png"));
+            enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageFolders", "enterprisestorage_folders", @"Icons/enterprisestorage_folders_48.png"));            
-
-            //if (ShortMenu) return;
-
-            if (Utils.CheckQouta(Quotas.ENTERPRICESTORAGE_DRIVEMAPS, Cntx))
-                enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps", @"Icons/enterprisestorage_drive_maps_48.png"));
-
         }
 
         private void PrepareRDSMenuRoot(MenuItemCollection items)
@@ -507,7 +501,14 @@ namespace WebsitePanel.Portal.UserControls
             rdsItems.Add(CreateMenuItem("RDSCollections", "rds_collections", null));
 
             if (Utils.CheckQouta(Quotas.RDS_SERVERS, Cntx) && (PanelSecurity.LoggedUser.Role != UserRole.User))
-            rdsItems.Add(CreateMenuItem("RDSServers", "rds_servers", null));
+            {
+                rdsItems.Add(CreateMenuItem("RDSServers", "rds_servers", null));
+            }
+
+            if (Utils.CheckQouta(Quotas.ENTERPRICESTORAGE_DRIVEMAPS, Cntx))
+            {
+                rdsItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps", @"Icons/enterprisestorage_drive_maps_48.png"));
+            }
         }
 
         private MenuItem CreateMenuItem(string text, string key)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx

@@ -5,61 +5,66 @@
 <%@ Register Src="UserOrganization.ascx" TagName="UserOrganization" TagPrefix="wsp" %>
 <%@ Import Namespace="WebsitePanel.Portal" %>
 
+<script src="/JavaScript/jquery-1.4.4.min.js" type="text/javascript"></script>
+<script src="/JavaScript/chosen.min.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+    $(function () {
+        $(".chosen-select").chosen({ width: "200px" });
+    });
+</script>
 
 <asp:Panel id="ButtonsPanel" runat="server" class="FormButtonsBar UserSpaces">
-	<asp:Button ID="btnAddItem" runat="server" meta:resourcekey="btnAddItem" Text="Create Hosting Space" CssClass="Button3" OnClick="btnAddItem_Click" />
+    <asp:Button ID="btnAddItem" runat="server" meta:resourcekey="btnAddItem" Text="Create Hosting Space" CssClass="Button3" OnClick="btnAddItem_Click" />
 </asp:Panel>
 
 
-
 <asp:Panel ID="UserPackagesPanel" runat="server" Visible="false">
-    <asp:Repeater ID="PackagesList" runat="server" EnableViewState="false">
+    <div class="IconsBlock">
-        <ItemTemplate>
+        <div class="IconsTitle">
-            <div class="IconsBlock">
+            <asp:DropDownList ID="ddlPackageSelect" OnSelectedIndexChanged="openSelectedPackage" AutoPostBack="true" CssClass="chosen-select" runat="server" Visible="false" />
-                <div class="IconsTitle">
+        </div>
-                    <asp:hyperlink id="lnkEdit" runat="server" NavigateUrl='<%# GetSpaceHomePageUrl((int)Eval("PackageID")) %>'>
+        <asp:Repeater ID="PackagesList" runat="server" EnableViewState="false">
-		                <%# Eval("PackageName") %>
+            <ItemTemplate>
-	                </asp:hyperlink>
+                    <div>
-                </div>
+                        <asp:Repeater ID="PackageGroups" runat="server" DataSource='<%# GetIconsDataSource((int)Eval("PackageID"))  %>' > 
-                <div>
+                            <ItemTemplate>
 
-                    <asp:Repeater ID="PackageGroups" runat="server" DataSource='<%# GetIconsDataSource((int)Eval("PackageID"))  %>' > 
+                                <asp:Label ID="lblGroup" runat="server" CssClass="LinkText" Text='<%# Eval("Text") %>' />
-                        <ItemTemplate>
 
-                            <asp:Label ID="lblGroup" runat="server" CssClass="LinkText" Text='<%# Eval("Text") %>' />
+                                <asp:DataList ID="PackageIcons" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'
+                                    CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
+                                    <ItemTemplate>
+                                        <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
+                                            <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
+                                            <br />
+                                            <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
+                                        </asp:Panel>
+                                        <asp:Panel ID="IconMenu" runat="server" CssClass="IconMenu" Visible='<%# IsIconMenuVisible(Eval("ChildItems")) %>'>
+                                            <ul>
+                                                <asp:Repeater ID="MenuItems" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'>
+                                                    <ItemTemplate>
+                                                        <li><asp:HyperLink ID="HyperLink1" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink></li>
+                                                    </ItemTemplate>
+                                                </asp:Repeater>
+                                            </ul>
+                                        </asp:Panel>
+                                        <ajaxToolkit:HoverMenuExtender TargetControlID="IconPanel" PopupControlID="IconMenu" runat="server"
+                                            PopupPosition="Right" HoverCssClass="Icon Hover"></ajaxToolkit:HoverMenuExtender>
+                                    </ItemTemplate>
+                                </asp:DataList>
 
-                            <asp:DataList ID="PackageIcons" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'
+                            </ItemTemplate>
-                                CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
+                        </asp:Repeater>
-                                <ItemTemplate>
-                                    <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
-                                        <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
-                                        <br />
-                                        <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
-                                    </asp:Panel>
-                                    <asp:Panel ID="IconMenu" runat="server" CssClass="IconMenu" Visible='<%# IsIconMenuVisible(Eval("ChildItems")) %>'>
-                                        <ul>
-                                            <asp:Repeater ID="MenuItems" runat="server" DataSource='<%# GetIconMenuItems(Eval("ChildItems")) %>'>
-                                                <ItemTemplate>
-                                                    <li><asp:HyperLink ID="HyperLink1" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink></li>
-                                                </ItemTemplate>
-                                            </asp:Repeater>
-                                        </ul>
-                                    </asp:Panel>
-                                    <ajaxToolkit:HoverMenuExtender TargetControlID="IconPanel" PopupControlID="IconMenu" runat="server"
-                                        PopupPosition="Right" HoverCssClass="Icon Hover"></ajaxToolkit:HoverMenuExtender>
-                                </ItemTemplate>
-                            </asp:DataList>
 
-                        </ItemTemplate>
+                    </div>
-                    </asp:Repeater>
+                <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
-
+                    <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
-                </div>
+                </asp:Panel>
-            </div>
+            </ItemTemplate>
-            <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
+        </asp:Repeater>
-                <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
+    </div>
-            </asp:Panel>
+    
-        </ItemTemplate>
-    </asp:Repeater>
     <asp:Panel ID="EmptyPackagesList" runat="server" Visible="false" CssClass="FormBody">
         <asp:Literal ID="litEmptyList" runat="server" EnableViewState="false"></asp:Literal>
     </asp:Panel>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs

@@ -36,6 +36,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
+using WSP = WebsitePanel.EnterpriseServer;
 
 using WebsitePanel.EnterpriseServer;
 using System.Xml;
@@ -46,9 +47,10 @@ namespace WebsitePanel.Portal
     public partial class UserSpaces : WebsitePanelModuleBase
     {
         XmlNodeList xmlIcons = null;
-
+        DataSet myPackages;
         protected void Page_Load(object sender, EventArgs e)
         {
+            
             // check for user
             bool isUser = PanelSecurity.SelectedUser.Role == UserRole.User;
 
@@ -57,15 +59,29 @@ namespace WebsitePanel.Portal
 
             if (isUser && xmlIcons != null)
             {
+                
+                if(!IsPostBack) 
+                {
+                    myPackages = new PackagesHelper().GetMyPackages();
+                    myPackages.Tables[0].DefaultView.Sort = "DefaultTopPackage DESC, PackageId ASC";
+                    ddlPackageSelect.DataSource = myPackages.Tables[0].DefaultView;
+                    ddlPackageSelect.DataTextField = myPackages.Tables[0].Columns[2].ColumnName;
+                    ddlPackageSelect.DataValueField = myPackages.Tables[0].Columns[0].ColumnName;
+                    ddlPackageSelect.DataBind();
+                }
                 // USER
                 UserPackagesPanel.Visible = true;
-                PackagesList.DataSource = new PackagesHelper().GetMyPackages();
+                if(!IsPostBack) 
-                PackagesList.DataBind();
-
-                if (PackagesList.Items.Count == 0)
                 {
-                    litEmptyList.Text = GetLocalizedString("gvPackages.Empty");
+                    if(ddlPackageSelect.Items.Count == 0) {
-                    EmptyPackagesList.Visible = true;
+                        litEmptyList.Text = GetLocalizedString("gvPackages.Empty");
+                        EmptyPackagesList.Visible = true;
+                    } else {
+                        ddlPackageSelect.Visible = true;
+                        myPackages = new PackagesHelper().GetMyPackage(int.Parse(ddlPackageSelect.SelectedValue));
+                        PackagesList.DataSource = myPackages;
+                        PackagesList.DataBind();
+                    }
                 }
             }
             else
@@ -223,5 +239,10 @@ namespace WebsitePanel.Portal
         {
             return node.Attributes[name] != null ? node.Attributes[name].Value : null;
         }
+
+        public void openSelectedPackage(Object sender, EventArgs e) {
+            PackagesList.DataSource = new PackagesHelper().GetMyPackage(int.Parse(ddlPackageSelect.SelectedValue));
+            PackagesList.DataBind();
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.designer.cs

@@ -67,6 +67,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel UserPackagesPanel;
         
+        /// <summary>
+        /// ddlPackageSelect 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 ddlPackageSelect;
+        
         /// <summary>
         /// PackagesList control.
         /// </summary>