Merge Commit

WebsitePanel.Installer/Sources/Setup.SchedulerService/Product.wxs

@@ -3,13 +3,23 @@
     <?include Config.wxi?>
     <?define VERSION="2.1"?>
     <Product Id="*" Name="WebsitePanel Scheduler Service Installer" Language="1033" Version="$(var.VERSION)" Manufacturer="Outercurve Foundation" UpgradeCode="629ccd5c-1f6d-4168-bbe6-01c69e232f44">
-        <Package InstallerVersion="200" Compressed="yes" />
+
+      <Package InstallerVersion="200" Compressed="yes" />
         <Media Id="1" EmbedCab="yes" Cabinet="schedulerservice.cab" />
         <Feature Id="ProductFeature" Title="WebsitePanel Scheduler Service Installer" Level="1">
             <ComponentRef Id="ProductFiles" />
         </Feature>
         <Property Id="BannerBitmap">bannrbmp</Property>
-        <WixVariable Id="WixUIBannerBmp" Value="bannrbmp.bmp" />
+
+      <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+      <Upgrade Id="629ccd5c-1f6d-4168-bbe6-01c69e232f44">
+        <UpgradeVersion
+           Minimum="1.0.0.0" Maximum="99.0.0.0"
+           Property="PREVIOUSVERSIONSINSTALLED"
+           IncludeMinimum="yes" IncludeMaximum="no" />
+      </Upgrade>
+
+      <WixVariable Id="WixUIBannerBmp" Value="bannrbmp.bmp" />
         <WixVariable Id="WixUIDialogBmp" Value="dlgbmp.bmp" />
         <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
         <Icon Id="WebSitePanel.ico" SourceFile="WebSitePanel.ico" />
@@ -72,7 +82,9 @@
             </Dialog>
             <Dialog Id="InstallLocationDlg" Width="370" Height="270" Title="[ProductName] Setup">
                 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="Next">
-                    <Publish Event="NewDialog" Value="DatabaseConnectionDlg" Order="3">1</Publish>
+                   <Publish Event="DoAction" Value="PreInstallationAction">1</Publish>
+                    <Publish Event="NewDialog" Value="DatabaseConnectionDlg" Order="3">SKIPCONNECTIONSTRINGSTEP = "0"</Publish>
+                    <Publish Event="NewDialog" Value="VerifyReadyDlg" Order="3">SKIPCONNECTIONSTRINGSTEP = "1"</Publish>
                 </Control>
                 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="Back">
                     <Publish Event="NewDialog" Value="LicenseAgreementDlg" Order="3">1</Publish>
@@ -91,11 +103,15 @@
             <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallLocationDlg" Order="3">
               LicenseAccepted = "1"
             </Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseConnectionDlg">1</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseConnectionDlg">SKIPCONNECTIONSTRINGSTEP = "0"</Publish>
+          <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallLocationDlg">SKIPCONNECTIONSTRINGSTEP = "1"</Publish>
             <TextStyle Id="DlgTitleFont" FaceName="Tahoma" Size="8" Bold="yes" />
         </UI>
         <InstallExecuteSequence>
-            <Custom Action="FinalizeInstall" After="InstallFinalize" />
+          <Custom Action="PropertyFinalizeInstall" After='InstallValidate'/>
+          <Custom Action="FinalizeUnInstall" After="InstallValidate">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
+          <RemoveExistingProducts After="InstallValidate" />
+          <Custom Action='FinalizeInstall' After='InstallFiles' >NOT Installed or REINSTALL</Custom>
         </InstallExecuteSequence>
     </Product>
     <Fragment>
@@ -103,8 +119,20 @@
         <Binary Id="CheckConnection.CA" SourceFile="bin\WebsitePanel.SchedulerServiceInstaller.CA.dll" />
     </Fragment>
     <Fragment>
-        <CustomAction Id="FinalizeInstall" BinaryKey="CheckConnection.CA" DllEntry="FinalizeInstall" />        
+        <!-- immediate CA -->
+        <CustomAction Id='PropertyFinalizeInstall' Property='FinalizeInstall' Value='ConnectionString=[CONNECTIONSTRING];PreviousConnectionString=[PREVIOUSCONNECTIONSTRING];ServiceFolder=[SERVICEFOLDER];PreviousCryptoKey=[PREVIOUSCRYPTOKEY]' Return="check"/>
+
+        <!-- deferred CA -->
+        <CustomAction Id='FinalizeInstall' BinaryKey ='CheckConnection.CA' DllEntry='FinalizeInstall' Impersonate='no' Execute='deferred'  Return='check' HideTarget='yes'/>  
+    
+        <!--<CustomAction Id="FinalizeInstall" BinaryKey="CheckConnection.CA" DllEntry="FinalizeInstall"  />-->        
     </Fragment>
+  <Fragment>
+    <CustomAction Id="PreInstallationAction" BinaryKey="CheckConnection.CA" DllEntry="PreInstallationAction" />
+    <CustomAction Id="FinalizeUnInstall" BinaryKey="CheckConnection.CA" DllEntry="FinalizeUnInstall" />
+    <CustomAction Id='AlreadyUpdated' Error='Product has already been updated to $(var.VERSION) or newer.' />
+    <CustomAction Id='NoDowngrade' Error='A later version of [ProductName] is already installed.' />
+  </Fragment>
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="WEBSITEPANELFOLDER" Name="WebsitePanel">
@@ -115,8 +143,8 @@
     <Fragment>
         <DirectoryRef Id="INSTALLFOLDER">
             <Component Id="ProductFiles" Guid="A89FA6CF-53E2-4390-9E9D-11CD4297D739">
-                <File Id="WebsitePanel.SchedulerService.exe" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe" />
-                <File Id="WebsitePanel.SchedulerService.exe.config" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe.config" />
+              <File Id="WebsitePanel.SchedulerService.exe" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe" />
+              <File Id="WebsitePanel.SchedulerService.exe.config" Source="$(var.BUILDPATH)\WebsitePanel.SchedulerService.exe.config" />
               <File Id="Ionic.Zip.Reduced.dll" Source="$(var.SERVERBUILDPATH)\Ionic.Zip.Reduced.dll"/>
               <File Id="Microsoft.Web.Services3.dll" Source="$(var.SERVERBUILDPATH)\Microsoft.Web.Services3.dll"/>
               <File Id="WebsitePanel.Common.Utils.dll" Source="$(var.BUILDPATH)\WebsitePanel.Common.Utils.dll"/>

WebsitePanel.Installer/Sources/WebsitePanel.SchedulerServiceInstaller/CustomAction.cs

@@ -27,6 +27,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
+using System.Collections.Generic;
 using System.Configuration.Install;
 using System.Data;
 using System.Data.SqlClient;
@@ -34,6 +35,10 @@ using System.IO;
 using System.Linq;
 using System.ServiceProcess;
 using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using System.Xml;
 using Microsoft.Deployment.WindowsInstaller;
 using WebsitePanel.Setup;
 
@@ -41,6 +46,8 @@ namespace WebsitePanel.SchedulerServiceInstaller
 {
     public class CustomActions
     {
+        public const string CustomDataDelimiter = "-=del=-";
+
         [CustomAction]
         public static ActionResult CheckConnection(Session session)
         {
@@ -62,9 +69,71 @@ namespace WebsitePanel.SchedulerServiceInstaller
         [CustomAction]
         public static ActionResult FinalizeInstall(Session session)
         {
-            ChangeConfigString("installer.connectionstring", session["CONNECTIONSTRING"], session["INSTALLFOLDER"]);
-            ChangeCryptoKey(session["INSTALLFOLDER"]);
-            InstallService(session["INSTALLFOLDER"]);
+            var connectionString = GetCustomActionProperty(session, "ConnectionString").Replace(CustomDataDelimiter, ";");
+            var serviceFolder = GetCustomActionProperty(session, "ServiceFolder");
+            var previousConnectionString = GetCustomActionProperty(session, "PreviousConnectionString").Replace(CustomDataDelimiter, ";");
+            var previousCryptoKey = GetCustomActionProperty(session, "PreviousCryptoKey");
+
+            if (string.IsNullOrEmpty(serviceFolder))
+            {
+                return ActionResult.Success;
+            }
+
+            connectionString = string.IsNullOrEmpty(previousConnectionString)
+                ? connectionString
+                : previousConnectionString;
+
+            ChangeConfigString("/configuration/connectionStrings/add[@name='EnterpriseServer']", "connectionString", connectionString, serviceFolder);
+            ChangeConfigString("/configuration/appSettings/add[@key='WebsitePanel.CryptoKey']", "value", previousCryptoKey, serviceFolder);
+            InstallService(serviceFolder);
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult FinalizeUnInstall(Session session)
+        {
+            UnInstallService();
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult PreInstallationAction(Session session)
+        {
+            session["SKIPCONNECTIONSTRINGSTEP"] = "0";
+
+            session["SERVICEFOLDER"] = session["INSTALLFOLDER"];
+
+            var servicePath = SecurityUtils.GetServicePath("WebsitePanel Scheduler");
+
+            if (!string.IsNullOrEmpty(servicePath))
+            {
+                string path = Path.Combine(servicePath, "WebsitePanel.SchedulerService.exe.config");
+
+                if (File.Exists(path))
+                {
+                    using (var reader = new StreamReader(path))
+                    {
+                        string content = reader.ReadToEnd();
+                        var pattern = new Regex(@"(?<=<add key=""WebsitePanel.CryptoKey"" .*?value\s*=\s*"")[^""]+(?="".*?>)");
+                        Match match = pattern.Match(content);
+                        session["PREVIOUSCRYPTOKEY"] = match.Value;
+
+                        var connectionStringPattern = new Regex(@"(?<=<add name=""EnterpriseServer"" .*?connectionString\s*=\s*"")[^""]+(?="".*?>)");
+                        match = connectionStringPattern.Match(content);
+                        session["PREVIOUSCONNECTIONSTRING"] = match.Value.Replace(";", CustomDataDelimiter);
+                    }
+
+                    session["SKIPCONNECTIONSTRINGSTEP"] = "1";
+
+                    if (string.IsNullOrEmpty(session["SERVICEFOLDER"]))
+                    {
+                        session["SERVICEFOLDER"] = servicePath;
+                    }
+                } 
+
+            }
 
             return ActionResult.Success;
         }
@@ -93,44 +162,49 @@ namespace WebsitePanel.SchedulerServiceInstaller
             }
         }
 
-        private static void ChangeCryptoKey(string installFolder)
+        private static void UnInstallService()
         {
-            string path = Path.Combine(installFolder.Replace("SchedulerService", "Enterprise Server"), "web.config");            
-            string cryptoKey = "0123456789";
-
-            if (File.Exists(path))
+            try
             {
-                using (var reader = new StreamReader(path))
-                {
-                    string content = reader.ReadToEnd();
-                    var pattern = new Regex(@"(?<=<add key=""WebsitePanel.CryptoKey"" .*?value\s*=\s*"")[^""]+(?="".*?>)");                    
-                    Match match = pattern.Match(content);                    
-                    cryptoKey = match.Value;
-                }
-            }            
+                var schedulerService =
+                    ServiceController.GetServices().FirstOrDefault(
+                        s => s.DisplayName.Equals("WebsitePanel Scheduler", StringComparison.CurrentCultureIgnoreCase));
 
-            ChangeConfigString("installer.cryptokey", cryptoKey, installFolder);
+                if (schedulerService != null)
+                {
+                    StopService(schedulerService.ServiceName);
+
+                    SecurityUtils.DeleteService(schedulerService.ServiceName);
+                }
+            }
+            catch (Exception)
+            {
+            }
         }
 
-        private static void ChangeConfigString(string searchString, string replaceValue, string installFolder)
+        private static void ChangeConfigString(string nodePath, string attrToChange, string value, string installFolder)
         {
-            string content;
             string path = Path.Combine(installFolder, "WebsitePanel.SchedulerService.exe.config");
 
-            using (var reader = new StreamReader(path))
+            if (!File.Exists(path))
             {
-                content = reader.ReadToEnd();
+                return;
             }
 
-            var re = new Regex("\\$\\{" + searchString + "\\}+", RegexOptions.IgnoreCase);
-            content = re.Replace(content, replaceValue);
+            XmlDocument xmldoc = new XmlDocument();
+            xmldoc.Load(path);
 
-            using (var writer = new StreamWriter(path))
+            XmlElement node = xmldoc.SelectSingleNode(nodePath) as XmlElement;
+
+            if (node != null)
             {
-                writer.Write(content);
+                node.SetAttribute(attrToChange, value);
+
+                xmldoc.Save(path);
             }
         }
 
+
         private static void StopService(string serviceName)
         {
             var sc = new ServiceController(serviceName);
@@ -155,12 +229,12 @@ namespace WebsitePanel.SchedulerServiceInstaller
 
         private static string GetConnectionString(string serverName, string databaseName)
         {
-            return string.Format("Server={0};database={1};Trusted_Connection=true;", serverName, databaseName);
+            return string.Format("Server={0};database={1};Trusted_Connection=true;", serverName, databaseName).Replace(";", CustomDataDelimiter);
         }
 
         private static string GetConnectionString(string serverName, string databaseName, string login, string password)
         {
-            return string.Format("Server={0};database={1};uid={2};password={3};", serverName, databaseName, login, password);
+            return string.Format("Server={0};database={1};uid={2};password={3};", serverName, databaseName, login, password).Replace(";", CustomDataDelimiter);
         }
 
         private static bool CheckConnection(string connectionString)
@@ -186,5 +260,15 @@ namespace WebsitePanel.SchedulerServiceInstaller
 
             return result;
         }
+
+        private static string GetCustomActionProperty(Session session, string key)
+        {
+            if (session.CustomActionData.ContainsKey(key))
+            {
+                return session.CustomActionData[key].Replace("-=-", ";");
+            }
+
+            return string.Empty;
+        }
     }
 }

WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/SecurityUtils.cs

@@ -1110,6 +1110,25 @@ namespace WebsitePanel.Setup
             wmiService.Delete();
         }
 
+	    public static string GetServicePath(string serviceName)
+	    {
+            var mc = new ManagementClass("Win32_Service");
+
+            foreach (var mo in mc.GetInstances())
+            {
+                if (mo.GetPropertyValue("Name").ToString() == serviceName)
+                {
+                    var path = mo.GetPropertyValue("PathName").ToString().Trim('"');
+
+                    var directory = Path.GetDirectoryName(path);
+
+                    return directory;
+                }
+            }
+
+	        return string.Empty;
+	    }
+
 	    #endregion
     }
 

WebsitePanel/Database/install_db.sql

@@ -21064,6 +21064,7 @@ SET @sql = @sql + ' SELECT COUNT(DomainID) FROM @Domains;SELECT
 	WS.ItemName AS WebSiteName,
 	ISNULL(MD.ItemID, 0) AS MailDomainID,
 	MD.ItemName AS MailDomainName,
+	Z.ItemName AS ZoneName,
 	D.IsSubDomain,
 	D.IsInstantAlias,
 	D.IsDomainPointer,

WebsitePanel/Database/update_db.sql

@@ -6057,6 +6057,112 @@ END
 RETURN
 GO
 
+-- wsp-10053: IDN, return ZoneName also from GetDomainsPaged (already exists in other GetDomain-sps)
+ALTER PROCEDURE [dbo].[GetDomainsPaged]
+(
+	@ActorID int,
+	@PackageID int,
+	@ServerID int,
+	@Recursive bit,
+	@FilterColumn nvarchar(50) = '',
+	@FilterValue nvarchar(50) = '',
+	@SortColumn nvarchar(50),
+	@StartRow int,
+	@MaximumRows int
+)
+AS
+SET NOCOUNT ON
+
+-- check rights
+IF dbo.CheckActorPackageRights(@ActorID, @PackageID) = 0
+RAISERROR('You are not allowed to access this package', 16, 1)
+
+-- build query and run it to the temporary table
+DECLARE @sql nvarchar(4000)
+
+IF @SortColumn = '' OR @SortColumn IS NULL
+SET @SortColumn = 'DomainName'
+
+SET @sql = '
+DECLARE @Domains TABLE
+(
+	ItemPosition int IDENTITY(1,1),
+	DomainID int
+)
+INSERT INTO @Domains (DomainID)
+SELECT
+	D.DomainID
+FROM Domains AS D
+INNER JOIN Packages AS P ON D.PackageID = P.PackageID
+INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID
+LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID
+LEFT OUTER JOIN Services AS S ON Z.ServiceID = S.ServiceID
+LEFT OUTER JOIN Servers AS SRV ON S.ServerID = SRV.ServerID
+WHERE (D.IsInstantAlias = 0 AND D.IsDomainPointer = 0) AND
+		((@Recursive = 0 AND D.PackageID = @PackageID)
+		OR (@Recursive = 1 AND dbo.CheckPackageParent(@PackageID, D.PackageID) = 1))
+AND (@ServerID = 0 OR (@ServerID > 0 AND S.ServerID = @ServerID))
+'
+
+IF @FilterColumn <> '' AND @FilterValue <> ''
+SET @sql = @sql + ' AND ' + @FilterColumn + ' LIKE @FilterValue '
+
+IF @SortColumn <> '' AND @SortColumn IS NOT NULL
+SET @sql = @sql + ' ORDER BY ' + @SortColumn + ' '
+
+SET @sql = @sql + ' SELECT COUNT(DomainID) FROM @Domains;SELECT
+	D.DomainID,
+	D.PackageID,
+	D.ZoneItemID,
+	D.DomainItemID,
+	D.DomainName,
+	D.HostingAllowed,
+	ISNULL(WS.ItemID, 0) AS WebSiteID,
+	WS.ItemName AS WebSiteName,
+	ISNULL(MD.ItemID, 0) AS MailDomainID,
+	MD.ItemName AS MailDomainName,
+	Z.ItemName AS ZoneName,
+	D.IsSubDomain,
+	D.IsInstantAlias,
+	D.IsDomainPointer,
+	
+	-- packages
+	P.PackageName,
+	
+	-- server
+	ISNULL(SRV.ServerID, 0) AS ServerID,
+	ISNULL(SRV.ServerName, '''') AS ServerName,
+	ISNULL(SRV.Comments, '''') AS ServerComments,
+	ISNULL(SRV.VirtualServer, 0) AS VirtualServer,
+	
+	-- user
+	P.UserID,
+	U.Username,
+	U.FirstName,
+	U.LastName,
+	U.FullName,
+	U.RoleID,
+	U.Email
+FROM @Domains AS SD
+INNER JOIN Domains AS D ON SD.DomainID = D.DomainID
+INNER JOIN Packages AS P ON D.PackageID = P.PackageID
+INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID
+LEFT OUTER JOIN ServiceItems AS WS ON D.WebSiteID = WS.ItemID
+LEFT OUTER JOIN ServiceItems AS MD ON D.MailDomainID = MD.ItemID
+LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID
+LEFT OUTER JOIN Services AS S ON Z.ServiceID = S.ServiceID
+LEFT OUTER JOIN Servers AS SRV ON S.ServerID = SRV.ServerID
+WHERE SD.ItemPosition BETWEEN @StartRow + 1 AND @StartRow + @MaximumRows'
+
+exec sp_executesql @sql, N'@StartRow int, @MaximumRows int, @PackageID int, @FilterValue nvarchar(50), @ServerID int, @Recursive bit',
+@StartRow, @MaximumRows, @PackageID, @FilterValue, @ServerID, @Recursive
+
+
+RETURN
+
+GO
+
+
 -- Domain lookup tasks
 
 IF NOT EXISTS (SELECT * FROM [dbo].[ScheduleTasks] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP')
@@ -6085,7 +6191,13 @@ GO
 
 IF NOT EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME' )
 BEGIN
-INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [DefaultValue], [ParameterOrder]) VALUES (N'SCHEDULE_TASK_DOMAIN_LOOKUP', N'SERVER_NAME', N'String', NULL, 3)
+INSERT [dbo].[ScheduleTaskParameters] ([TaskID], [ParameterID], [DataTypeID], [DefaultValue], [ParameterOrder]) VALUES (N'SCHEDULE_TASK_DOMAIN_LOOKUP', N'SERVER_NAME', N'String', N'', 3)
+END
+GO
+
+IF EXISTS (SELECT * FROM [dbo].[ScheduleTaskParameters] WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME' )
+BEGIN
+UPDATE [dbo].[ScheduleTaskParameters] SET [DefaultValue] = N'' WHERE [TaskID] = N'SCHEDULE_TASK_DOMAIN_LOOKUP' AND [ParameterID]= N'SERVER_NAME'
 END
 GO
 
@@ -6379,7 +6491,7 @@ Please, find below details of MX and NS changes.
 </p>
 
     <ad:foreach collection="#Domains#" var="Domain" index="i">
-	<h2>#Domain.DomainName#</h2>
+	<h2>#Domain.DomainName# - #DomainUsers[Domain.PackageId].FirstName# #DomainUsers[Domain.PackageId].LastName#</h2>
 
 	<table>
 	    <thead>
@@ -6387,7 +6499,8 @@ Please, find below details of MX and NS changes.
 	            <th>DNS</th>
 				<th>Type</th>
 				<th>Status</th>
-	            <th>Value</th>
+	            <th>Old Value</th>
+                <th>New Value</th>
 	        </tr>
 	    </thead>
 	    <tbody>
@@ -6396,7 +6509,8 @@ Please, find below details of MX and NS changes.
 	            <td>#DnsChange.DnsServer#</td>
 	            <td>#DnsChange.Type#</td>
 				<td>#DnsChange.Status#</td>
-	            <td>#DnsChange.Record.Value#</td>
+                <td>#DnsChange.OldRecord.Value#</td>
+	            <td>#DnsChange.NewRecord.Value#</td>
 	        </tr>
 	    	</ad:foreach>
 	    </tbody>
@@ -6432,19 +6546,19 @@ INSERT [dbo].[UserSettings] ([UserID], [SettingsName], [PropertyName], [Property
 Hello #user.FirstName#,
 </ad:if>
 
-Please, find below MX and NS Changes Information.
-
+Please, find below details of MX and NS changes.
 
 
 <ad:foreach collection="#Domains#" var="Domain" index="i">
 
- #Domain.DomainName#
+ #Domain.DomainName# - #DomainUsers[Domain.PackageId].FirstName# #DomainUsers[Domain.PackageId].LastName#
 
         <ad:foreach collection="#Domain.DnsChanges#" var="DnsChange" index="j">
-            DNS:    #DnsChange.DnsServer#
-            Type:   #DnsChange.Type#
-	    Status: #DnsChange.Status#
-            Value:  #DnsChange.Record.Value#
+            DNS:       #DnsChange.DnsServer#
+            Type:      #DnsChange.Type#
+	    Status:    #DnsChange.Status#
+            Old Value: #DnsChange.OldRecord.Value#
+            New Value: #DnsChange.NewRecord.Value#
 
     	</ad:foreach>
 </ad:foreach>
@@ -6492,7 +6606,7 @@ Hello #user.FirstName#,
 </ad:if>
 
 <p>
-No MX and NS changes have been founded.
+No MX and NS changes have been found.
 </p>
 
 <p>
@@ -6581,6 +6695,24 @@ SELECT
   WHERE [DomainId]  = @DomainId AND [RecordType] = @RecordType
 GO
 
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetDomainAllDnsRecords')
+DROP PROCEDURE GetDomainAllDnsRecords
+GO
+CREATE PROCEDURE [dbo].GetDomainAllDnsRecords
+(
+	@DomainId INT
+)
+AS
+SELECT
+	ID,
+	DomainId,
+	DnsServer,
+	RecordType,
+	Value,
+	Date
+  FROM [dbo].[DomainDnsRecords]
+  WHERE [DomainId]  = @DomainId 
+GO
 
 
 IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'AddDomainDnsRecord')
@@ -6668,6 +6800,20 @@ AS
 UPDATE [dbo].[Domains] SET [LastUpdateDate] = @Date WHERE [DomainID] = @DomainId
 GO
 
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'UpdateDomainDates')
+DROP PROCEDURE UpdateDomainDates
+GO
+CREATE PROCEDURE [dbo].UpdateDomainDates
+(
+	@DomainId INT,
+	@DomainCreationDate DateTime,
+	@DomainExpirationDate DateTime,
+	@DomainLastUpdateDate DateTime 
+)
+AS
+UPDATE [dbo].[Domains] SET [CreationDate] = @DomainCreationDate, [ExpirationDate] = @DomainExpirationDate, [LastUpdateDate] = @DomainLastUpdateDate WHERE [DomainID] = @DomainId
+GO
+
 
 --Updating Domain procedures
 
@@ -6912,9 +7058,17 @@ SET
 WHERE ID = @Id
 GO
 
+
+-- fix Windows 2012 Provider
+BEGIN
+UPDATE [dbo].[Providers] SET [EditorControl] = 'Windows2012' WHERE [ProviderName] = 'Windows2012'
+END
+GO
+
 -- Hyper-V 2012 R2
 IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [ProviderName] = 'Microsoft Hyper-V 2012 R2')
 BEGIN
 INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (350, 30, N'HyperV2012R2', N'Microsoft Hyper-V 2012 R2', N'WebsitePanel.Providers.Virtualization.HyperV2012R2, WebsitePanel.Providers.Virtualization.HyperV2012R2', N'HyperV', 1)
 END
-GO
+GO
+

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

@@ -18,9 +18,8 @@ namespace WebsitePanel.EnterpriseServer {
     using System.Web.Services.Protocols;
     using System;
     using System.Diagnostics;
-
-    using WebsitePanel.Providers.Common;
     using WebsitePanel.Providers.RemoteDesktopServices;
+    using WebsitePanel.Providers.Common;
     using WebsitePanel.Providers.HostedSolution;
     
     
@@ -37,6 +36,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback AddRdsCollectionOperationCompleted;
         
+        private System.Threading.SendOrPostCallback EditRdsCollectionOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetRdsCollectionsPagedOperationCompleted;
         
         private System.Threading.SendOrPostCallback RemoveRdsCollectionOperationCompleted;
@@ -87,6 +88,10 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback GetOrganizationRdsUsersCountOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetApplicationUsersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetApplicationUsersOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -101,6 +106,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event AddRdsCollectionCompletedEventHandler AddRdsCollectionCompleted;
         
+        /// <remarks/>
+        public event EditRdsCollectionCompletedEventHandler EditRdsCollectionCompleted;
+        
         /// <remarks/>
         public event GetRdsCollectionsPagedCompletedEventHandler GetRdsCollectionsPagedCompleted;
         
@@ -176,6 +184,12 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event GetOrganizationRdsUsersCountCompletedEventHandler GetOrganizationRdsUsersCountCompleted;
         
+        /// <remarks/>
+        public event GetApplicationUsersCompletedEventHandler GetApplicationUsersCompleted;
+        
+        /// <remarks/>
+        public event SetApplicationUsersCompletedEventHandler SetApplicationUsersCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCollection", 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 RdsCollection GetRdsCollection(int collectionId) {
@@ -302,6 +316,50 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/EditRdsCollection", 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 ResultObject EditRdsCollection(int itemId, RdsCollection collection) {
+            object[] results = this.Invoke("EditRdsCollection", new object[] {
+                        itemId,
+                        collection});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEditRdsCollection(int itemId, RdsCollection collection, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("EditRdsCollection", new object[] {
+                        itemId,
+                        collection}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndEditRdsCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void EditRdsCollectionAsync(int itemId, RdsCollection collection) {
+            this.EditRdsCollectionAsync(itemId, collection, null);
+        }
+        
+        /// <remarks/>
+        public void EditRdsCollectionAsync(int itemId, RdsCollection collection, object userState) {
+            if ((this.EditRdsCollectionOperationCompleted == null)) {
+                this.EditRdsCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEditRdsCollectionOperationCompleted);
+            }
+            this.InvokeAsync("EditRdsCollection", new object[] {
+                        itemId,
+                        collection}, this.EditRdsCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEditRdsCollectionOperationCompleted(object arg) {
+            if ((this.EditRdsCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.EditRdsCollectionCompleted(this, new EditRdsCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCollectionsPaged", 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 RdsCollectionPaged GetRdsCollectionsPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
@@ -510,9 +568,10 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationRdsServersPaged", 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 GetOrganizationRdsServersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+        public RdsServersPaged GetOrganizationRdsServersPaged(int itemId, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetOrganizationRdsServersPaged", new object[] {
                         itemId,
+                        collectionId,
                         filterColumn,
                         filterValue,
                         sortColumn,
@@ -522,9 +581,10 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationRdsServersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetOrganizationRdsServersPaged(int itemId, System.Nullable<int> collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetOrganizationRdsServersPaged", new object[] {
                         itemId,
+                        collectionId,
                         filterColumn,
                         filterValue,
                         sortColumn,
@@ -539,17 +599,18 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetOrganizationRdsServersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
-            this.GetOrganizationRdsServersPagedAsync(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+        public void GetOrganizationRdsServersPagedAsync(int itemId, System.Nullable<int> collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            this.GetOrganizationRdsServersPagedAsync(itemId, collectionId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
         
         /// <remarks/>
-        public void GetOrganizationRdsServersPagedAsync(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+        public void GetOrganizationRdsServersPagedAsync(int itemId, System.Nullable<int> collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
             if ((this.GetOrganizationRdsServersPagedOperationCompleted == null)) {
                 this.GetOrganizationRdsServersPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationRdsServersPagedOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationRdsServersPaged", new object[] {
                         itemId,
+                        collectionId,
                         filterColumn,
                         filterValue,
                         sortColumn,
@@ -1452,6 +1513,103 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetApplicationUsers", 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 string[] GetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp) {
+            object[] results = this.Invoke("GetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp});
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string[] EndGetApplicationUsers(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetApplicationUsersAsync(int itemId, int collectionId, RemoteApplication remoteApp) {
+            this.GetApplicationUsersAsync(itemId, collectionId, remoteApp, null);
+        }
+        
+        /// <remarks/>
+        public void GetApplicationUsersAsync(int itemId, int collectionId, RemoteApplication remoteApp, object userState) {
+            if ((this.GetApplicationUsersOperationCompleted == null)) {
+                this.GetApplicationUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetApplicationUsersOperationCompleted);
+            }
+            this.InvokeAsync("GetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp}, this.GetApplicationUsersOperationCompleted, userState);
+        }
+        
+        private void OnGetApplicationUsersOperationCompleted(object arg) {
+            if ((this.GetApplicationUsersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetApplicationUsersCompleted(this, new GetApplicationUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetApplicationUsers", 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 ResultObject SetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp, string[] users) {
+            object[] results = this.Invoke("SetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp,
+                        users});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp, string[] users, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp,
+                        users}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndSetApplicationUsers(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetApplicationUsersAsync(int itemId, int collectionId, RemoteApplication remoteApp, string[] users) {
+            this.SetApplicationUsersAsync(itemId, collectionId, remoteApp, users, null);
+        }
+        
+        /// <remarks/>
+        public void SetApplicationUsersAsync(int itemId, int collectionId, RemoteApplication remoteApp, string[] users, object userState) {
+            if ((this.SetApplicationUsersOperationCompleted == null)) {
+                this.SetApplicationUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetApplicationUsersOperationCompleted);
+            }
+            this.InvokeAsync("SetApplicationUsers", new object[] {
+                        itemId,
+                        collectionId,
+                        remoteApp,
+                        users}, this.SetApplicationUsersOperationCompleted, userState);
+        }
+        
+        private void OnSetApplicationUsersOperationCompleted(object arg) {
+            if ((this.SetApplicationUsersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetApplicationUsersCompleted(this, new SetApplicationUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -1536,6 +1694,32 @@ namespace WebsitePanel.EnterpriseServer {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void EditRdsCollectionCompletedEventHandler(object sender, EditRdsCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class EditRdsCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal EditRdsCollectionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetRdsCollectionsPagedCompletedEventHandler(object sender, GetRdsCollectionsPagedCompletedEventArgs e);
@@ -2185,4 +2369,56 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetApplicationUsersCompletedEventHandler(object sender, GetApplicationUsersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetApplicationUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetApplicationUsersCompletedEventArgs(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]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetApplicationUsersCompletedEventHandler(object sender, SetApplicationUsersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetApplicationUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetApplicationUsersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
 }

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

@@ -1910,9 +1910,9 @@ namespace WebsitePanel.EnterpriseServer
 
         public static IDataReader GetProcessBackgroundTasks(BackgroundTaskStatus status)
         {
-            return SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
-                                           ObjectQualifier + "GetProcessBackgroundTasks",
-                                           new SqlParameter("@status", (int)status));
+                return SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
+                                               ObjectQualifier + "GetProcessBackgroundTasks",
+                                               new SqlParameter("@status", (int)status));
         }
 
         public static IDataReader GetBackgroundTopTask(Guid guid)
@@ -4744,9 +4744,19 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
+        public static IDataReader GetDomainAllDnsRecords(int domainId)
+        {
+            return SqlHelper.ExecuteReader(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "GetDomainAllDnsRecords",
+                new SqlParameter("@DomainId", domainId)
+            );
+        }
+
         public static void AddDomainDnsRecord(DnsRecordInfo domainDnsRecord)
         {
-            SqlHelper.ExecuteReader(
+            SqlHelper.ExecuteNonQuery(
                 ConnectionString,
                 CommandType.StoredProcedure,
                 "AddDomainDnsRecord",
@@ -4770,7 +4780,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static void DeleteDomainDnsRecord(int id)
         {
-            SqlHelper.ExecuteReader(
+            SqlHelper.ExecuteNonQuery(
                 ConnectionString,
                 CommandType.StoredProcedure,
                 "DeleteDomainDnsRecord",
@@ -4795,7 +4805,7 @@ namespace WebsitePanel.EnterpriseServer
 
         private static void UpdateDomainDate(int domainId, string stroredProcedure, DateTime date)
         {
-            SqlHelper.ExecuteReader(
+            SqlHelper.ExecuteNonQuery(
                 ConnectionString,
                 CommandType.StoredProcedure,
                 stroredProcedure,
@@ -4804,6 +4814,19 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
+        public static void UpdateDomainDates(int domainId, DateTime? domainCreationDate, DateTime? domainExpirationDate, DateTime? domainLastUpdateDate)
+        {
+            SqlHelper.ExecuteNonQuery(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "UpdateDomainDates",
+                new SqlParameter("@DomainId", domainId),
+                new SqlParameter("@DomainCreationDate", domainCreationDate),
+                new SqlParameter("@DomainExpirationDate", domainExpirationDate),
+                new SqlParameter("@DomainLastUpdateDate", domainLastUpdateDate)
+            );
+        }
+
         #endregion
 
     }

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

@@ -29,6 +29,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Globalization;
+using System.Linq;
 using System.Xml;
 using System.Xml.Serialization;
 using WebsitePanel.Providers;
@@ -38,6 +40,12 @@ namespace WebsitePanel.EnterpriseServer
 {
     public class DnsServerController : IImportController, IBackupController
     {
+        private static string GetAsciiZoneName(string zoneName)
+        {
+            var idn = new IdnMapping();
+            return idn.GetAscii(zoneName);
+        }
+
         private static DNSServer GetDNSServer(int serviceId)
         {
             DNSServer dns = new DNSServer();
@@ -55,6 +63,9 @@ namespace WebsitePanel.EnterpriseServer
             // get DNS provider
             DNSServer dns = GetDNSServer(serviceId);
 
+            // Ensure zoneName is in ascii before saving to database
+            zoneName = GetAsciiZoneName(zoneName);
+
             // check if zone already exists
             if (dns.ZoneExists(zoneName))
                 return BusinessErrorCodes.ERROR_DNS_ZONE_EXISTS;
@@ -199,7 +210,7 @@ namespace WebsitePanel.EnterpriseServer
         {
             // zone item
             DnsZone zone = primaryZone ? new DnsZone() : new SecondaryDnsZone();
-            zone.Name = zoneName;
+            zone.Name = GetAsciiZoneName(zoneName);
             zone.PackageId = spaceId;
             zone.ServiceId = serviceId;
             int zoneItemId = PackageController.AddPackageItem(zone);
@@ -280,6 +291,8 @@ namespace WebsitePanel.EnterpriseServer
 
             foreach (GlobalDnsRecord record in records)
             {
+                domainName = GetAsciiZoneName(domainName);
+
                 DnsRecord rr = new DnsRecord();
                 rr.RecordType = (DnsRecordType)Enum.Parse(typeof(DnsRecordType), record.RecordType, true);
                 rr.RecordName = Utils.ReplaceStringVariable(record.RecordName, "host_name", hostName, true);
@@ -359,8 +372,11 @@ namespace WebsitePanel.EnterpriseServer
             DNSServer dns = new DNSServer();
             ServiceProviderProxy.Init(dns, serviceId);
 
+            // IDN: The list of importable names is populated with unicode names, to make it easier for the user
+            var idn = new IdnMapping();
+
             if (itemType == typeof(DnsZone))
-                items.AddRange(dns.GetZones());
+                items.AddRange(dns.GetZones().Select(z => idn.GetUnicode(z)));
 
             return items;
         }
@@ -377,7 +393,7 @@ namespace WebsitePanel.EnterpriseServer
             {
                 // add DNS zone
                 DnsZone zone = new DnsZone();
-                zone.Name = itemName;
+                zone.Name = GetAsciiZoneName(itemName);
                 zone.ServiceId = serviceId;
                 zone.PackageId = packageId;
                 int zoneId = PackageController.AddPackageItem(zone);

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/ReportController.cs

@@ -278,11 +278,16 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
         }
 
         private static void PopulateOrganizationData(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
-        {            
+        {
+            TaskManager.Write("Stat populate organization data "+org.Name);
+
             if (report.ExchangeReport != null)
             {
+
                 try
                 {
+                    TaskManager.Write("Populate exchange report items");
+
                     PopulateExchangeReportItems(org, report, topReseller);
                 }
                 catch(Exception ex)
@@ -295,6 +300,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             {
                 try
                 {
+                    TaskManager.Write("Populate populate CRM report items");
+
                     PopulateCRMReportItems(org, report, topReseller);
                 }
                 catch(Exception ex)
@@ -307,6 +314,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             {
                 try
                 {
+                    TaskManager.Write("Populate SharePoint item ");
+
                     PopulateSharePointItem(org, report, topReseller);
                 }
                 catch(Exception ex)
@@ -319,6 +328,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             {
                 try
                 {
+                    TaskManager.Write("Populate Lync report items");
+
                     PopulateLyncReportItems(org, report, topReseller);
                 }
                 catch (Exception ex)
@@ -331,6 +342,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             {
                 try
                 {
+                    TaskManager.Write("Populate Organization statistics report");
+
                     PopulateOrganizationStatisticsReport(org, report, topReseller);
                 }
                 catch(Exception ex)
@@ -339,7 +352,7 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                 }
             }
 
-
+            TaskManager.Write("End populate organization data " + org.Name);
         }
 
         private static int GetExchangeServiceID(int packageId)
@@ -408,6 +421,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
 
         private static void PopulateExchangeReportItems(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
         {
+            TaskManager.Write("Exchange Report Items " + org.Name);
+
             //Check if exchange organization
             if (string.IsNullOrEmpty(org.GlobalAddressList))
                 return;
@@ -420,10 +435,14 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             }
             catch (Exception ex)
             {
+                TaskManager.WriteError(ex);
+
                 throw new ApplicationException(
                     string.Format("Could not get mailboxes for current organization {0}", org.Id), ex);
             }
 
+            TaskManager.WriteParameter("mailboxes.Count", mailboxes.Count);
+
             try
             {
                 int exchangeServiceId = GetExchangeServiceID(org.PackageId);
@@ -431,6 +450,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             }
             catch(Exception ex)
             {
+                TaskManager.WriteError(ex);
+
                 throw new ApplicationException(
                     string.Format("Could not get exchange server. PackageId: {0}", org.PackageId), ex);
             }
@@ -440,6 +461,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             {
                 try
                 {
+                    TaskManager.WriteParameter("mailbox", mailbox.UserPrincipalName);
+
                     stats = null;
                     try
                     {
@@ -448,6 +471,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     }
                     catch (Exception ex)
                     {
+                        TaskManager.WriteError(ex);
+
                         TaskManager.WriteError(ex, "Could not get mailbox statistics. AccountName: {0}",
                                                mailbox.UserPrincipalName);
                     }
@@ -466,6 +491,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                         
                         stats.BlackberryEnabled = BlackBerryController.CheckBlackBerryUserExists(mailbox.AccountId);
                         report.ExchangeReport.Items.Add(stats);
+
+                        TaskManager.Write("Items.Add");
                     }
                 }
                 catch(Exception ex)
@@ -473,7 +500,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     TaskManager.WriteError(ex);
                 }
             }
-            
+
+            TaskManager.Write("End Populate Exchange Report Items " + org.Name);
         }
 
 
@@ -547,6 +575,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
 
         private static void PopulateSpaceData(int packageId, EnterpriseSolutionStatisticsReport report, string topReseller)
         {
+            TaskManager.Write("Populate SpaceData " + packageId);
+
             List<Organization> organizations;
             
             try
@@ -570,10 +600,14 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     TaskManager.WriteError(ex);
                 }
             }
+
+            TaskManager.Write("End Populate SpaceData " + packageId);
         }
         
         private static void PopulateUserData(UserInfo user, EnterpriseSolutionStatisticsReport report, string topReseller)
         {
+            TaskManager.Write("Populate UserData " + user.Username);
+
             DataSet ds;
             try
             {
@@ -596,11 +630,14 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     TaskManager.WriteError(ex);
                 }
             }
-            
+
+            TaskManager.Write("End Populate UserData " + user.Username);
         }
 
         private static void GetUsersData(EnterpriseSolutionStatisticsReport report, int userId, bool generateExchangeReport, bool generateSharePointReport, bool generateCRMReport, bool generateOrganizationReport, bool generateLyncReport, string topReseller)
         {
+            TaskManager.Write("Get UsersData " + userId);
+
             List<UserInfo> users;
             try
             {
@@ -611,9 +648,12 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                 throw new ApplicationException("Cannot get users for report", ex);
             }
 
+            TaskManager.WriteParameter("users.Count", users.Count);
             
             foreach (UserInfo user in users)
             {
+                TaskManager.WriteParameter("User", user.Username);
+
                 try
                 {
                     PopulateUserData(user, report, topReseller);
@@ -631,11 +671,16 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                 {
                     TaskManager.WriteError(ex);
                 }
-            }            
+            }
+
+            TaskManager.Write("End get UsersData " + userId);
+
         }
 
         public static EnterpriseSolutionStatisticsReport GetEnterpriseSolutionStatisticsReport(int userId, bool generateExchangeReport, bool generateSharePointReport, bool generateCRMReport, bool generateOrganizationReport, bool generateLyncReport)
         {
+            TaskManager.Write("Get enterprise solution statistics report " + userId);
+
             EnterpriseSolutionStatisticsReport report = new EnterpriseSolutionStatisticsReport();
             
             if (generateExchangeReport || generateOrganizationReport)
@@ -647,7 +692,6 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             if (generateLyncReport || generateOrganizationReport)
                 report.LyncReport = new LyncStatisticsReport();
 
-
             if (generateCRMReport || generateOrganizationReport)
                 report.CRMReport = new CRMStatisticsReport();
 
@@ -664,6 +708,8 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                 TaskManager.WriteError(ex, "Cannot get enterprise solution statistics report");
             }
 
+            TaskManager.Write("End get enterprise solution statistics report " + userId);
+
             return report;
         }
         

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

@@ -980,11 +980,13 @@ namespace WebsitePanel.EnterpriseServer
             homeFolder.PackageId = packageId;
             homeFolder.Name = path;
 
+            int res = AddPackageItem(homeFolder);
+
             // Added By Haya
             UpdatePackageHardQuota(packageId);
 
             // save package item
-            return AddPackageItem(homeFolder);
+            return res;
         }
 
         public static DateTime GetPackageBandwidthUpdate(int packageId)

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

@@ -68,6 +68,11 @@ namespace WebsitePanel.EnterpriseServer
             return AddRdsCollectionInternal(itemId, collection);
         }
 
+        public static ResultObject EditRdsCollection(int itemId, RdsCollection collection)
+        {
+            return EditRdsCollectionInternal(itemId, collection);
+        }
+
         public static RdsCollectionPaged GetRdsCollectionsPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
             return GetRdsCollectionsPagedInternal(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
@@ -93,9 +98,9 @@ namespace WebsitePanel.EnterpriseServer
             return GetFreeRdsServersPagedInternal(filterColumn, filterValue, sortColumn, startRow, maximumRows);
         }
 
-        public static RdsServersPaged GetOrganizationRdsServersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        public static RdsServersPaged GetOrganizationRdsServersPaged(int itemId, int? collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
-            return GetOrganizationRdsServersPagedInternal(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
+            return GetOrganizationRdsServersPagedInternal(itemId, collectionId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
         }
 
         public static RdsServersPaged GetOrganizationFreeRdsServersPaged(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
@@ -198,6 +203,16 @@ namespace WebsitePanel.EnterpriseServer
             return GetOrganizationRdsUsersCountInternal(itemId);
         }
 
+        public static List<string> GetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp)
+        {
+            return GetApplicationUsersInternal(itemId, collectionId, remoteApp);
+        }
+
+        public static ResultObject SetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp, List<string> users)
+        {
+            return SetApplicationUsersInternal(itemId, collectionId, remoteApp, users);
+        }
+
         private static RdsCollection GetRdsCollectionInternal(int collectionId)
         {
             var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
@@ -285,6 +300,58 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
+        private static ResultObject EditRdsCollectionInternal(int itemId, RdsCollection collection)
+        {
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "EDIT_RDS_COLLECTION");
+
+            try
+            {                
+                Organization org = OrganizationController.GetOrganization(itemId);
+
+                if (org == null)
+                {
+                    result.IsSuccess = false;
+                    result.AddError("", new NullReferenceException("Organization not found"));
+                    return result;
+                }
+
+                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+                var existingServers =
+                    ObjectUtils.CreateListFromDataReader<RdsServer>(DataProvider.GetRDSServersByCollectionId(collection.Id)).ToList();
+                var removedServers = existingServers.Where(x => !collection.Servers.Select(y => y.Id).Contains(x.Id));
+                var newServers = collection.Servers.Where(x => !existingServers.Select(y => y.Id).Contains(x.Id));
+
+                foreach(var server in removedServers)
+                {
+                    DataProvider.RemoveRDSServerFromCollection(server.Id);
+                }
+
+                rds.AddRdsServersToDeployment(newServers.ToArray());
+
+                foreach (var server in newServers)
+                {                    
+                    DataProvider.AddRDSServerToCollection(server.Id, collection.Id);
+                }
+            }
+            catch (Exception ex)
+            {
+                result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_COLLECTION", ex);
+            }
+            finally
+            {
+                if (!result.IsSuccess)
+                {
+                    TaskManager.CompleteResultTask(result);
+                }
+                else
+                {
+                    TaskManager.CompleteResultTask();
+                }
+            }
+
+            return result;
+        }
+
         private static RdsCollectionPaged GetRdsCollectionsPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
             DataSet ds = DataProvider.GetRDSCollectionsPaged(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
@@ -425,9 +492,9 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
-        private static RdsServersPaged GetOrganizationRdsServersPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        private static RdsServersPaged GetOrganizationRdsServersPagedInternal(int itemId, int? collectionId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
-            DataSet ds = DataProvider.GetRDSServersPaged(itemId, null, filterColumn, filterValue, sortColumn, startRow, maximumRows, ignoreRdsCollectionId: true);
+            DataSet ds = DataProvider.GetRDSServersPaged(itemId, collectionId, filterColumn, filterValue, sortColumn, startRow, maximumRows, ignoreRdsCollectionId: !collectionId.HasValue);
 
             RdsServersPaged result = new RdsServersPaged();
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
@@ -775,7 +842,7 @@ namespace WebsitePanel.EnterpriseServer
         private static List<OrganizationUser> GetRdsCollectionUsersInternal(int collectionId)
         {
             return ObjectUtils.CreateListFromDataReader<OrganizationUser>(DataProvider.GetRDSCollectionUsersByRDSCollectionId(collectionId));
-        }
+        }        
 
         private static ResultObject SetUsersToRdsCollectionInternal(int itemId, int collectionId, List<OrganizationUser> users)
         {
@@ -855,6 +922,61 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
+        private static List<string> GetApplicationUsersInternal(int itemId, int collectionId, RemoteApplication remoteApp)
+        {
+            var result = new List<string>();
+            Organization org = OrganizationController.GetOrganization(itemId);
+
+            if (org == null)
+            {
+                return result;
+            }
+
+            var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+            var collection = GetRdsCollection(collectionId);
+
+            result.AddRange(rds.GetApplicationUsers(collection.Name, remoteApp.DisplayName));
+
+            return result;
+        }
+
+        private static ResultObject SetApplicationUsersInternal(int itemId, int collectionId, RemoteApplication remoteApp, List<string> users)
+        {
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "SET_REMOTE_APP_USERS");
+
+            try
+            {                
+                Organization org = OrganizationController.GetOrganization(itemId);
+                if (org == null)
+                {
+                    result.IsSuccess = false;
+                    result.AddError("", new NullReferenceException("Organization not found"));
+                    return result;
+                }
+
+                var collection = GetRdsCollection(collectionId);
+                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+                rds.SetApplicationUsers(collection.Name, remoteApp, users.ToArray());
+            }
+            catch (Exception ex)
+            {
+                result.AddError("REMOTE_DESKTOP_SERVICES_SET_REMOTE_APP_USERS", ex);
+            }
+            finally
+            {
+                if (!result.IsSuccess)
+                {
+                    TaskManager.CompleteResultTask(result);
+                }
+                else
+                {
+                    TaskManager.CompleteResultTask();
+                }
+            }
+
+            return result;
+        }
+
         private static ResultObject AddRemoteApplicationToCollectionInternal(int itemId, RdsCollection collection, RemoteApplication remoteApp)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_REMOTE_APP_TO_COLLECTION");

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

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Net.Mail;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using WebsitePanel.Providers.DomainLookup;
 using Whois.NET;
 
@@ -31,6 +32,8 @@ namespace WebsitePanel.EnterpriseServer
             var checkedDomains = new List<int>();
             var expiredDomains = new List<DomainInfo>();
             var nonExistenDomains = new List<DomainInfo>();
+            var allDomains = new List<DomainInfo>();
+            var allTopLevelDomains = new List<DomainInfo>();
 
             // get input parameters
             int daysBeforeNotify;
@@ -55,11 +58,11 @@ namespace WebsitePanel.EnterpriseServer
             {
                 var domains = ServerController.GetDomains(package.PackageId);
 
-                var subDomains = domains.Where(x => x.IsSubDomain).ToList();
+                allDomains.AddRange(domains);
 
-                var topLevelDomains = domains = domains.Where(x => !x.IsSubDomain && !x.IsDomainPointer).ToList(); //Selecting top-level domains
+                domains = domains.Where(x => !x.IsSubDomain && !x.IsDomainPointer).ToList(); //Selecting top-level domains
 
-                domains = topLevelDomains.Where(x => x.CreationDate == null || x.ExpirationDate == null ? true : CheckDomainExpiration(x.ExpirationDate, daysBeforeNotify)).ToList(); // selecting expired or with empty expire date domains
+                allTopLevelDomains.AddRange(domains);
 
                 var domainUser = UserController.GetUser(package.UserId);
 
@@ -88,16 +91,30 @@ namespace WebsitePanel.EnterpriseServer
                     {
                         nonExistenDomains.Add(domain);
                     }
+
+                    Thread.Sleep(100);
                 }
+            }
 
-                foreach (var subDomain in subDomains)
+            var subDomains = allDomains.Where(x => x.ExpirationDate == null || CheckDomainExpiration(x.ExpirationDate, daysBeforeNotify)).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(); ;
+
+                if (mainDomain != null)
                 {
-                    var mainDomain = topLevelDomains.Where(x => subDomain.DomainName.ToLowerInvariant().Contains(x.DomainName.ToLowerInvariant())).OrderByDescending(s => s.DomainName.Length).FirstOrDefault(); ;
+                    ServerController.UpdateDomainRegistrationData(subDomain, mainDomain.CreationDate, mainDomain.ExpirationDate);
 
-                    if (mainDomain != null)
+                    var nonExistenDomain = nonExistenDomains.FirstOrDefault(x => subDomain.DomainId == x.DomainId);
+
+                    if (nonExistenDomain != null)
                     {
-                        ServerController.UpdateDomainRegistrationData(subDomain, mainDomain.CreationDate, mainDomain.ExpirationDate);
+                        nonExistenDomains.Remove(nonExistenDomain);
                     }
+
+                    Thread.Sleep(100);
                 }
             }
 

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

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Net.Mail;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using WebsitePanel.Providers.DNS;
 using WebsitePanel.Providers.DomainLookup;
 using WebsitePanel.Server;
@@ -25,12 +26,15 @@ namespace WebsitePanel.EnterpriseServer
 
         private const string MxRecordPattern = @"mail exchanger = (.+)";
         private const string NsRecordPattern = @"nameserver = (.+)";
-
+        private const string DnsTimeOutMessage = @"dns request timed out";
+        private const int DnsTimeOutRetryCount = 3;
+        
         public override void DoWork()
         {
             BackgroundTask topTask = TaskManager.TopTask;
 
             List<DomainDnsChanges> domainsChanges = new List<DomainDnsChanges>();
+            var domainUsers = new Dictionary<int, UserInfo>();
 
             // get input parameters
             string dnsServersString = (string)topTask.GetParamValue(DnsServersParameter);
@@ -82,34 +86,41 @@ namespace WebsitePanel.EnterpriseServer
                         continue;
                     }
 
+                    if (!domainUsers.ContainsKey(domain.PackageId))
+                    {
+                        var domainUser = UserController.GetUser(packages.First(x=>x.PackageId == domain.PackageId).UserId);
+
+                        domainUsers.Add(domain.PackageId, domainUser);
+                    }
+
                     DomainDnsChanges domainChanges = new DomainDnsChanges();
                     domainChanges.DomainName = domain.DomainName;
+                    domainChanges.PackageId = domain.PackageId;
 
-                    var mxRecords = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainDnsRecords(domain.DomainId, DnsRecordType.MX));
-                    var nsRecords = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainDnsRecords(domain.DomainId, DnsRecordType.NS));
+                    var dbDnsRecords = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainAllDnsRecords(domain.DomainId));
 
                     //execute server
                     foreach (var dnsServer in dnsServers)
                     {
-                        var dnsMxRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.MX);
-                        var dnsNsRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.NS);
+                        var dnsMxRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.MX) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.MX).ToList();
+                        var dnsNsRecords = GetDomainDnsRecords(winServer, domain.DomainName, dnsServer, DnsRecordType.NS) ?? dbDnsRecords.Where(x => x.RecordType == DnsRecordType.NS).ToList();
 
                         FillRecordData(dnsMxRecords, domain, dnsServer);
                         FillRecordData(dnsNsRecords, domain, dnsServer);
 
-                        domainChanges.DnsChanges.AddRange(ApplyDomainRecordsChanges(mxRecords, dnsMxRecords, dnsServer));
-                        domainChanges.DnsChanges.AddRange(ApplyDomainRecordsChanges(nsRecords, dnsNsRecords, dnsServer));
+                        domainChanges.DnsChanges.AddRange(ApplyDomainRecordsChanges(dbDnsRecords.Where(x => x.RecordType == DnsRecordType.MX), dnsMxRecords, dnsServer));
+                        domainChanges.DnsChanges.AddRange(ApplyDomainRecordsChanges(dbDnsRecords.Where(x => x.RecordType == DnsRecordType.NS), dnsNsRecords, dnsServer));
+
+                        domainChanges.DnsChanges = CombineDnsRecordChanges(domainChanges.DnsChanges, dnsServer).ToList();
                     }
 
                     domainsChanges.Add(domainChanges);
                 }
             }
 
-            TaskManager.Write(string.Format("Domains checked: {0}", domainsChanges.Count));
-
             var changedDomains = FindDomainsWithChangedRecords(domainsChanges);
 
-            SendMailMessage(user, changedDomains);
+            SendMailMessage(user, changedDomains, domainUsers);
         }
 
         
@@ -152,13 +163,13 @@ namespace WebsitePanel.EnterpriseServer
 
                 if (dnsRecord != null)
                 {
-                    dnsRecordChanges.Add(new DnsRecordInfoChange { Record = record, Type = record.RecordType, Status = DomainDnsRecordStatuses.NotChanged, DnsServer = dnsServer });
+                    dnsRecordChanges.Add(new DnsRecordInfoChange { OldRecord = record, NewRecord = dnsRecord, Type = record.RecordType, Status = DomainDnsRecordStatuses.NotChanged, DnsServer = dnsServer });
 
                     dnsRecords.Remove(dnsRecord);
                 }
                 else
                 {
-                    dnsRecordChanges.Add(new DnsRecordInfoChange { Record = record, Type = record.RecordType, Status = DomainDnsRecordStatuses.Removed, DnsServer = dnsServer });
+                    dnsRecordChanges.Add(new DnsRecordInfoChange { OldRecord = record, NewRecord = new DnsRecordInfo { Value = string.Empty}, Type = record.RecordType, Status = DomainDnsRecordStatuses.Removed, DnsServer = dnsServer });
 
                     RemoveRecord(record);
                 }
@@ -166,7 +177,7 @@ namespace WebsitePanel.EnterpriseServer
 
             foreach (var record in dnsRecords)
             {
-                dnsRecordChanges.Add(new DnsRecordInfoChange { Record = record, Type = record.RecordType, Status = DomainDnsRecordStatuses.Added, DnsServer= dnsServer});
+                dnsRecordChanges.Add(new DnsRecordInfoChange { OldRecord = new DnsRecordInfo { Value = string.Empty }, NewRecord = record, Type = record.RecordType, Status = DomainDnsRecordStatuses.Added, DnsServer = dnsServer });
 
                 AddRecord(record);
             }
@@ -174,6 +185,39 @@ namespace WebsitePanel.EnterpriseServer
             return dnsRecordChanges;
         }
 
+        private IEnumerable<DnsRecordInfoChange> CombineDnsRecordChanges(IEnumerable<DnsRecordInfoChange> records, string dnsServer)
+        {
+            var resultRecords = records.Where(x => x.DnsServer == dnsServer).ToList();
+
+            var recordsToRemove = new List<DnsRecordInfoChange>();
+
+            var removedRecords = records.Where(x => x.Status == DomainDnsRecordStatuses.Removed);
+            var addedRecords = records.Where(x => x.Status == DomainDnsRecordStatuses.Added);
+
+            foreach (DnsRecordType type in (DnsRecordType[])Enum.GetValues(typeof(DnsRecordType)))
+            {
+                foreach (var removedRecord in removedRecords.Where(x => x.Type == type))
+                {
+                    var addedRecord = addedRecords.FirstOrDefault(x => x.Type == type && !recordsToRemove.Contains(x));
+
+                    if (addedRecord != null)
+                    {
+                        recordsToRemove.Add(addedRecord);
+
+                        removedRecord.NewRecord = addedRecord.NewRecord;
+                        removedRecord.Status = DomainDnsRecordStatuses.Updated;
+                    }
+                }
+            }
+
+            foreach (var record in recordsToRemove)
+            {
+                resultRecords.Remove(record);
+            }
+
+            return resultRecords;
+        }
+
         private void FillRecordData(IEnumerable<DnsRecordInfo> records, DomainInfo domain, string dnsServer)
         {
             foreach (var record in records)
@@ -200,6 +244,8 @@ namespace WebsitePanel.EnterpriseServer
         private void RemoveRecord(DnsRecordInfo dnsRecord)
         {
             DataProvider.DeleteDomainDnsRecord(dnsRecord.Id);
+
+            Thread.Sleep(100);
         }
 
         private void AddRecords(IEnumerable<DnsRecordInfo> dnsRecords)
@@ -213,9 +259,11 @@ namespace WebsitePanel.EnterpriseServer
         private void AddRecord(DnsRecordInfo dnsRecord)
         {
             DataProvider.AddDomainDnsRecord(dnsRecord);
+
+            Thread.Sleep(100);
         }
 
-        private void SendMailMessage(UserInfo user, IEnumerable<DomainDnsChanges> domainsChanges)
+        private void SendMailMessage(UserInfo user, IEnumerable<DomainDnsChanges> domainsChanges, Dictionary<int, UserInfo> domainUsers)
         {
             BackgroundTask topTask = TaskManager.TopTask;
 
@@ -249,6 +297,7 @@ namespace WebsitePanel.EnterpriseServer
             Hashtable items = new Hashtable();
 
             items["user"] = user;
+            items["DomainUsers"] = domainUsers;
             items["Domains"] = domainsChanges;
 
             body = PackageController.EvaluateTemplate(body, items);
@@ -264,7 +313,20 @@ namespace WebsitePanel.EnterpriseServer
             var args = string.Format("-type={0} {1} {2}", recordType, domain, dnsServer);
 
             // execute system command
-            var raw = winServer.ExecuteSystemCommand(command, args);
+            var raw  = string.Empty;
+            int triesCount = 0;
+
+            do
+            {
+                raw = winServer.ExecuteSystemCommand(command, args);
+            } 
+            while (raw.ToLowerInvariant().Contains(DnsTimeOutMessage) && ++triesCount < DnsTimeOutRetryCount);
+
+            //timeout check 
+            if (raw.ToLowerInvariant().Contains(DnsTimeOutMessage))
+            {
+                return null;
+            }
 
             var records = ParseNsLookupResult(raw, dnsServer, recordType);
 

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

@@ -32,6 +32,7 @@ using System.IO;
 using System.Net.Mail;
 using System.Net.Mime;
 using System.Text;
+using WebsitePanel.EnterpriseServer;
 using WebsitePanel.EnterpriseServer.Code.HostedSolution;
 using WebsitePanel.Providers.HostedSolution;
 
@@ -51,6 +52,8 @@ namespace WebsitePanel.EnterpriseServer
         {
             try
             {
+                TaskManager.Write("Start HostedSolutionReportTask");
+
                 BackgroundTask topTask = TaskManager.TopTask;
 
                 bool isExchange = Utils.ParseBool(topTask.GetParamValue(EXCHANGE_REPORT), false);
@@ -61,23 +64,41 @@ namespace WebsitePanel.EnterpriseServer
 
                 string email = topTask.GetParamValue(EMAIL).ToString();
 
+                TaskManager.WriteParameter("isExchange",isExchange);
+                TaskManager.WriteParameter("isSharePoint",isSharePoint);
+                TaskManager.WriteParameter("isLync", isLync);
+                TaskManager.WriteParameter("isCRM", isCRM);
+                TaskManager.WriteParameter("isOrganization", isOrganization);
+                TaskManager.WriteParameter("email", email);
 
                 UserInfo user = PackageController.GetPackageOwner(topTask.PackageId);
+
+                TaskManager.WriteParameter("user", user.Username);
+
                 EnterpriseSolutionStatisticsReport report =
                     ReportController.GetEnterpriseSolutionStatisticsReport(user.UserId, isExchange, isSharePoint, isCRM,
                                                              isOrganization, isLync);
 
+                TaskManager.WriteParameter("report.ExchangeReport.Items.Count", report.ExchangeReport.Items.Count);
+                TaskManager.WriteParameter("report.SharePointReport.Items.Count", report.SharePointReport.Items.Count);
+                TaskManager.WriteParameter("report.CRMReport.Items.Count", report.CRMReport.Items.Count);
+                TaskManager.WriteParameter("report.OrganizationReport.Items.Count", report.OrganizationReport.Items.Count);
+                TaskManager.WriteParameter("report.LyncReport.Items.Count", report.LyncReport.Items.Count);
 
                 SendMessage(user, email, isExchange && report.ExchangeReport != null ? report.ExchangeReport.ToCSV() : string.Empty,
                             isSharePoint && report.SharePointReport != null ? report.SharePointReport.ToCSV() : string.Empty,
                             isCRM && report.CRMReport != null ? report.CRMReport.ToCSV() : string.Empty,
                             isOrganization && report.OrganizationReport != null ? report.OrganizationReport.ToCSV() : string.Empty,
                             isLync && report.LyncReport != null ? report.LyncReport.ToCSV() : string.Empty);
+
             }
             catch(Exception ex)
             {
                 TaskManager.WriteError(ex);
             }
+
+            TaskManager.Write("End HostedSolutionReportTask");
+
         }
 
         
@@ -97,6 +118,8 @@ namespace WebsitePanel.EnterpriseServer
         
         private void SendMessage(UserInfo user,string email, string exchange_csv, string sharepoint_csv, string crm_csv, string organization_csv, string lync_csv)
         {
+            TaskManager.Write("SendMessage");
+
             List<Attachment> attacments = new List<Attachment>();
             PrepareAttament("exchange.csv", exchange_csv, attacments);
             PrepareAttament("sharepoint.csv", sharepoint_csv, attacments);
@@ -104,9 +127,6 @@ namespace WebsitePanel.EnterpriseServer
             PrepareAttament("crm.csv", crm_csv, attacments);
             PrepareAttament("organization.csv", organization_csv, attacments);
             
-
-            
-
             // get letter settings
             UserSettings settings = UserController.GetUserSettings(user.UserId, UserSettings.HOSTED_SOLUTION_REPORT);
 
@@ -116,9 +136,29 @@ namespace WebsitePanel.EnterpriseServer
             string body = user.HtmlMail ? settings["HtmlBody"] : settings["TextBody"];
             bool isHtml = user.HtmlMail;
 
-            MailPriority priority = MailPriority.Normal;                        
+            MailPriority priority = MailPriority.Normal;
+
+            TaskManager.WriteParameter("from", from);
+            TaskManager.WriteParameter("email", email);
+            TaskManager.WriteParameter("subject", subject);
+            TaskManager.WriteParameter("body", body);
+          
             
-            MailHelper.SendMessage(from, email, cc,  subject, body, priority, isHtml, attacments.ToArray());
+            int res = MailHelper.SendMessage(from, email, cc,  subject, body, priority, isHtml, attacments.ToArray());
+
+            if (res==0)
+            {
+                TaskManager.Write("SendMessage OK");
+            }
+            else
+            {
+                TaskManager.WriteError("SendMessage error ", "error code", res.ToString());
+            }
+
+            TaskManager.WriteParameter("", res);
+
+            TaskManager.Write("End SendMessage");
+
             
         }
     }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Scheduling/Scheduler.cs

@@ -45,7 +45,7 @@ namespace WebsitePanel.EnterpriseServer
         public static SchedulerJob nextSchedule = null;
 
         public static void Start()
-        {   
+        {
             ScheduleTasks();
         }
 
@@ -73,7 +73,7 @@ namespace WebsitePanel.EnterpriseServer
 
         private static void RunManualTasks()
         {
-            var tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Stopping);            
+            var tasks = TaskController.GetProcessTasks(BackgroundTaskStatus.Stopping);
 
             foreach (var task in tasks)
             {

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

@@ -30,6 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Data;
+using System.Linq;
 using System.Net;
 using System.Xml;
 using WebsitePanel.Providers;
@@ -42,6 +43,8 @@ using WebsitePanel.Providers.HostedSolution;
 using Whois.NET;
 using System.Text.RegularExpressions;
 using WebsitePanel.Providers.DomainLookup;
+using System.Globalization;
+using System.Linq;
 
 namespace WebsitePanel.EnterpriseServer
 {
@@ -72,6 +75,9 @@ namespace WebsitePanel.EnterpriseServer
                                                                                 @"expires:(.+)" //.fi 
                                                                               };
 
+        private static List<string> _datePatterns = new List<string> {   @"ddd MMM dd HH:mm:ss G\MT yyyy"
+                                                                              };
+
         #region Servers
         public static List<ServerInfo> GetAllServers()
         {
@@ -1641,11 +1647,16 @@ namespace WebsitePanel.EnterpriseServer
         {
             var result = new List<DnsRecordInfo>();
 
-            var mxRecords = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainDnsRecords(domainId, DnsRecordType.MX));
-            var nsRecords = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainDnsRecords(domainId, DnsRecordType.NS));
+            var records = ObjectUtils.CreateListFromDataReader<DnsRecordInfo>(DataProvider.GetDomainAllDnsRecords(domainId));
 
-            result.AddRange(mxRecords);
-            result.AddRange(nsRecords);
+            var activeDomain = records.OrderByDescending(x => x.Date).FirstOrDefault();
+
+            if (activeDomain != null)
+            {
+                records = records.Where(x => x.DnsServer == activeDomain.DnsServer).ToList();
+            }
+
+            result.AddRange(records);
 
             return result;
         }
@@ -2178,11 +2189,13 @@ namespace WebsitePanel.EnterpriseServer
                     }
                 }
 
+                // Find and delete all zone items for this domain
+                var zoneItems = PackageController.GetPackageItemsByType(domain.PackageId, ResourceGroups.Dns, typeof (DnsZone));
+                zoneItems.AddRange(PackageController.GetPackageItemsByType(domain.PackageId, ResourceGroups.Dns, typeof(SecondaryDnsZone)));
 
-                // remove DNS zone meta-item if required
-                if (domain.ZoneItemId > 0)
+                foreach (var zoneItem in zoneItems.Where(z => z.Name == domain.ZoneName))
                 {
-                    PackageController.DeletePackageItem(domain.ZoneItemId);
+                    PackageController.DeletePackageItem(zoneItem.Id);
                 }
 
                 // delete domain
@@ -2680,26 +2693,20 @@ namespace WebsitePanel.EnterpriseServer
 
         public static DomainInfo UpdateDomainRegistrationData(DomainInfo domain)
         {
+            DateTime? createdDate = null;
+            DateTime? expiredDate = null;
+
             try
             {
-                DataProvider.UpdateDomainLastUpdateDate(domain.DomainId, DateTime.Now);
-
                 var whoisResult = WhoisClient.Query(domain.DomainName.ToLowerInvariant());
 
-                var createdDate = GetDomainInfoDate(whoisResult.Raw, _createdDatePatterns);
-                var expiredDate = GetDomainInfoDate(whoisResult.Raw, _expiredDatePatterns);
+                createdDate = GetDomainInfoDate(whoisResult.Raw, _createdDatePatterns);
+                expiredDate = GetDomainInfoDate(whoisResult.Raw, _expiredDatePatterns);
 
-                if (createdDate != null)
-                {
-                    domain.CreationDate = createdDate;
-                    DataProvider.UpdateDomainCreationDate(domain.DomainId, createdDate.Value);
-                }
+                domain.CreationDate = createdDate;
+                domain.ExpirationDate = expiredDate;
 
-                if (expiredDate != null)
-                {
-                    domain.ExpirationDate = expiredDate;
-                    DataProvider.UpdateDomainExpirationDate(domain.DomainId, expiredDate.Value);
-                }
+                DataProvider.UpdateDomainDates(domain.DomainId, createdDate, expiredDate, DateTime.Now);
             }
             catch (Exception e)
             { 
@@ -2711,19 +2718,10 @@ namespace WebsitePanel.EnterpriseServer
 
         public static DomainInfo UpdateDomainRegistrationData(DomainInfo domain, DateTime? creationDate, DateTime? expirationDate)
         {
-            if (creationDate != null)
-            {
-                domain.CreationDate = creationDate;
-                DataProvider.UpdateDomainCreationDate(domain.DomainId, creationDate.Value);
-            }
+            DataProvider.UpdateDomainDates(domain.DomainId, creationDate, expirationDate, DateTime.Now);
 
-            if (expirationDate != null)
-            {
-                domain.ExpirationDate = expirationDate;
-                DataProvider.UpdateDomainExpirationDate(domain.DomainId, expirationDate.Value);
-            }
-
-            DataProvider.UpdateDomainLastUpdateDate(domain.DomainId, DateTime.Now);
+            domain.CreationDate = creationDate;
+            domain.ExpirationDate = expirationDate;
 
             return domain;
         }
@@ -2738,7 +2736,7 @@ namespace WebsitePanel.EnterpriseServer
                 {
                     if (match.Success && match.Groups.Count == 2)
                     {
-                        return DateTime.Parse(match.Groups[1].ToString().Trim());
+                        return ParseDate(match.Groups[1].ToString().Trim());
                     }
                 }
             }
@@ -2746,6 +2744,21 @@ namespace WebsitePanel.EnterpriseServer
             return null;
         }
 
+        private static DateTime? ParseDate(string dateString)
+        {
+            var result = DateTime.MinValue;
+
+            foreach (var datePattern in _datePatterns)
+            {
+                if (DateTime.TryParseExact(dateString, datePattern, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                {
+                    return result;
+                }
+            }
+
+            return DateTime.Parse(dateString);
+        }
+
         #endregion
 
         #region DNS Zones
@@ -2763,7 +2776,7 @@ namespace WebsitePanel.EnterpriseServer
                 DNSServer dns = new DNSServer();
                 ServiceProviderProxy.Init(dns, zoneItem.ServiceId);
 
-                return dns.GetZoneRecords(domain.DomainName);
+                return dns.GetZoneRecords(zoneItem.Name);
             }
 
             return new DnsRecord[] { };

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

@@ -70,6 +70,12 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.AddRdsCollection(itemId, collection);
         }
 
+        [WebMethod]
+        public ResultObject EditRdsCollection(int itemId, RdsCollection collection)
+        {
+            return RemoteDesktopServicesController.EditRdsCollection(itemId, collection);
+        }
+
         [WebMethod]
         public RdsCollectionPaged GetRdsCollectionsPaged(int itemId, string filterColumn, string filterValue,
             string sortColumn, int startRow, int maximumRows)
@@ -101,10 +107,10 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public RdsServersPaged GetOrganizationRdsServersPaged(int itemId, string filterColumn, string filterValue,
+        public RdsServersPaged GetOrganizationRdsServersPaged(int itemId, int? collectionId, string filterColumn, string filterValue,
             string sortColumn, int startRow, int maximumRows)
         {
-            return RemoteDesktopServicesController.GetOrganizationRdsServersPaged(itemId, filterColumn, filterValue,
+            return RemoteDesktopServicesController.GetOrganizationRdsServersPaged(itemId, collectionId, filterColumn, filterValue,
                 sortColumn, startRow, maximumRows);
         }
 
@@ -230,5 +236,16 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.GetOrganizationRdsUsersCount(itemId);
         }
 
+        [WebMethod]
+        public List<string> GetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp)
+        {
+            return RemoteDesktopServicesController.GetApplicationUsers(itemId, collectionId, remoteApp);
+        }
+
+        [WebMethod]
+        public ResultObject SetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp, List<string> users)
+        {
+            return RemoteDesktopServicesController.SetApplicationUsers(itemId, collectionId, remoteApp, users);
+        }
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/DomainLookup/DnsRecordInfoChange.cs

@@ -9,7 +9,8 @@ namespace WebsitePanel.Providers.DomainLookup
     public class DnsRecordInfoChange
     {
         public string DnsServer { get; set; }
-        public DnsRecordInfo Record { get; set; }
+        public DnsRecordInfo OldRecord { get; set; }
+        public DnsRecordInfo NewRecord { get; set; }
         public DomainDnsRecordStatuses Status { get; set; }
         public DnsRecordType Type { get; set; }
     }

WebsitePanel/Sources/WebsitePanel.Providers.Base/DomainLookup/DomainDnsChanges.cs

@@ -8,6 +8,7 @@ namespace WebsitePanel.Providers.DomainLookup
     public class DomainDnsChanges
     {
         public string DomainName { get; set; }
+        public int PackageId { get; set; }
 
         public List<DnsRecordInfoChange> DnsChanges { get; set; }
 

WebsitePanel/Sources/WebsitePanel.Providers.Base/DomainLookup/DomainDnsRecordStatuses.cs

@@ -9,6 +9,7 @@ namespace WebsitePanel.Providers.DomainLookup
     {
         NotChanged,
         Removed,
-        Added
+        Added,
+        Updated
     }
 }

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

@@ -40,6 +40,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
     public interface IRemoteDesktopServices
     {
         bool CreateCollection(string organizationId, RdsCollection collection);
+        bool AddRdsServersToDeployment(RdsServer[] servers);
         RdsCollection GetCollection(string collectionName);
         bool RemoveCollection(string organizationId, string collectionName);
         bool SetUsersInCollection(string organizationId, string collectionName, List<string> users);
@@ -60,5 +61,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         bool CheckSessionHostFeatureInstallation(string hostName);
 
         bool CheckServerAvailability(string hostName);
+        string[] GetApplicationUsers(string collectionName, string applicationName);
+        bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users);
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/WebsitePanel.Providers.Mail.IceWarp.csproj

@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\IceWarp\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\IceWarp\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -48,10 +48,12 @@
     <ProjectReference Include="..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
       <Project>{684C932A-6C75-46AC-A327-F3689D89EB42}</Project>
       <Name>WebsitePanel.Providers.Base</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
       <Project>{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}</Project>
       <Name>WebsitePanel.Server.Utils</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

WebsitePanel/Sources/WebsitePanel.Providers.OS.Windows2012/Windows2012.cs

@@ -80,10 +80,12 @@ namespace WebsitePanel.Providers.OS
         {
             Log.WriteStart("SetQuotaLimitOnFolder");
             Log.WriteInfo("FolderPath : {0}", folderPath);
-            Log.WriteInfo("ShareNameDrive : {0}", shareNameDrive);
             Log.WriteInfo("QuotaLimit : {0}", quotaLimit);
 
-            string path = Path.Combine(shareNameDrive + @":\", folderPath);
+            string path = folderPath;
+
+            if (shareNameDrive != null)
+                path = Path.Combine(shareNameDrive + @":\", folderPath);
 
             Runspace runSpace = null;
             try

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

@@ -169,6 +169,35 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #region RDS Collections
 
+        public bool AddRdsServersToDeployment(RdsServer[] servers)
+        {
+            var result = true;
+            Runspace runSpace = null;
+
+            try
+            {
+                runSpace = OpenRunspace();
+
+                foreach (var server in servers)
+                {                    
+                    if (!ExistRdsServerInDeployment(runSpace, server))
+                    {
+                        AddRdsServerToDeployment(runSpace, server);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                result = false;
+            }
+            finally
+            {
+                CloseRunspace(runSpace);
+            }
+
+            return result;
+        }
+
         public bool CreateCollection(string organizationId, RdsCollection collection)
         {
             var result = true;
@@ -467,6 +496,70 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #region Remote Applications
 
+        public string[] GetApplicationUsers(string collectionName, string applicationName)
+        {
+            Runspace runspace = null;
+            List<string> result = new List<string>();
+
+            try
+            {
+                runspace = OpenRunspace();
+
+                Command cmd = new Command("Get-RDRemoteApp");
+                cmd.Parameters.Add("CollectionName", collectionName);
+                cmd.Parameters.Add("ConnectionBroker", ConnectionBroker);
+                cmd.Parameters.Add("DisplayName", applicationName);
+
+                var application = ExecuteShellCommand(runspace, cmd, false).FirstOrDefault();
+
+                if (application != null)
+                {
+                    var users = (string[])(GetPSObjectProperty(application, "UserGroups"));
+
+                    if (users != null)
+                    {
+                        result.AddRange(users);
+                    }
+                }
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+
+            return result.ToArray();
+        }
+
+        public bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users)
+        {
+            Runspace runspace = null;
+            bool result = true;
+
+            try
+            {
+                runspace = OpenRunspace();
+
+                Command cmd = new Command("Set-RDRemoteApp");
+                cmd.Parameters.Add("CollectionName", collectionName);
+                cmd.Parameters.Add("ConnectionBroker", ConnectionBroker);
+                cmd.Parameters.Add("DisplayName", remoteApp.DisplayName);
+                cmd.Parameters.Add("UserGroups", users);
+                cmd.Parameters.Add("Alias", remoteApp.Alias);
+
+                ExecuteShellCommand(runspace, cmd, false).FirstOrDefault();
+            }
+            catch(Exception)
+            {
+                result = false;
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+
+            return result;
+        }
+
         public List<StartMenuApp> GetAvailableRemoteApplications(string collectionName)
         {
             var startApps = new List<StartMenuApp>();

WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/WebsitePanel.Providers.Web.IIs80.csproj

@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\IIs80\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\IIs80\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -56,18 +56,22 @@
     <ProjectReference Include="..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
       <Project>{684c932a-6c75-46ac-a327-f3689d89eb42}</Project>
       <Name>WebsitePanel.Providers.Base</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Providers.Web.IIs60\WebsitePanel.Providers.Web.IIs60.csproj">
       <Project>{9be0317d-e42e-4ff6-9a87-8c801f046ea1}</Project>
       <Name>WebsitePanel.Providers.Web.IIs60</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Providers.Web.IIS70\WebsitePanel.Providers.Web.IIs70.csproj">
       <Project>{1b9dce85-c664-49fc-b6e1-86c63cab88d1}</Project>
       <Name>WebsitePanel.Providers.Web.IIs70</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
       <Project>{e91e52f3-9555-4d00-b577-2b1dbdd87ca7}</Project>
       <Name>WebsitePanel.Server.Utils</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />

WebsitePanel/Sources/WebsitePanel.SchedulerService/SchedulerService.cs

@@ -35,15 +35,16 @@ namespace WebsitePanel.SchedulerService
     public partial class SchedulerService : ServiceBase
     {
         private Timer _Timer;
-        private static bool _isRuninng;
+        private static object _isRuninng;
         #region Construcor
 
         public SchedulerService()
         {
+            _isRuninng = new object();
+
             InitializeComponent();
 
             _Timer = new Timer(Process, null, 5000, 5000);
-            _isRuninng = false;
         }
 
         #endregion
@@ -57,12 +58,18 @@ namespace WebsitePanel.SchedulerService
         protected static void Process(object callback)
         {
             //check running service
-            if (_isRuninng)
+            if (!Monitor.TryEnter(_isRuninng))
                 return;
 
-            _isRuninng = true;
-             Scheduler.Start();
-            _isRuninng = false;
+            try
+            {
+                Scheduler.Start();
+            }
+            finally
+            {
+                Monitor.Exit(_isRuninng);
+            }
+
         }
 
         #endregion

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

@@ -31,6 +31,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback CreateCollectionOperationCompleted;
         
+        private System.Threading.SendOrPostCallback AddRdsServersToDeploymentOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetCollectionOperationCompleted;
         
         private System.Threading.SendOrPostCallback RemoveCollectionOperationCompleted;
@@ -63,6 +65,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback CheckServerAvailabilityOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetApplicationUsersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetApplicationUsersOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -71,6 +77,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event CreateCollectionCompletedEventHandler CreateCollectionCompleted;
         
+        /// <remarks/>
+        public event AddRdsServersToDeploymentCompletedEventHandler AddRdsServersToDeploymentCompleted;
+        
         /// <remarks/>
         public event GetCollectionCompletedEventHandler GetCollectionCompleted;
         
@@ -119,6 +128,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event CheckServerAvailabilityCompletedEventHandler CheckServerAvailabilityCompleted;
         
+        /// <remarks/>
+        public event GetApplicationUsersCompletedEventHandler GetApplicationUsersCompleted;
+        
+        /// <remarks/>
+        public event SetApplicationUsersCompletedEventHandler SetApplicationUsersCompleted;
+        
         /// <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)]
@@ -164,6 +179,48 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/AddRdsServersToDeployment", 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 bool AddRdsServersToDeployment(RdsServer[] servers) {
+            object[] results = this.Invoke("AddRdsServersToDeployment", new object[] {
+                        servers});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginAddRdsServersToDeployment(RdsServer[] servers, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("AddRdsServersToDeployment", new object[] {
+                        servers}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public bool EndAddRdsServersToDeployment(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void AddRdsServersToDeploymentAsync(RdsServer[] servers) {
+            this.AddRdsServersToDeploymentAsync(servers, null);
+        }
+        
+        /// <remarks/>
+        public void AddRdsServersToDeploymentAsync(RdsServer[] servers, object userState) {
+            if ((this.AddRdsServersToDeploymentOperationCompleted == null)) {
+                this.AddRdsServersToDeploymentOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddRdsServersToDeploymentOperationCompleted);
+            }
+            this.InvokeAsync("AddRdsServersToDeployment", new object[] {
+                        servers}, this.AddRdsServersToDeploymentOperationCompleted, userState);
+        }
+        
+        private void OnAddRdsServersToDeploymentOperationCompleted(object arg) {
+            if ((this.AddRdsServersToDeploymentCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddRdsServersToDeploymentCompleted(this, new AddRdsServersToDeploymentCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -871,6 +928,99 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetApplicationUsers", 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[] GetApplicationUsers(string collectionName, string applicationName) {
+            object[] results = this.Invoke("GetApplicationUsers", new object[] {
+                        collectionName,
+                        applicationName});
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetApplicationUsers(string collectionName, string applicationName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetApplicationUsers", new object[] {
+                        collectionName,
+                        applicationName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string[] EndGetApplicationUsers(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetApplicationUsersAsync(string collectionName, string applicationName) {
+            this.GetApplicationUsersAsync(collectionName, applicationName, null);
+        }
+        
+        /// <remarks/>
+        public void GetApplicationUsersAsync(string collectionName, string applicationName, object userState) {
+            if ((this.GetApplicationUsersOperationCompleted == null)) {
+                this.GetApplicationUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetApplicationUsersOperationCompleted);
+            }
+            this.InvokeAsync("GetApplicationUsers", new object[] {
+                        collectionName,
+                        applicationName}, this.GetApplicationUsersOperationCompleted, userState);
+        }
+        
+        private void OnGetApplicationUsersOperationCompleted(object arg) {
+            if ((this.GetApplicationUsersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetApplicationUsersCompleted(this, new GetApplicationUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/SetApplicationUsers", 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 bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users) {
+            object[] results = this.Invoke("SetApplicationUsers", new object[] {
+                        collectionName,
+                        remoteApp,
+                        users});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetApplicationUsers", new object[] {
+                        collectionName,
+                        remoteApp,
+                        users}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public bool EndSetApplicationUsers(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetApplicationUsersAsync(string collectionName, RemoteApplication remoteApp, string[] users) {
+            this.SetApplicationUsersAsync(collectionName, remoteApp, users, null);
+        }
+        
+        /// <remarks/>
+        public void SetApplicationUsersAsync(string collectionName, RemoteApplication remoteApp, string[] users, object userState) {
+            if ((this.SetApplicationUsersOperationCompleted == null)) {
+                this.SetApplicationUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetApplicationUsersOperationCompleted);
+            }
+            this.InvokeAsync("SetApplicationUsers", new object[] {
+                        collectionName,
+                        remoteApp,
+                        users}, this.SetApplicationUsersOperationCompleted, userState);
+        }
+        
+        private void OnSetApplicationUsersOperationCompleted(object arg) {
+            if ((this.SetApplicationUsersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetApplicationUsersCompleted(this, new SetApplicationUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -903,6 +1053,32 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void AddRdsServersToDeploymentCompletedEventHandler(object sender, AddRdsServersToDeploymentCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddRdsServersToDeploymentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal AddRdsServersToDeploymentCompletedEventArgs(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.3038")]
     public delegate void GetCollectionCompletedEventHandler(object sender, GetCollectionCompletedEventArgs e);
@@ -1208,4 +1384,56 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetApplicationUsersCompletedEventHandler(object sender, GetApplicationUsersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetApplicationUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetApplicationUsersCompletedEventArgs(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]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetApplicationUsersCompletedEventHandler(object sender, SetApplicationUsersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetApplicationUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetApplicationUsersCompletedEventArgs(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]));
+            }
+        }
+    }
 }

WebsitePanel/Sources/WebsitePanel.Server/DNSServer.asmx.cs

@@ -28,6 +28,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Web.Services;
 using System.Web.Services.Protocols;
 using WebsitePanel.Providers;
@@ -51,6 +52,12 @@ namespace WebsitePanel.Server
             get { return (IDnsServer)Provider; }
         }
 
+        private string GetAsciiZoneName(string zoneName)
+        {
+            var idn = new IdnMapping();
+            return idn.GetAscii(zoneName);
+        }
+
         #region Zones
         [WebMethod, SoapHeader("settings")]
         public bool ZoneExists(string zoneName)
@@ -58,7 +65,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' ZoneExists", ProviderSettings.ProviderName);
-                bool result = DnsProvider.ZoneExists(zoneName);
+                bool result = DnsProvider.ZoneExists(GetAsciiZoneName(zoneName));
                 Log.WriteEnd("'{0}' ZoneExists", ProviderSettings.ProviderName);
                 return result;
             }
@@ -92,7 +99,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' AddPrimaryZone", ProviderSettings.ProviderName);
-                DnsProvider.AddPrimaryZone(zoneName, secondaryServers);
+                DnsProvider.AddPrimaryZone(GetAsciiZoneName(zoneName), secondaryServers);
                 Log.WriteEnd("'{0}' AddPrimaryZone", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -108,7 +115,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' AddSecondaryZone", ProviderSettings.ProviderName);
-                DnsProvider.AddSecondaryZone(zoneName, masterServers);
+                DnsProvider.AddSecondaryZone(GetAsciiZoneName(zoneName), masterServers);
                 Log.WriteEnd("'{0}' AddSecondaryZone", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -124,7 +131,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' DeleteZone", ProviderSettings.ProviderName);
-                DnsProvider.DeleteZone(zoneName);
+                DnsProvider.DeleteZone(GetAsciiZoneName(zoneName));
                 Log.WriteEnd("'{0}' DeleteZone", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -140,7 +147,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' UpdateSoaRecord", ProviderSettings.ProviderName);
-                DnsProvider.UpdateSoaRecord(zoneName, host, primaryNsServer, primaryPerson);
+                DnsProvider.UpdateSoaRecord(GetAsciiZoneName(zoneName), host, primaryNsServer, primaryPerson);
                 Log.WriteEnd("'{0}' UpdateSoaRecord", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -158,7 +165,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' GetZoneRecords", ProviderSettings.ProviderName);
-                DnsRecord[] result = DnsProvider.GetZoneRecords(zoneName);
+                DnsRecord[] result = DnsProvider.GetZoneRecords(GetAsciiZoneName(zoneName));
                 Log.WriteEnd("'{0}' GetZoneRecords", ProviderSettings.ProviderName);
                 return result;
             }
@@ -175,7 +182,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' AddZoneRecord", ProviderSettings.ProviderName);
-                DnsProvider.AddZoneRecord(zoneName, record);
+                DnsProvider.AddZoneRecord(GetAsciiZoneName(zoneName), record);
                 Log.WriteEnd("'{0}' AddZoneRecord", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -191,7 +198,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' DeleteZoneRecord", ProviderSettings.ProviderName);
-                DnsProvider.DeleteZoneRecord(zoneName, record);
+                DnsProvider.DeleteZoneRecord(GetAsciiZoneName(zoneName), record);
                 Log.WriteEnd("'{0}' DeleteZoneRecord", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -207,7 +214,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' AddZoneRecords", ProviderSettings.ProviderName);
-                DnsProvider.AddZoneRecords(zoneName, records);
+                DnsProvider.AddZoneRecords(GetAsciiZoneName(zoneName), records);
                 Log.WriteEnd("'{0}' AddZoneRecords", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -223,7 +230,7 @@ namespace WebsitePanel.Server
             try
             {
                 Log.WriteStart("'{0}' DeleteZoneRecords", ProviderSettings.ProviderName);
-                DnsProvider.DeleteZoneRecords(zoneName, records);
+                DnsProvider.DeleteZoneRecords(GetAsciiZoneName(zoneName), records);
                 Log.WriteEnd("'{0}' DeleteZoneRecords", ProviderSettings.ProviderName);
             }
             catch (Exception ex)

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

@@ -76,6 +76,23 @@ namespace WebsitePanel.Server
             }
         }
 
+        [WebMethod, SoapHeader("settings")]
+        public bool AddRdsServersToDeployment(RdsServer[] servers)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' AddRdsServersToDeployment", ProviderSettings.ProviderName);
+                var result = RDSProvider.AddRdsServersToDeployment(servers);
+                Log.WriteEnd("'{0}' AddRdsServersToDeployment", ProviderSettings.ProviderName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' AddRdsServersToDeployment", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
+
         [WebMethod, SoapHeader("settings")]
         public RdsCollection GetCollection(string collectionName)
         {
@@ -342,6 +359,39 @@ namespace WebsitePanel.Server
                 throw;
             }
         }
-    }
 
+        [WebMethod, SoapHeader("settings")]
+        public string[] GetApplicationUsers(string collectionName, string applicationName)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' GetApplicationUsers", ProviderSettings.ProviderName);
+                var result = RDSProvider.GetApplicationUsers(collectionName, applicationName);
+                Log.WriteEnd("'{0}' GetApplicationUsers", ProviderSettings.ProviderName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' GetApplicationUsers", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' SetApplicationUsers", ProviderSettings.ProviderName);
+                var result = RDSProvider.SetApplicationUsers(collectionName, remoteApp, users);
+                Log.WriteEnd("'{0}' SetApplicationUsers", ProviderSettings.ProviderName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' SetApplicationUsers", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
+    }
 }

WebsitePanel/Sources/WebsitePanel.Server/Web.config

@@ -1,46 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <!-- Custom configuration sections -->
   <configSections>
-    <section name="microsoft.web.services3" type="Microsoft.Web.Services3.Configuration.WebServicesConfiguration, Microsoft.Web.Services3" />
-    <section name="websitepanel.server" type="WebsitePanel.Server.ServerConfiguration, WebsitePanel.Server" />
-    <section name="cachingConfiguration" type="Microsoft.Practices.EnterpriseLibrary.Caching.Configuration.CacheManagerSettings,Microsoft.Practices.EnterpriseLibrary.Caching" />
+    <section name="microsoft.web.services3" type="Microsoft.Web.Services3.Configuration.WebServicesConfiguration, Microsoft.Web.Services3"/>
+    <section name="websitepanel.server" type="WebsitePanel.Server.ServerConfiguration, WebsitePanel.Server"/>
+    <section name="cachingConfiguration" type="Microsoft.Practices.EnterpriseLibrary.Caching.Configuration.CacheManagerSettings,Microsoft.Practices.EnterpriseLibrary.Caching"/>
     <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
       <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
         <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
         </sectionGroup>
+        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
       </sectionGroup>
     </sectionGroup>
   </configSections>
   <appSettings>
-    <add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false" />
-    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false" />
-    <add key="WebsitePanel.Exchange.enableSP2abp" value="false" />
-    <add key="SCVMMServerName" value="" />
-    <add key="SCVMMServerPort" value="" />
+    <add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false"/>
+    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false"/>
+    <add key="WebsitePanel.Exchange.enableSP2abp" value="false"/>
+    <add key="SCVMMServerName" value=""/>
+    <add key="SCVMMServerPort" value=""/>
   </appSettings>
   <system.diagnostics>
     <switches>
-      <add name="Log" value="4" />
+      <add name="Log" value="2"/>
       <!-- 0 - Off, 1 - Error, 2 - Warning, 3 - Info, 4 - Verbose -->
     </switches>
     <trace autoflush="true">
       <listeners>
-        <add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel" />
+        <add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel"/>
         <!-- Writes log to the file
         <add name="DefaultListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="WebsitePanel.Server.log" />
         -->
-        <remove name="Default" />
+        <remove name="Default"/>
       </listeners>
     </trace>
   </system.diagnostics>
   <!-- Caching Configuration -->
   <cachingConfiguration defaultCacheManager="Default Cache Manager">
     <backingStores>
-      <add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching" />
+      <add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching"/>
     </backingStores>
     <cacheManagers>
-      <add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory" />
+      <add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory"/>
     </cacheManagers>
   </cachingConfiguration>
   <!-- WebsitePanel Configuration -->
@@ -48,85 +53,85 @@
     <!-- Security settings -->
     <security>
       <!-- Perform security check -->
-      <enabled value="false" />
+      <enabled value="true"/>
       <!-- Server password -->
-      <password value="Ib0S3Bg/dA7nbye3jrOcitlyp1c=" />
+      <password value="+uxnDOdf55yuH6iZYXgYAxsfIBw="/>
     </security>
   </websitepanel.server>
   <system.web>
     <!-- Disable any authentication -->
-    <authentication mode="None" />
+    <authentication mode="None"/>
     <!-- Correct HTTP runtime settings -->
-    <httpRuntime executionTimeout="3600" maxRequestLength="16384" />
+    <httpRuntime executionTimeout="3600" maxRequestLength="16384"/>
     <!-- Set globalization settings -->
-    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8" />
+    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8"/>
     <!-- Web Services settings -->
     <webServices>
       <protocols>
-        <remove name="HttpPost" />
-        <remove name="HttpPostLocalhost" />
-        <remove name="HttpGet" />
+        <remove name="HttpPost"/>
+        <remove name="HttpPostLocalhost"/>
+        <remove name="HttpGet"/>
       </protocols>
-      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3" />
+      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
     </webServices>
     <compilation debug="true">
       <assemblies>
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
       </assemblies>
     </compilation>
     <pages>
       <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </controls>
     </pages>
     <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <remove verb="*" path="*.asmx"/>
+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </httpHandlers>
     <httpModules>
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </httpModules>
   </system.web>
   <!-- WSE 3.0 settings -->
   <microsoft.web.services3>
     <diagnostics>
-      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo" />
+      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo"/>
     </diagnostics>
     <messaging>
-      <maxMessageLength value="-1" />
-      <mtom serverMode="optional" clientMode="On" />
+      <maxMessageLength value="-1"/>
+      <mtom serverMode="optional" clientMode="On"/>
     </messaging>
     <security>
       <securityTokenManager>
-        <add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken" />
+        <add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken"/>
       </securityTokenManager>
-      <timeToleranceInSeconds value="86400" />
+      <timeToleranceInSeconds value="86400"/>
     </security>
-    <policy fileName="WsePolicyCache.Config" />
+    <policy fileName="WsePolicyCache.Config"/>
   </microsoft.web.services3>
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
         <binding name="WSHttpBinding_IVirtualMachineManagementService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
         <binding name="WSHttpBinding_IMonitoringService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
       </wsHttpBinding>
@@ -135,40 +140,40 @@
   <system.codedom>
     <compilers>
       <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
+        <providerOption name="CompilerVersion" value="v3.5"/>
+        <providerOption name="WarnAsError" value="false"/>
       </compiler>
     </compilers>
   </system.codedom>
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
+    <validation validateIntegratedModeConfiguration="false"/>
     <modules>
-      <remove name="ScriptModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <remove name="ScriptModule"/>
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </modules>
     <handlers>
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <remove name="WebServiceHandlerFactory-Integrated"/>
+      <remove name="ScriptHandlerFactory"/>
+      <remove name="ScriptHandlerFactoryAppServices"/>
+      <remove name="ScriptResource"/>
+      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
     </handlers>
   </system.webServer>
   <runtime>
     <assemblyBinding appliesTo="v2.0.50727" xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
+        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0" />
+        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="bin/Crm2011;bin/Crm2013;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013;bin/Lync2013HP;bin/Dns2012" />
+      <probing privatePath="bin/Crm2011;bin/Crm2013;bin/Exchange2013;bin/Sharepoint2013;bin/Lync2013;bin/Lync2013HP;bin/Dns2012;bin/IceWarp;bin/IIs80"/>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -17,7 +17,7 @@
     <OldToolsVersion>4.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
@@ -80,7 +80,6 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config

@@ -141,4 +141,6 @@
   <Control key="rds_create_collection" general_key="rds_collections" />
   <Control key="rds_collection_edit_apps" general_key="rds_collections" />
   <Control key="rds_collection_edit_users" general_key="rds_collections" />
+  <Control key="rds_application_edit_users" general_key="rds_collections" />
+  <Control key="rds_edit_collection" general_key="rds_collections" />
 </Controls>

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config

@@ -574,6 +574,8 @@
       <Control key="rds_create_collection" src="WebsitePanel/RDS/RDSCreateCollection.ascx" title="RDSCreateCollection" type="View" />
       <Control key="rds_collection_edit_apps" src="WebsitePanel/RDS/RDSEditCollectionApps.ascx" title="RDSEditCollectionApps" type="View" />
       <Control key="rds_collection_edit_users" src="WebsitePanel/RDS/RDSEditCollectionUsers.ascx" title="RDSEditCollectionUsers" type="View" />
+      <Control key="rds_application_edit_users" src="WebsitePanel/RDS/RDSEditApplicationUsers.ascx" title="RDSEditApplicationUsers" type="View" />
+      <Control key="rds_edit_collection" src="WebsitePanel/RDS/RDSEditCollection.ascx" title="RDSEditCollection" type="View" />
     </Controls>
 	</ModuleDefinition>
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/Domains.ascx.resx

@@ -213,4 +213,7 @@
   <data name="DomainExpirationDate.NotExist" xml:space="preserve">
     <value>Non-Existent</value>
   </data>
+  <data name="DomainLookup.TooltipHeader" xml:space="preserve">
+    <value>Current Real DNS Values</value>
+  </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/DomainsAddDomain.ascx.resx

@@ -144,18 +144,6 @@
   <data name="DescribeEnableDns.Text" xml:space="preserve">
     <value>Tick this checkbox if DNS zone for this domain will be located on name servers of your hosting provider. Make sure you changed name servers in the domain registrar control panel.</value>
   </data>
-  <data name="DomainFormatValidator.ErrorMessage" xml:space="preserve">
-    <value>Please, enter correct domain name, for example "mydomain.com" or "sub.mydomain.com".</value>
-  </data>
-  <data name="DomainFormatValidator.Text" xml:space="preserve">
-    <value>*</value>
-  </data>
-  <data name="DomainRequiredValidator.ErrorMessage" xml:space="preserve">
-    <value>Please enter domain name</value>
-  </data>
-  <data name="DomainRequiredValidator.Text" xml:space="preserve">
-    <value>*</value>
-  </data>
   <data name="EnableDns.Text" xml:space="preserve">
     <value>Enable DNS</value>
   </data>
@@ -168,18 +156,6 @@
   <data name="PointWebSite.Text" xml:space="preserve">
     <value>Assign to existing Web Site</value>
   </data>
-  <data name="SubDomainFormatValidator.ErrorMessage" xml:space="preserve">
-    <value>Please, enter correct sub-domain name, for example "subdomain" or "sub.subdomain".</value>
-  </data>
-  <data name="SubDomainFormatValidator.Text" xml:space="preserve">
-    <value>*</value>
-  </data>
-  <data name="SubDomainRequiredValidator.ErrorMessage" xml:space="preserve">
-    <value>Please enter sub-domain name</value>
-  </data>
-  <data name="SubDomainRequiredValidator.Text" xml:space="preserve">
-    <value>*</value>
-  </data>
   <data name="lblHostName.Text" xml:space="preserve">
     <value>Hostname:</value>
   </data>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/Utils.cs

@@ -159,7 +159,7 @@ namespace WebsitePanel.Portal
             foreach (string part in parts)
                 if (part.Trim() != "" && !list.Contains(part.Trim()))
                     list.Add(part);
-            return (string[])list.ToArray(typeof(string));
+            return (string[]) list.ToArray(typeof (string));
         }
 
         public static string ReplaceStringVariable(string str, string variable, string value)
@@ -172,7 +172,7 @@ namespace WebsitePanel.Portal
         {
             long length = stream.Length;
             byte[] content = new byte[length];
-            stream.Read(content, 0, (int)length);
+            stream.Read(content, 0, (int) length);
             stream.Close();
             return content;
         }
@@ -231,7 +231,7 @@ namespace WebsitePanel.Portal
                     selValues.Add(item.Value);
             }
 
-            string cookieVal = String.Join(",", (string[])selValues.ToArray(typeof(string)));
+            string cookieVal = String.Join(",", (string[]) selValues.ToArray(typeof (string)));
 
             // create cookie
             HttpCookie cookie = new HttpCookie(ctrl.UniqueID, cookieVal);
@@ -251,7 +251,7 @@ namespace WebsitePanel.Portal
             foreach (ListItem item in ctrl.Items)
                 item.Selected = false;
 
-            string[] vals = cookie.Value.Split(new char[] { ',' });
+            string[] vals = cookie.Value.Split(new char[] {','});
             foreach (string val in vals)
             {
                 ListItem item = ctrl.Items.FindByValue(val);
@@ -278,9 +278,9 @@ namespace WebsitePanel.Portal
 
             // Convert 4 bytes into a 32-bit integer value.
             int seed = (randomBytes[0] & 0x7f) << 24 |
-                        randomBytes[1] << 16 |
-                        randomBytes[2] << 8 |
-                        randomBytes[3];
+                       randomBytes[1] << 16 |
+                       randomBytes[2] << 8 |
+                       randomBytes[3];
 
 
             Random rnd = new Random(seed);
@@ -294,17 +294,38 @@ namespace WebsitePanel.Portal
         public static bool CheckQouta(string key, PackageContext cntx)
         {
             return cntx.Quotas.ContainsKey(key) &&
-                ((cntx.Quotas[key].QuotaAllocatedValue == 1 && cntx.Quotas[key].QuotaTypeId == 1) ||
-                (cntx.Quotas[key].QuotaTypeId != 1 && (cntx.Quotas[key].QuotaAllocatedValue > 0 || cntx.Quotas[key].QuotaAllocatedValue == -1)));
+                   ((cntx.Quotas[key].QuotaAllocatedValue == 1 && cntx.Quotas[key].QuotaTypeId == 1) ||
+                    (cntx.Quotas[key].QuotaTypeId != 1 && (cntx.Quotas[key].QuotaAllocatedValue > 0 || cntx.Quotas[key].QuotaAllocatedValue == -1)));
         }
 
 
         public static bool CheckQouta(string key, HostingPlanContext cntx)
         {
             return cntx.Quotas.ContainsKey(key) &&
-                ((cntx.Quotas[key].QuotaAllocatedValue == 1 && cntx.Quotas[key].QuotaTypeId == 1) ||
-                (cntx.Quotas[key].QuotaTypeId != 1 && (cntx.Quotas[key].QuotaAllocatedValue > 0 || cntx.Quotas[key].QuotaAllocatedValue == -1)));
+                   ((cntx.Quotas[key].QuotaAllocatedValue == 1 && cntx.Quotas[key].QuotaTypeId == 1) ||
+                    (cntx.Quotas[key].QuotaTypeId != 1 && (cntx.Quotas[key].QuotaAllocatedValue > 0 || cntx.Quotas[key].QuotaAllocatedValue == -1)));
         }
 
+        public static bool IsIdnDomain(string domainName)
+        {
+            if (string.IsNullOrEmpty(domainName))
+            {
+                return false;
+            }
+
+            var idn = new IdnMapping();
+            return idn.GetAscii(domainName) != domainName;
+        }
+
+        public static string UnicodeToAscii(string domainName)
+        {
+            if (string.IsNullOrEmpty(domainName))
+            {
+                return string.Empty;
+            }
+
+            var idn = new IdnMapping();
+            return idn.GetAscii(domainName);
+        }
     }
 }

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

@@ -66,7 +66,7 @@ namespace WebsitePanel.Portal
 
         public RdsServer[] GetOrganizationRdsServersPaged(int itemId, int maximumRows, int startRowIndex, string sortColumn, string filterValue)
         {
-            rdsServers = ES.Services.RDS.GetOrganizationRdsServersPaged(itemId, "", filterValue, sortColumn, startRowIndex, maximumRows);
+            rdsServers = ES.Services.RDS.GetOrganizationRdsServersPaged(itemId, null, "", filterValue, sortColumn, startRowIndex, maximumRows);
 
             return rdsServers.Servers;
         }

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

@@ -30,6 +30,7 @@ using System;
 using System.Data;
 using System.Configuration;
 using System.Collections;
+using System.Globalization;
 using System.Web;
 using System.Web.Security;
 using System.Web.UI;
@@ -57,6 +58,10 @@ namespace WebsitePanel.Portal
                 // domain name
                 DomainInfo domain = ES.Services.Servers.GetDomain(PanelRequest.DomainID);
                 litDomainName.Text = domain.DomainName;
+                if (Utils.IsIdnDomain(domain.DomainName))
+                {
+                    litDomainName.Text = string.Format("{0} ({1})", Utils.UnicodeToAscii(domain.DomainName), domain.DomainName);
+                }
             }
         }
 

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

@@ -39,6 +39,7 @@ using System.Web.UI.HtmlControls;
 using System.Linq;
 
 using WebsitePanel.EnterpriseServer;
+using System.Collections.Generic;
 
 namespace WebsitePanel.Portal
 {
@@ -160,7 +161,15 @@ namespace WebsitePanel.Portal
                 return "No Dns Records";
             }
 
-            return string.Join("\r\n", records.Select(x=>string.Format("{0}: {1}", x.RecordType, x.Value)));
+            var header = GetLocalizedString("DomainLookup.TooltipHeader");
+
+            var tooltipLines = new List<string>();
+
+            tooltipLines.Add(header);
+            tooltipLines.Add(" ");
+            tooltipLines.AddRange( records.Select(x=>string.Format("{0}: {1}", x.RecordType, x.Value)));
+
+            return string.Join("\r\n", tooltipLines);
         }
 
         protected void odsDomainsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx

@@ -1,33 +1,21 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DomainsAddDomain.ascx.cs" Inherits="WebsitePanel.Portal.DomainsAddDomain" %>
 <%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
-<%@ Register Src="DomainsSelectDomainControl.ascx" TagName="DomainsSelectDomainControl" TagPrefix="uc1" %>
+<%@ Register Src="UserControls/DomainControl.ascx" TagName="DomainControl" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/CollapsiblePanel.ascx" TagPrefix="wsp" TagName="CollapsiblePanel" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
 
-<asp:ValidationSummary ID="summary" runat="server" ShowMessageBox="true" ShowSummary="false" ValidationGroup="Domain" />
+<asp:ValidationSummary ID="summary" runat="server" ShowMessageBox="true" ShowSummary="true" ValidationGroup="Domain" />
 
 <div class="FormBody">
-
-    <p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;" visible="false">
-        <asp:TextBox ID="DomainName" runat="server" Width="300" CssClass="HugeTextBox"></asp:TextBox>
-        <asp:RequiredFieldValidator id="DomainRequiredValidator" runat="server" meta:resourcekey="DomainRequiredValidator"
-            ControlToValidate="DomainName" Display="Dynamic" ValidationGroup="Domain" SetFocusOnError="true"></asp:RequiredFieldValidator>
-		<asp:RegularExpressionValidator id="DomainFormatValidator" runat="server" meta:resourcekey="DomainFormatValidator"
-		    ControlToValidate="DomainName" Display="Dynamic" ValidationGroup="Domain" SetFocusOnError="true"
-		    ValidationExpression="^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.){1,10}[a-zA-Z]{2,15}$"></asp:RegularExpressionValidator>
-    </p>
     
-    <p id="SubDomainPanel" runat="server" style="padding: 15px 0 15px 5px;" visible="false">
-        <asp:TextBox ID="SubDomainName" runat="server" Width="150" CssClass="TextBox100"></asp:TextBox>
-        .
-        <asp:DropDownList ID="DomainsList" Runat="server" CssClass="NormalTextBox" DataTextField="DomainName" DataValueField="DomainName"></asp:DropDownList>
-        <asp:RequiredFieldValidator id="SubDomainRequiredValidator" runat="server" meta:resourcekey="SubDomainRequiredValidator"
-            ControlToValidate="SubDomainName" Display="Dynamic" ValidationGroup="Domain" SetFocusOnError="true"></asp:RequiredFieldValidator>
-		<asp:RegularExpressionValidator id="SubDomainFormatValidator" runat="server" meta:resourcekey="SubDomainFormatValidator"
-		    ControlToValidate="SubDomainName" Display="Dynamic" ValidationGroup="Domain" SetFocusOnError="true"
-		    ValidationExpression="^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?){0,9}$"></asp:RegularExpressionValidator>
+    <p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;">
+        <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain" AutoPostBack="True" OnTextChanged="DomainName_TextChanged"></wsp:DomainControl>
     </p>
+<%--    
+    <p id="SubDomainPanel" runat="server" style="padding: 15px 0 15px 5px;" visible="false">
+        <wsp:DomainControl ID="SubDomainName" runat="server" RequiredEnabled="True" IsSubDomain="True" ValidationGroup="Domain"></wsp:DomainControl>
+    </p>--%>
     
     <wsp:CollapsiblePanel id="OptionsPanelHeader" runat="server"
         TargetControlID="OptionsPanel" resourcekey="OptionsPanelHeader" Text="Provisioning options">

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

@@ -30,6 +30,7 @@ using System;
 using System.Web;
 using WebsitePanel.EnterpriseServer;
 using System.Collections.Generic;
+using WebsitePanel.Portal.UserControls;
 
 namespace WebsitePanel.Portal
 {
@@ -82,12 +83,12 @@ namespace WebsitePanel.Portal
 			if (type == DomainType.Domain || type == DomainType.DomainPointer)
 			{
 				// domains
-				DomainPanel.Visible = true;
+			    DomainName.IsSubDomain = false;
 			}
 			else
 			{
 				// sub-domains
-				SubDomainPanel.Visible = true;
+                DomainName.IsSubDomain = true;
 
 				// fill sub-domains
 				if (!IsPostBack)
@@ -178,14 +179,14 @@ namespace WebsitePanel.Portal
 				if (!domain.IsDomainPointer && !domain.IsSubDomain && !domain.IsInstantAlias)
 					domains.Add(domain);
 
-			DomainsList.DataSource = domains;
-			DomainsList.DataBind();
+            DomainName.DataSource = domains;
+			DomainName.DataBind();
 		}
 
 		private void BindResellerDomains()
 		{
-			DomainsList.DataSource = ES.Services.Servers.GetResellerDomains(PanelSecurity.PackageId);
-			DomainsList.DataBind();
+			DomainName.DataSource = ES.Services.Servers.GetResellerDomains(PanelSecurity.PackageId);
+			DomainName.DataBind();
 		}
 
 		private void AddDomain()
@@ -197,9 +198,7 @@ namespace WebsitePanel.Portal
 			DomainType type = GetDomainType(Request["DomainType"]);
 
 			// get domain name
-			string domainName = DomainName.Text.Trim();
-			if (type == DomainType.SubDomain || type == DomainType.ProviderSubDomain)
-				domainName = SubDomainName.Text.Trim() + "." + DomainsList.SelectedValue;
+		    var domainName = DomainName.Text;
 
 			int pointWebSiteId = 0;
 			int pointMailDomainId = 0;
@@ -263,5 +262,13 @@ namespace WebsitePanel.Portal
 		{
 			AddDomain();
 		}
+
+	    protected void DomainName_TextChanged(object sender, DomainControl.DomainNameEventArgs e)
+	    {
+	        // If the choosen domain is a idn domain, don't allow to create mail
+	        var isIdn = Utils.IsIdnDomain(e.DomainName);
+	        PointMailDomainPanel.Enabled = !isIdn;
+	        PointMailDomain.Checked = !isIdn;
+	    }
 	}
 }

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

@@ -1,31 +1,3 @@
-// Copyright (c) 2014, 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.
@@ -74,70 +46,7 @@ namespace WebsitePanel.Portal {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox DomainName;
-        
-        /// <summary>
-        /// DomainRequiredValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainRequiredValidator;
-        
-        /// <summary>
-        /// DomainFormatValidator 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.RegularExpressionValidator DomainFormatValidator;
-        
-        /// <summary>
-        /// SubDomainPanel control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl SubDomainPanel;
-        
-        /// <summary>
-        /// SubDomainName control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox SubDomainName;
-        
-        /// <summary>
-        /// DomainsList 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 DomainsList;
-        
-        /// <summary>
-        /// SubDomainRequiredValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator SubDomainRequiredValidator;
-        
-        /// <summary>
-        /// SubDomainFormatValidator 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.RegularExpressionValidator SubDomainFormatValidator;
+        protected global::WebsitePanel.Portal.UserControls.DomainControl DomainName;
         
         /// <summary>
         /// OptionsPanelHeader control.

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

@@ -30,6 +30,7 @@ using System;
 using System.Data;
 using System.Configuration;
 using System.Collections;
+using System.Linq;
 using System.Web;
 using System.Web.Security;
 using System.Web.UI;
@@ -44,6 +45,12 @@ namespace WebsitePanel.Portal
 {
     public partial class DomainsSelectDomainControl : WebsitePanelControlBase
     {
+        public bool HideIdnDomains
+        {
+            get { return (ViewState["HideIdnDomains"] != null) && (bool)ViewState["HideIdnDomains"]; }
+            set { ViewState["HideIdnDomains"] = value; }
+        }
+
         public bool HideWebSites
         {
             get { return (ViewState["HideWebSites"] != null) ? (bool)ViewState["HideWebSites"] : false; }
@@ -116,6 +123,11 @@ namespace WebsitePanel.Portal
         {
             DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PackageId);
 
+            if (HideIdnDomains)
+            {
+                domains = domains.Where(d => !Utils.IsIdnDomain(d.DomainName)).ToArray();
+            }
+
             WebSite[] sites = null;
             Hashtable htSites = new Hashtable();
             Hashtable htMailDomainPointers = new Hashtable();

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

@@ -28,6 +28,7 @@
 
 using System;
 using System.Data;
+using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 
@@ -40,7 +41,7 @@ namespace WebsitePanel.Portal.ExchangeServer
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
+            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId).Where(d => !Utils.IsIdnDomain(d.DomainName)).ToArray();
 
             Organization[] orgs = ES.Services.Organizations.GetOrganizations(PanelSecurity.PackageId, false);
 

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

@@ -28,6 +28,7 @@
 
 using System;
 using System.Data;
+using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 
@@ -40,7 +41,7 @@ namespace WebsitePanel.Portal.ExchangeServer
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
+            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId).Where(d => !Utils.IsIdnDomain(d.DomainName)).ToArray();
 
             Organization[] orgs = ES.Services.Organizations.GetOrganizations(PanelSecurity.PackageId, false);
 

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

@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.HostedSolution;
 
@@ -37,7 +38,7 @@ namespace WebsitePanel.Portal.ExchangeServer
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
+            DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId).Where(d => !Utils.IsIdnDomain(d.DomainName)).ToArray();
             Organization[] orgs = ES.Services.Organizations.GetOrganizations(PanelSecurity.PackageId, false);
             var list = new List<OrganizationDomainName>();
             SetPolicy(PanelSecurity.PackageId, UserSettings.EXCHANGE_POLICY, "OrgIdPolicy");

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailDomainsAddPointer.ascx

@@ -6,7 +6,7 @@
 		    <td class="SubHead" width="200" nowrap><asp:Label ID="lblDomainName" runat="server" meta:resourcekey="lblDomainName" Text="Domain name:"></asp:Label></td>
 		    <td width="100%">
                 <uc1:DomainsSelectDomainControl ID="domainsSelectDomainControl" runat="server"
-                    HideMailDomains="true" HideDomainsSubDomains="false" HideInstantAlias="false" HideDomainPointers="true"/>
+                    HideMailDomains="true" HideDomainsSubDomains="false" HideInstantAlias="false" HideDomainPointers="true" HideIdnDomains="True"/>
 		    </td>
 	    </tr>
     </table>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailEditAddress.ascx

@@ -9,7 +9,7 @@
 		<td id="EditEmailPanel" runat="server">
 		    <uc2:UsernameControl ID="txtName" runat="server" width="120px" />
 		    &nbsp;@&nbsp;
-		    <dnc:SelectDomain id="domainsSelectDomainControl" runat="server" HideDomainPointers="true" HideInstantAlias="false" HideMailDomainPointers="true"></dnc:SelectDomain>
+		    <dnc:SelectDomain id="domainsSelectDomainControl" runat="server" HideDomainPointers="true" HideInstantAlias="false" HideMailDomainPointers="true" HideIdnDomains="True"></dnc:SelectDomain>
 		</td>
 		<td id="DisplayEmailPanel" runat="server">
 		    <asp:Label ID="litName" Runat="server" Visible="False" CssClass="Huge"></asp:Label>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/Windows2012_Settings.ascx.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="chkEnableHardQuota.Text" xml:space="preserve">
+    <value>Enable Hard Quota:</value>
+  </data>
+  <data name="lblSpacesFolder.Text" xml:space="preserve">
+    <value>Hosting Spaces Folder:</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Windows2012_Settings.ascx

@@ -0,0 +1,25 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Windows2012_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.Windows2012_Settings" %>
+<table cellpadding="1" cellspacing="0" width="100%">
+    <tr>
+        <td class="SubHead" width="200" nowrap>
+            <asp:Label ID="lblSpacesFolder" runat="server" meta:resourcekey="lblSpacesFolder" Text="Hosting Spaces Folder:"></asp:Label>
+        </td>
+        <td width="100%">
+            <asp:TextBox runat="server" ID="txtFolder" Width="300px" CssClass="NormalTextBox"></asp:TextBox></td>
+    </tr>
+    <tr>
+        <td class="SubHead" width="200" nowrap></td>
+        <td width="100%">
+            <table>
+                <tr>
+                    <td>
+                        <asp:CheckBox runat="server" AutoPostBack="false" ID="chkEnableHardQuota" meta:resourcekey="chkEnableHardQuota" Text="Enable Hard Quota:" /></td>
+                </tr>
+                <tr>
+                    <td>
+                        <asp:Label runat="server" ID="lblFileServiceInfo" meta:resourcekey="lblFileServiceInfo" Text="Install File Services role on the file server to enable the check box" Font-Italic="true" Visible="false"></asp:Label></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Windows2012_Settings.ascx.cs

@@ -0,0 +1,79 @@
+// Copyright (c) 2014, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+namespace WebsitePanel.Portal.ProviderControls
+{
+    public partial class Windows2012_Settings : WebsitePanelControlBase, IHostingServiceProviderSettings
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //CO Changes
+            if (!IsPostBack)
+            {
+                try
+                {
+                    chkEnableHardQuota.Enabled = ES.Services.OperatingSystems.CheckFileServicesInstallation(PanelRequest.ServiceId);
+                    if (!chkEnableHardQuota.Enabled)
+                        lblFileServiceInfo.Visible = true;
+                }
+                catch
+                {
+                }
+            }
+            //END
+        }
+
+        public void BindSettings(StringDictionary settings)
+        {
+            txtFolder.Text = settings["UsersHome"];
+            //CO Changes
+            chkEnableHardQuota.Checked = settings["EnableHardQuota"] == "true" ? true : false;
+            //END 
+        }
+
+        public void SaveSettings(StringDictionary settings)
+        {
+            settings["UsersHome"] = txtFolder.Text;
+            //CO Changes
+            settings["EnableHardQuota"] = chkEnableHardQuota.Checked.ToString().ToLower();
+            //END 
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Windows2012_Settings.ascx.designer.cs

@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ProviderControls {
+    
+    
+    public partial class Windows2012_Settings {
+        
+        /// <summary>
+        /// lblSpacesFolder 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.Label lblSpacesFolder;
+        
+        /// <summary>
+        /// txtFolder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtFolder;
+        
+        /// <summary>
+        /// chkEnableHardQuota 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 chkEnableHardQuota;
+        
+        /// <summary>
+        /// lblFileServiceInfo 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.Label lblFileServiceInfo;
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditApplicationUsers.ascx.resx

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCreate.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Adding RDS Server ...');</value>
+  </data>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save Changes</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Edit RDS Application</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit RDS Application</value>
+  </data>
+  <data name="locCollectionName.Text" xml:space="preserve">
+    <value>Application Name:</value>
+  </data>
+  <data name="gvRDSServerName.Header" xml:space="preserve">
+    <value>Server Name</value>
+  </data>
+  <data name="gvRDSServers.Empty" xml:space="preserve">
+    <value>No RDS Servers have been added yet. To add a new RDS Servers click "Add RDS Server" button.</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollection.ascx.resx

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCreate.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Adding RDS Server ...');</value>
+  </data>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Edit RDS  Collection</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit RDS  Collection</value>
+  </data>
+  <data name="locCollectionName.Text" xml:space="preserve">
+    <value>Collection Name</value>
+  </data>
+  <data name="gvRDSServerName.Header" xml:space="preserve">
+    <value>Server Name</value>
+  </data>
+  <data name="gvRDSServers.Empty" xml:space="preserve">
+    <value>No RDS Servers have been added yet. To add a new RDS Servers click "Add RDS Server" button.</value>
+  </data>
+</root>

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

@@ -47,8 +47,8 @@
                         <Columns>
                             <asp:TemplateField HeaderText="gvCollectionName" SortExpression="Name">
 							    <ItemStyle Width="40%"></ItemStyle>
-							    <ItemTemplate>
-                                    <asp:Literal id="litCollectionName" runat="server" Text='<%# Eval("Name").ToString() %>'></asp:Literal>
+							    <ItemTemplate>                                    
+                                    <asp:hyperlink id="lnkCollectionName" meta:resourcekey="lnkApps" runat="server" NavigateUrl='<%# GetCollectionEditUrl(Eval("Id").ToString()) %>'><%# Eval("Name").ToString() %></asp:hyperlink>
 							    </ItemTemplate>
 						    </asp:TemplateField>
                             <asp:TemplateField HeaderText="gvServer">

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

@@ -111,5 +111,10 @@ namespace WebsitePanel.Portal.RDS
                     "CollectionId=" + collectionId,
                     "ItemID=" + PanelRequest.ItemID);
         }
+
+        public string GetCollectionEditUrl(string collectionId)
+        {
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_edit_collection", "CollectionId=" + collectionId, "ItemID=" + PanelRequest.ItemID);
+        }
     }
 }

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

@@ -0,0 +1,46 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDSEditApplicationUsers.ascx.cs" Inherits="WebsitePanel.Portal.RDS.RDSEditApplicationUsers" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/RDSCollectionUsers.ascx" TagName="CollectionUsers" TagPrefix="wsp"%>
+<script type="text/javascript" src="/JavaScript/jquery.min.js?v=1.4.4"></script>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="imgEditRDSCollection" SkinID="EnterpriseStorageSpace48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit RDS Application"></asp:Localize>
+				</div>
+				<div class="FormContentRDS">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+
+					<table>
+					        <tr>
+						        <td class="FormLabel150" style="width: 100px;"><asp:Localize ID="locApplicationName" runat="server" meta:resourcekey="locApplicationName" Text="Collection Name:"></asp:Localize></td>
+						        <td class="FormLabel150">
+                                    <asp:Localize ID="locCName" runat="server" Text="" />
+						        </td>
+					        </tr>
+					    </table> 
+
+                    <fieldset id="UsersPanel" runat="server">
+                        <legend><asp:Localize ID="locUsersSection" runat="server" meta:resourcekey="locUsersSection" Text="Users"></asp:Localize></legend>
+                        <div style="padding: 10px;">
+                            <wsp:CollectionUsers id="users" runat="server" />
+                        </div>
+                    </fieldset>
+                      
+				    <div class="FormFooter">
+					    <asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" ValidationGroup="SaveRDSCollectoin" OnClick="btnSave_Click"></asp:Button>
+					    <asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="SaveRDSCollectoin" />
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.RemoteDesktopServices;
+
+namespace WebsitePanel.Portal.RDS
+{
+    public partial class RDSEditApplicationUsers : WebsitePanelModuleBase
+    {        
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
+                var applications = ES.Services.RDS.GetCollectionRemoteApplications(PanelRequest.ItemID, collection.Name);
+                var remoteApp = applications.Where(x => x.DisplayName.Equals(PanelRequest.ApplicationID, StringComparison.CurrentCultureIgnoreCase)).FirstOrDefault();
+                var collectionUsers = ES.Services.RDS.GetRdsCollectionUsers(PanelRequest.CollectionID);
+                var applicationUsers = ES.Services.RDS.GetApplicationUsers(PanelRequest.ItemID, PanelRequest.CollectionID, remoteApp);
+
+                locCName.Text = collection.Name;
+
+                users.SetUsers(collectionUsers.Where(x => applicationUsers.Contains(x.SamAccountName)).ToArray());
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+            {
+                return;
+            }
+
+            try
+            {
+                var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
+                var applications = ES.Services.RDS.GetCollectionRemoteApplications(PanelRequest.ItemID, collection.Name);
+                var remoteApp = applications.Where(x => x.DisplayName.Equals(PanelRequest.ApplicationID, StringComparison.CurrentCultureIgnoreCase)).FirstOrDefault();
+                ES.Services.RDS.SetApplicationUsers(PanelRequest.ItemID, PanelRequest.CollectionID, remoteApp, users.GetUsers().Select(x => x.AccountName).ToArray());
+
+                Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_collection_edit_apps", "CollectionId=" + PanelRequest.CollectionID, "ItemID=" + PanelRequest.ItemID));
+            }
+            catch (Exception)
+            {
+            }
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.designer.cs

@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.RDS {
+    
+    
+    public partial class RDSEditApplicationUsers {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// imgEditRDSCollection control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image imgEditRDSCollection;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locApplicationName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locApplicationName;
+        
+        /// <summary>
+        /// locCName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locCName;
+        
+        /// <summary>
+        /// UsersPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl UsersPanel;
+        
+        /// <summary>
+        /// locUsersSection control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locUsersSection;
+        
+        /// <summary>
+        /// users control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.RDS.UserControls.RDSCollectionUsers users;
+        
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSave;
+        
+        /// <summary>
+        /// valSummary control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary valSummary;
+    }
+}

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

@@ -0,0 +1,36 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDSEditCollection.ascx.cs" Inherits="WebsitePanel.Portal.RDS.RDSEditCollection" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/RDSCollectionServers.ascx" TagName="CollectionServers" TagPrefix="wsp"%>
+<script type="text/javascript" src="/JavaScript/jquery.min.js?v=1.4.4"></script>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="imgAddRDSServer" SkinID="AddRDSServer48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Add Server To Organization"></asp:Localize>
+				</div>
+				<div class="FormContentRDS">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />					
+
+                    <fieldset id="RDSServersPanel" runat="server">
+                        <legend><asp:Localize ID="locRDSServersSection" runat="server" meta:resourcekey="locRDSServersSection" Text="RDS Servers"></asp:Localize></legend>
+                        <div style="padding: 10px;">
+                            <wsp:CollectionServers id="servers" runat="server" />
+                        </div>  
+                    </fieldset>
+                      
+				    <div class="FormFooter">
+					    <asp:Button id="btnSave" runat="server" Text="Save" CssClass="Button1" meta:resourcekey="btnSave" OnClick="btnSave_Click" ValidationGroup="SaveRDSCollection"></asp:Button>
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.RemoteDesktopServices;
+
+namespace WebsitePanel.Portal.RDS
+{
+    public partial class RDSEditCollection : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                if (servers.GetServers().Count < 1)
+                {
+                    messageBox.ShowErrorMessage("RDS_CREATE_COLLECTION_RDSSERVER_REQUAIRED");
+                    return;
+                }
+                
+                RdsCollection collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
+                collection.Servers = servers.GetServers();
+
+                ES.Services.RDS.EditRdsCollection(PanelRequest.ItemID, collection);
+
+                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_collections",
+                    "SpaceID=" + PanelSecurity.PackageId));
+            }
+            catch { }
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollection.ascx.designer.cs

@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.RDS {
+    
+    
+    public partial class RDSEditCollection {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// imgAddRDSServer control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image imgAddRDSServer;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// RDSServersPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl RDSServersPanel;
+        
+        /// <summary>
+        /// locRDSServersSection control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locRDSServersSection;
+        
+        /// <summary>
+        /// servers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.RDS.UserControls.RDSCollectionServers servers;
+        
+        /// <summary>
+        /// btnSave control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSave;
+    }
+}

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

@@ -48,7 +48,7 @@ namespace WebsitePanel.Portal.RDS
 
                 locCName.Text = collection.Name;
 
-                remoreApps.SetApps(collectionApps);
+                remoreApps.SetApps(collectionApps, Module);
             }
         }
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx

@@ -21,13 +21,18 @@
 				<ItemStyle Width="10px" />
 			</asp:TemplateField>
 			<asp:TemplateField meta:resourcekey="gvAppName" HeaderText="gvAppName">
-				<ItemStyle Width="60%" Wrap="false">
+				<ItemStyle Width="90%" Wrap="false">
 				</ItemStyle>
 				<ItemTemplate>
                     <asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
                     <asp:HiddenField ID="hfFilePath" runat="server"  Value='<%# Eval("FilePath") %>'/>
 				</ItemTemplate>
 			</asp:TemplateField>
+            <asp:TemplateField>
+                <ItemTemplate>
+                    <asp:hyperlink id="lnkUsers" meta:resourcekey="lnkUsers" runat="server" NavigateUrl='<%# GetCollectionUsersEditUrl(Eval("DisplayName").ToString()) %>'>Users</asp:hyperlink>
+                </ItemTemplate>
+            </asp:TemplateField>
 		</Columns>
 	</asp:GridView>
     <br />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs

@@ -54,6 +54,12 @@ namespace WebsitePanel.Portal.RDS.UserControls
             BindApps(apps, false);
 		}
 
+        public void SetApps(RemoteApplication[] apps, WebPortal.PageModule module)
+        {
+            Module = module;
+            BindApps(apps, false);            
+        }
+
         public RemoteApplication[] GetApps()
         {
             return GetGridViewApps(SelectedState.All).ToArray();
@@ -218,5 +224,11 @@ namespace WebsitePanel.Portal.RDS.UserControls
         {
             return string.Compare(app1.DisplayName, app2.DisplayName);
         }
+
+        public string GetCollectionUsersEditUrl(string appId)
+        {
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_application_edit_users",
+                    "CollectionId=" + PanelRequest.CollectionID, "ItemID=" + PanelRequest.ItemID, "ApplicationID=" + appId);
+        }
 	}
 }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionServers.ascx.cs

@@ -53,19 +53,14 @@ namespace WebsitePanel.Portal.RDS.UserControls
 		{
             BindServers(servers, false);
 		}
-
-        //public RdsServer[] GetServers()
-        //{
-        //    return GetGridViewServers(SelectedState.All).ToArray();
-        //}
-
+        
         public List<RdsServer> GetServers()
         {
             return GetGridViewServers(SelectedState.All);
         }
 
 		protected void Page_Load(object sender, EventArgs e)
-		{
+		{            
 			// register javascript
 			if (!Page.ClientScript.IsClientScriptBlockRegistered("SelectAllCheckboxes"))
 			{
@@ -80,8 +75,14 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 Page.ClientScript.RegisterClientScriptBlock(typeof(RDSCollectionUsers), "SelectAllCheckboxes",
 					script, true);
 			}
+
+            if (!IsPostBack && PanelRequest.CollectionID > 0)
+            {
+                BindOrganizationServers();
+            }
 		}
 
+        
 		protected void btnAdd_Click(object sender, EventArgs e)
 		{
 			// bind all servers
@@ -205,6 +206,25 @@ namespace WebsitePanel.Portal.RDS.UserControls
 
         }
 
+        protected void BindOrganizationServers()
+        {
+            RdsServer[] servers = ES.Services.RDS.GetOrganizationRdsServersPaged(PanelRequest.ItemID, PanelRequest.CollectionID, "FqdName", txtSearchValue.Text, null, 0, 1000).Servers;
+            Array.Sort(servers, CompareAccount);
+
+            if (Direction == SortDirection.Ascending)
+            {
+                Array.Reverse(servers);
+                Direction = SortDirection.Descending;
+            }
+            else
+            {
+                Direction = SortDirection.Ascending;
+            }
+
+            gvServers.DataSource = servers;
+            gvServers.DataBind();
+        }
+
 		protected void cmdSearch_Click(object sender, ImageClickEventArgs e)
 		{
 			BindPopupServers();

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx

@@ -6,7 +6,8 @@
 			<asp:Label ID="lblServerName" runat="server" meta:resourcekey="lblServerName">Server Name: </asp:Label>
 		</td>
         <td class="Normal" width="100%">
-   			<asp:TextBox ID="txtServerName" runat="server" Width="95%" CssClass="NormalTextBox" MaxLength="1000"></asp:TextBox>
+            <asp:DropDownList ID="ddlServers" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" />
+        </td>
     </tr>
     <tr>
         <td class="SubHead" nowrap>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.cs

@@ -30,7 +30,33 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
 
             this.SetParameter(this.txtDnsServers, DnsServersParameter);
             this.SetParameter(this.txtMailTo, MailToParameter);
-            this.SetParameter(this.txtServerName, ServerNameParameter);
+            this.SetParameter(this.ddlServers, ServerNameParameter);
+
+            var servers = ES.Services.Servers.GetAllServers();
+
+            var osGroup = ES.Services.Servers.GetResourceGroups().First(x => x.GroupName == ResourceGroups.Os);
+            var osProviders = ES.Services.Servers.GetProvidersByGroupId(osGroup.GroupId);
+
+            var osServers = new List<ServerInfo>();
+
+            foreach (var server in servers)
+            {
+                var services = ES.Services.Servers.GetServicesByServerId(server.ServerId);
+
+                if (services.Any(x => osProviders.Any(p=>p.ProviderId  == x.ProviderId)))
+                {
+                    osServers.Add(server);
+                }
+            }
+
+            ddlServers.DataSource = osServers.Select(x => new { Id = x.ServerName, Name = x.ServerName });
+            ddlServers.DataTextField = "Name";
+            ddlServers.DataValueField = "Id";
+            ddlServers.DataBind();
+
+            ScheduleTaskParameterInfo parameter = this.FindParameterById(ServerNameParameter);
+
+            ddlServers.SelectedValue = parameter.ParameterValue;
         }
 
         /// <summary>
@@ -41,7 +67,7 @@ namespace WebsitePanel.Portal.ScheduleTaskControls
         {
             ScheduleTaskParameterInfo dnsServers = this.GetParameter(this.txtDnsServers, DnsServersParameter);
             ScheduleTaskParameterInfo mailTo = this.GetParameter(this.txtMailTo, MailToParameter);
-            ScheduleTaskParameterInfo serverName = this.GetParameter(this.txtServerName, ServerNameParameter);
+            ScheduleTaskParameterInfo serverName = this.GetParameter(this.ddlServers, ServerNameParameter);
 
             return new ScheduleTaskParameterInfo[3] { dnsServers, mailTo, serverName };
         }

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ScheduleTaskControls/DomainLookupView.ascx.designer.cs

@@ -22,13 +22,13 @@ namespace WebsitePanel.Portal.ScheduleTaskControls {
         protected global::System.Web.UI.WebControls.Label lblServerName;
         
         /// <summary>
-        /// txtServerName control.
+        /// ddlServers control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtServerName;
+        protected global::System.Web.UI.WebControls.DropDownList ddlServers;
         
         /// <summary>
         /// lblDnsServers control.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/DomainControl.ascx.resx

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="DomainFormatValidator.ErrorMessage" xml:space="preserve">
+    <value>Please, enter correct domain name, for example "mydomain.com" or "sub.mydomain.com".</value>
+  </data>
+  <data name="DomainFormatValidator.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="DomainRequiredValidator.ErrorMessage" xml:space="preserve">
+    <value>Please enter domain name</value>
+  </data>
+  <data name="DomainRequiredValidator.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="SubDomainRequiredValidator.ErrorMessage" xml:space="preserve">
+    <value>Please enter sub-domain name</value>
+  </data>
+  <data name="SubDomainRequiredValidator.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+</root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx

@@ -0,0 +1,10 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DomainControl.ascx.cs" Inherits="WebsitePanel.Portal.UserControls.DomainControl" %>
+
+<asp:TextBox ID="txtDomainName" runat="server" Width="300" CssClass="HugeTextBox" OnTextChanged="txtDomainName_TextChanged"></asp:TextBox>
+<asp:Literal runat="server" ID="SubDomainSeparator" Visible="False">.</asp:Literal>
+<asp:DropDownList ID="DomainsList" Runat="server" CssClass="NormalTextBox" DataTextField="DomainName" DataValueField="DomainName" Visible="False"></asp:DropDownList>
+<asp:RequiredFieldValidator id="DomainRequiredValidator" runat="server" meta:resourcekey="DomainRequiredValidator"
+    ControlToValidate="txtDomainName" Display="Dynamic" SetFocusOnError="true"></asp:RequiredFieldValidator>
+<asp:CustomValidator id="DomainFormatValidator" runat="server" meta:resourcekey="DomainFormatValidator" EnableClientScript="False" ValidateEmptyText="False"
+	ControlToValidate="txtDomainName" Display="Dynamic" SetFocusOnError="true" OnServerValidate="DomainFormatValidator_ServerValidate"></asp:CustomValidator>
+

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs

@@ -0,0 +1,134 @@
+// Copyright (c) 2014, Outercurve Foundation.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// - Redistributions of source code must  retain  the  above copyright notice, this
+//   list of conditions and the following disclaimer.
+//
+// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
+//   this list of conditions  and  the  following  disclaimer in  the documentation
+//   and/or other materials provided with the distribution.
+//
+// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
+//   contributors may be used to endorse or  promote  products  derived  from  this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
+// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
+// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using System;
+using System.Text.RegularExpressions;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Globalization;
+
+namespace WebsitePanel.Portal.UserControls
+{
+    public partial class DomainControl : WebsitePanelControlBase
+    {
+        public class DomainNameEventArgs : EventArgs
+        {
+            public string DomainName { get; set; }
+        }
+
+        public event EventHandler<DomainNameEventArgs> TextChanged;
+
+        public virtual void OnTextChanged()
+        {
+            var handler = TextChanged;
+            if (handler != null) handler(this, new DomainNameEventArgs {DomainName = Text});
+        }
+
+        public object DataSource
+        {
+            set { DomainsList.DataSource = value; }
+        }
+
+        public bool AutoPostBack
+        {
+            get { return txtDomainName.AutoPostBack; }
+            set { txtDomainName.AutoPostBack = value; }
+        }
+
+        public Unit Width
+        {
+            get { return txtDomainName.Width; }
+            set { txtDomainName.Width = value; }
+        }
+
+        public bool RequiredEnabled
+        {
+            get { return DomainRequiredValidator.Enabled; }
+            set { DomainRequiredValidator.Enabled = value; }
+        }
+
+        public string Text
+        {
+            get
+            {
+                var domainName = txtDomainName.Text.Trim();
+                if (IsSubDomain)
+                {
+                    domainName += "." + DomainsList.SelectedValue;
+                }
+                return domainName;
+            }
+            set { txtDomainName.Text = value; }
+        }
+
+        public string ValidationGroup
+        {
+            get { return DomainRequiredValidator.ValidationGroup; }
+            set { DomainRequiredValidator.ValidationGroup = value; DomainFormatValidator.ValidationGroup = value; }
+        }
+
+        public bool IsSubDomain {
+            get { return SubDomainSeparator.Visible; }
+            set
+            {
+                SubDomainSeparator.Visible = value;
+                DomainsList.Visible = value;
+                DomainRequiredValidator.Enabled = !value;
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        protected new void DataBind()
+        {
+            DomainsList.DataBind();
+        }
+
+        protected void DomainFormatValidator_ServerValidate(object source, ServerValidateEventArgs args)
+        {
+            var idn = new IdnMapping();
+            try
+            {
+                var ascii = idn.GetAscii(Text);
+                var regex = new Regex(@"^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.){1,10}[a-zA-Z]{2,15}$");
+                args.IsValid = regex.IsMatch(ascii);
+            }
+            catch (Exception)
+            {
+                args.IsValid = false;
+            }
+        }
+
+        protected void txtDomainName_TextChanged(object sender, EventArgs e)
+        {
+            OnTextChanged();
+        }
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.designer.cs

@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.UserControls {
+    
+    
+    public partial class DomainControl {
+        
+        /// <summary>
+        /// txtDomainName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtDomainName;
+        
+        /// <summary>
+        /// SubDomainSeparator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal SubDomainSeparator;
+        
+        /// <summary>
+        /// DomainsList 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 DomainsList;
+        
+        /// <summary>
+        /// DomainRequiredValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainRequiredValidator;
+        
+        /// <summary>
+        /// DomainFormatValidator 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.CustomValidator DomainFormatValidator;
+    }
+}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx

@@ -1,12 +1,11 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserCreateSpace.ascx.cs" Inherits="WebsitePanel.Portal.UserCreateSpace" %>
-<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="UserControls/CollapsiblePanel.ascx" %>
 <%@ Register Src="UserControls/UsernameControl.ascx" TagName="UsernameControl" TagPrefix="uc4" %>
-<%@ Register Src="DomainsSelectDomainControl.ascx" TagName="DomainsSelectDomainControl" TagPrefix="uc1" %>
+<%@ Register Src="UserControls/DomainControl.ascx" TagName="DomainControl" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
-<asp:ValidationSummary ID="summary" runat="server" ShowMessageBox="true" ShowSummary="false" ValidationGroup="CreateSpace" />
+<asp:ValidationSummary ID="summary" runat="server" ShowMessageBox="true" ShowSummary="true" ValidationGroup="CreateSpace" />
 
 <asp:UpdatePanel runat="server" ID="updatePanelSpace" UpdateMode="Conditional" ChildrenAsTriggers="true">
     <ContentTemplate>
@@ -74,12 +73,7 @@
                     <asp:Localize ID="locDomainName" runat="server" meta:resourcekey="locDomainName" Text="Domain name:"></asp:Localize>
                 </td>
                 <td class="Normal" width="100%">
-                    <asp:TextBox ID="txtDomainName" runat="server" CssClass="NormalTextBox" Width="250px"></asp:TextBox>
-                    <asp:RequiredFieldValidator id="DomainRequiredValidator" runat="server" meta:resourcekey="DomainRequiredValidator"
-                        ControlToValidate="txtDomainName" Display="Dynamic" ValidationGroup="CreateSpace" SetFocusOnError="true"></asp:RequiredFieldValidator>
-                    <asp:RegularExpressionValidator id="DomainFormatValidator" runat="server" meta:resourcekey="DomainFormatValidator"
-                        ControlToValidate="txtDomainName" Display="Dynamic" ValidationGroup="CreateSpace" SetFocusOnError="true"
-                        ValidationExpression="^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.){1,10}[a-zA-Z]{2,15}$"></asp:RegularExpressionValidator>
+                    <wsp:DomainControl ID="txtDomainName" runat="server" RequiredEnabled="True" ValidationGroup="CreateSpace"></wsp:DomainControl>
                 </td>
             </tr>
         </table>

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

@@ -163,25 +163,7 @@ namespace WebsitePanel.Portal {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtDomainName;
-        
-        /// <summary>
-        /// DomainRequiredValidator control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator DomainRequiredValidator;
-        
-        /// <summary>
-        /// DomainFormatValidator 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.RegularExpressionValidator DomainFormatValidator;
+        protected global::WebsitePanel.Portal.UserControls.DomainControl txtDomainName;
         
         /// <summary>
         /// fsWeb control.

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

@@ -185,104 +185,111 @@ namespace WebsitePanel.Portal
 
         private void BindControls()
         {
-            // hide database server parameters
-            DeploymentParameterWellKnownTag hiddenTags =
-                DeploymentParameterWellKnownTag.IisApp |
-                DeploymentParameterWellKnownTag.Hidden |
-                DeploymentParameterWellKnownTag.DBServer |
-                DeploymentParameterWellKnownTag.DBAdminUserName |
-                DeploymentParameterWellKnownTag.DBAdminPassword;
-
-            if ((WellKnownTags & hiddenTags) > 0)
+            try
             {
-                this.Visible = false;
-                return;
-            }
 
-            // disable all editor controls
-            BooleanControl.Visible = false;
-            EnumControl.Visible = false;
-            PasswordControl.Visible = false;
-            TextControl.Visible = false;
+                // hide database server parameters
+                DeploymentParameterWellKnownTag hiddenTags =
+                    DeploymentParameterWellKnownTag.IisApp |
+                    DeploymentParameterWellKnownTag.Hidden |
+                    DeploymentParameterWellKnownTag.DBServer |
+                    DeploymentParameterWellKnownTag.DBAdminUserName |
+                    DeploymentParameterWellKnownTag.DBAdminPassword;
 
-            // enable specific control
-            if ((ValidationKind & DeploymentParameterValidationKind.Boolean) == DeploymentParameterValidationKind.Boolean)
-            {
-                // Boolean value
-                BooleanControl.Visible = true;
-                bool val = false;
-                Boolean.TryParse(DefaultValue, out val);
-                boolValue.Checked = val;
-            }
-            else if ((ValidationKind & DeploymentParameterValidationKind.Enumeration) == DeploymentParameterValidationKind.Enumeration)
-            {
-                // Enumeration value
-                EnumControl.Visible = true;
-
-                // fill dropdown
-                enumValue.Items.Clear();
-                string[] items = (ValidationString ?? "").Trim().Split(',');
-                foreach (string item in items)
-                    enumValue.Items.Add(item.Trim());
-
-                // select default value
-                enumValue.SelectedValue = DefaultValue;
-            }
-            else if ((WellKnownTags & DeploymentParameterWellKnownTag.Password) == DeploymentParameterWellKnownTag.Password)
-            {
-                // Password value
-                PasswordControl.Visible = true;
-                confirmPasswordControls.Visible = ((WellKnownTags & DeploymentParameterWellKnownTag.New) == DeploymentParameterWellKnownTag.New);
-            }
-            else
-            {
-                // Text value
-                TextControl.Visible = true;
-                textValue.Text = DefaultValue;
-                valPrefix.Text = ValuePrefix;
-                valSuffix.Text = ValueSuffix;
-
-                if (
-                    (WellKnownTags & DeploymentParameterWellKnownTag.MySql) == DeploymentParameterWellKnownTag.MySql 
-                    && 
-                    (WellKnownTags & DeploymentParameterWellKnownTag.DBUserName) == DeploymentParameterWellKnownTag.DBUserName 
-                    )
+                if ((WellKnownTags & hiddenTags) > 0)
                 {
-                    MysqlUsernameLengthValidator.Enabled = true;
+                    this.Visible = false;
+                    return;
                 }
+
+                // disable all editor controls
+                BooleanControl.Visible = false;
+                EnumControl.Visible = false;
+                PasswordControl.Visible = false;
+                TextControl.Visible = false;
+
+                // enable specific control
+                if ((ValidationKind & DeploymentParameterValidationKind.Boolean) == DeploymentParameterValidationKind.Boolean)
+                {
+                    // Boolean value
+                    BooleanControl.Visible = true;
+                    bool val = false;
+                    Boolean.TryParse(DefaultValue, out val);
+                    boolValue.Checked = val;
+                }
+                else if ((ValidationKind & DeploymentParameterValidationKind.Enumeration) == DeploymentParameterValidationKind.Enumeration)
+                {
+                    // Enumeration value
+                    EnumControl.Visible = true;
+
+                    // fill dropdown
+                    enumValue.Items.Clear();
+                    string[] items = (ValidationString ?? "").Trim().Split(',');
+                    foreach (string item in items)
+                        enumValue.Items.Add(item.Trim());
+
+                    // select default value
+                    enumValue.SelectedValue = DefaultValue;
+                }
+                else if ((WellKnownTags & DeploymentParameterWellKnownTag.Password) == DeploymentParameterWellKnownTag.Password)
+                {
+                    // Password value
+                    PasswordControl.Visible = true;
+                    confirmPasswordControls.Visible = ((WellKnownTags & DeploymentParameterWellKnownTag.New) == DeploymentParameterWellKnownTag.New);
+                }
+                else
+                {
+                    // Text value
+                    TextControl.Visible = true;
+                    textValue.Text = DefaultValue == null ? "" : DefaultValue;
+                    valPrefix.Text = ValuePrefix == null ? "" : ValuePrefix;
+                    valSuffix.Text = ValueSuffix == null ? "" : ValueSuffix;
+
+                    if (
+                        (ValuePrefix != null) && (ValueSuffix != null)
+                        &&
+                        ((WellKnownTags & DeploymentParameterWellKnownTag.MySql) == DeploymentParameterWellKnownTag.MySql)
+                        &&
+                        ((WellKnownTags & DeploymentParameterWellKnownTag.DBUserName) == DeploymentParameterWellKnownTag.DBUserName)
+                        )
+                    {
+                        MysqlUsernameLengthValidator.Enabled = true;
+                    }
+                }
+
+                // enforce validation for database parameters if they are allowed empty by app pack developers
+                bool isDatabaseParameter = (WellKnownTags & (
+                    DeploymentParameterWellKnownTag.DBName |
+                    DeploymentParameterWellKnownTag.DBUserName |
+                    DeploymentParameterWellKnownTag.DBUserPassword)) > 0;
+
+                // enforce validation for database name and username
+                if ((WellKnownTags & (DeploymentParameterWellKnownTag.DBName | DeploymentParameterWellKnownTag.DBUserName)) > 0
+                        && String.IsNullOrEmpty(ValidationString))
+                {
+                    validationKind |= DeploymentParameterValidationKind.RegularExpression;
+                    validationString = DatabaseIdentifierRegexp;
+                }
+
+                // validation common for all editors
+                requireTextValue.Enabled = requirePassword.Enabled = requireConfirmPassword.Enabled = requireEnumValue.Enabled =
+                    ((ValidationKind & DeploymentParameterValidationKind.AllowEmpty) != DeploymentParameterValidationKind.AllowEmpty) || isDatabaseParameter;
+
+                requireTextValue.Text = requirePassword.Text = requireEnumValue.Text =
+                    String.Format(GetLocalizedString("RequiredValidator.Text"), FriendlyName);
+
+                regexpTextValue.Enabled = regexpPassword.Enabled = regexpEnumValue.Enabled =
+                    (ValidationKind & DeploymentParameterValidationKind.RegularExpression) == DeploymentParameterValidationKind.RegularExpression;
+
+                regexpTextValue.ValidationExpression = regexpPassword.ValidationExpression = regexpEnumValue.ValidationExpression =
+                    ValidationString ?? "";
+
+                regexpTextValue.Text = regexpPassword.Text = regexpEnumValue.Text =
+                    String.Format(GetLocalizedString("RegexpValidator.Text"), FriendlyName, ValidationString);
+
+
             }
-
-            
-            // enforce validation for database parameters if they are allowed empty by app pack developers
-            bool isDatabaseParameter = (WellKnownTags & (
-                DeploymentParameterWellKnownTag.DBName |
-                DeploymentParameterWellKnownTag.DBUserName |
-                DeploymentParameterWellKnownTag.DBUserPassword)) > 0;
-
-            // enforce validation for database name and username
-            if ((WellKnownTags & (DeploymentParameterWellKnownTag.DBName | DeploymentParameterWellKnownTag.DBUserName)) > 0
-                    && String.IsNullOrEmpty(ValidationString))
-            {
-                validationKind |= DeploymentParameterValidationKind.RegularExpression;
-                validationString = DatabaseIdentifierRegexp;
-            }
-
-            // validation common for all editors
-            requireTextValue.Enabled = requirePassword.Enabled = requireConfirmPassword.Enabled = requireEnumValue.Enabled =
-                ((ValidationKind & DeploymentParameterValidationKind.AllowEmpty) != DeploymentParameterValidationKind.AllowEmpty) || isDatabaseParameter;
-
-            requireTextValue.Text = requirePassword.Text = requireEnumValue.Text =
-                String.Format(GetLocalizedString("RequiredValidator.Text"), FriendlyName);
-
-            regexpTextValue.Enabled = regexpPassword.Enabled = regexpEnumValue.Enabled =
-                (ValidationKind & DeploymentParameterValidationKind.RegularExpression) == DeploymentParameterValidationKind.RegularExpression;
-
-            regexpTextValue.ValidationExpression = regexpPassword.ValidationExpression = regexpEnumValue.ValidationExpression =
-                ValidationString ?? "";
-
-            regexpTextValue.Text = regexpPassword.Text = regexpEnumValue.Text =
-                String.Format(GetLocalizedString("RegexpValidator.Text"), FriendlyName, ValidationString);
-
+            catch { } // just skip
 
         }
 

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

@@ -211,6 +211,13 @@
     <Compile Include="Code\ReportingServices\IResourceStorage.cs" />
     <Compile Include="Code\ReportingServices\ReportingServicesUtils.cs" />
     <Compile Include="Code\UserControls\Tab.cs" />
+    <Compile Include="ProviderControls\Windows2012_Settings.ascx.cs">
+      <DependentUpon>Windows2012_Settings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ProviderControls\Windows2012_Settings.ascx.designer.cs">
+      <DependentUpon>Windows2012_Settings.ascx</DependentUpon>
+    </Compile>
     <Compile Include="RDSServersAddserver.ascx.cs">
       <DependentUpon>RDSServersAddserver.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -239,6 +246,20 @@
     <Compile Include="RDS\AddRDSServer.ascx.designer.cs">
       <DependentUpon>AddRDSServer.ascx</DependentUpon>
     </Compile>
+    <Compile Include="RDS\RDSEditApplicationUsers.ascx.cs">
+      <DependentUpon>RDSEditApplicationUsers.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="RDS\RDSEditApplicationUsers.ascx.designer.cs">
+      <DependentUpon>RDSEditApplicationUsers.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="RDS\RDSEditCollection.ascx.cs">
+      <DependentUpon>RDSEditCollection.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="RDS\RDSEditCollection.ascx.designer.cs">
+      <DependentUpon>RDSEditCollection.ascx</DependentUpon>
+    </Compile>
     <Compile Include="RDS\RDSEditCollectionApps.ascx.cs">
       <DependentUpon>RDSEditCollectionApps.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -752,6 +773,13 @@
     <Compile Include="SkinControls\SpaceOrganizationsSelector.ascx.designer.cs">
       <DependentUpon>SpaceOrganizationsSelector.ascx</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\DomainControl.ascx.cs">
+      <DependentUpon>DomainControl.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UserControls\DomainControl.ascx.designer.cs">
+      <DependentUpon>DomainControl.ascx</DependentUpon>
+    </Compile>
     <Compile Include="UserControls\DomainListControlBase.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -4263,10 +4291,13 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ApplyEnableHardQuotaFeature.ascx" />
+    <Content Include="ProviderControls\Windows2012_Settings.ascx" />
     <Content Include="RDSServersAddserver.ascx" />
     <Content Include="RDSServers.ascx" />
     <Content Include="RDS\AssignedRDSServers.ascx" />
     <Content Include="RDS\AddRDSServer.ascx" />
+    <Content Include="RDS\RDSEditApplicationUsers.ascx" />
+    <Content Include="RDS\RDSEditCollection.ascx" />
     <Content Include="RDS\RDSEditCollectionApps.ascx" />
     <Content Include="RDS\RDSEditCollectionUsers.ascx" />
     <Content Include="RDS\RDSCreateCollection.ascx" />
@@ -4277,6 +4308,13 @@
     <Content Include="ScheduleTaskControls\App_LocalResources\DomainExpirationView.ascx.resx" />
     <Content Include="App_LocalResources\SettingsDomainExpirationLetter.ascx.resx" />
     <Content Include="App_LocalResources\SettingsDomainLookupLetter.ascx.resx" />
+    <Content Include="ProviderControls\App_LocalResources\Windows2012_Settings.ascx.resx" />
+    <Content Include="RDS\App_LocalResources\RDSEditCollection.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="RDS\App_LocalResources\RDSEditApplicationUsers.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <EmbeddedResource Include="ScheduleTaskControls\App_LocalResources\DomainLookupView.ascx.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>DomainLookupView.ascx.Designer.cs</LastGenOutput>
@@ -4348,6 +4386,7 @@
     <Content Include="SettingsLyncUserPlansPolicy.ascx" />
     <Content Include="SkinControls\SpaceOrganizationsSelector.ascx" />
     <Content Include="SettingsExchangeRetentionPolicyTag.ascx" />
+    <Content Include="UserControls\DomainControl.ascx" />
     <Content Include="UserControls\EditFeedsList.ascx" />
     <Content Include="UserControls\OrgIdPolicyEditor.ascx" />
     <Content Include="UserControls\OrgPolicyEditor.ascx" />
@@ -5585,13 +5624,18 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="RDS\App_LocalResources\AddRDSServer.ascx.resx" />
-    <Content Include="RDS\App_LocalResources\RDSCreateCollection.ascx.resx" />
-    <Content Include="RDS\App_LocalResources\RDSEditCollectionUsers.ascx.resx" />
+    <Content Include="RDS\App_LocalResources\RDSCreateCollection.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="RDS\App_LocalResources\RDSEditCollectionUsers.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="RDS\App_LocalResources\RDSEditCollectionApps.ascx.resx" />
     <Content Include="RDS\UserControls\App_LocalResources\RDSCollectionUsers.ascx.resx" />
     <Content Include="RDS\UserControls\App_LocalResources\RDSCollectionServers.ascx.resx" />
     <Content Include="RDS\UserControls\App_LocalResources\RDSCollectionApps.ascx.resx" />
     <Content Include="ProviderControls\App_LocalResources\RDS_Settings.ascx.resx" />
+    <Content Include="UserControls\App_LocalResources\DomainControl.ascx.resx" />
     <EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>