From 6bf818f1d8680ef958af3df9ab1281ca039b9929 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 2 Mar 2015 02:11:38 -0800
Subject: [PATCH 01/46] web portal es tab view added

---
 WebsitePanel/Database/update_db.sql           | 144 ++++++++
 .../EnterpriseStorageProxy.cs                 | 320 ++++++++++++++++++
 .../Data/DataProvider.cs                      |  63 ++++
 .../EnterpriseStorageController.cs            | 154 +++++++++
 .../esEnterpriseStorage.asmx.cs               |  30 ++
 .../Config/Entities/SessionKeysCollection.cs  |  10 +
 .../WebConfigSections/SessionKeysElement.cs   |   1 +
 .../Owa/WopiServer.cs                         |   4 +-
 .../Authorization/Enums/WebDavPermissions.cs  |   4 +-
 .../WebDavAuthorizationService.cs             |  48 +++
 .../Controllers/FileSystemController.cs       |   2 +-
 .../WebsitePanel.WebDavPortal/Web.config      |   1 +
 .../ESModule_ControlsHierarchy.config         |   1 +
 .../App_Data/WebsitePanel_Modules.config      |   3 +
 ...riseStorageFolderGeneralSettings.ascx.resx |   3 +
 ...eFolderSettingsFolderPermissions.ascx.resx | 135 ++++++++
 ...eStorageFolderSettingsOwaEditing.ascx.resx | 135 ++++++++
 ...nterpriseStorageFolderGeneralSettings.ascx | 107 +++---
 ...rpriseStorageFolderGeneralSettings.ascx.cs |   7 +-
 ...rageFolderGeneralSettings.ascx.designer.cs |  82 ++---
 ...torageFolderSettingsFolderPermissions.ascx |  55 +++
 ...ageFolderSettingsFolderPermissions.ascx.cs |  86 +++++
 ...SettingsFolderPermissions.ascx.designer.cs | 132 ++++++++
 ...rpriseStorageFolderSettingsOwaEditing.ascx |  54 +++
 ...iseStorageFolderSettingsOwaEditing.ascx.cs |  80 +++++
 ...eFolderSettingsOwaEditing.ascx.designer.cs | 132 ++++++++
 .../EnterpriseStorageEditFolderTabs.ascx.resx | 129 +++++++
 .../EnterpriseStorageOwaUsersList.ascx.resx   | 156 +++++++++
 .../EnterpriseStorageEditFolderTabs.ascx      |  31 ++
 .../EnterpriseStorageEditFolderTabs.ascx.cs   |  52 +++
 ...riseStorageEditFolderTabs.ascx.designer.cs |  24 ++
 .../EnterpriseStorageOwaUsersList.ascx        | 114 +++++++
 .../EnterpriseStorageOwaUsersList.ascx.cs     | 214 ++++++++++++
 ...rpriseStorageOwaUsersList.ascx.designer.cs | 159 +++++++++
 .../WebsitePanel.Portal.Modules.csproj        |  36 ++
 35 files changed, 2592 insertions(+), 116 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.designer.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.designer.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageEditFolderTabs.ascx.resx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageOwaUsersList.ascx.resx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.designer.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.designer.cs

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 54df0493..270e1dcc 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -8729,3 +8729,147 @@ AND SI.ItemName = @ItemName
 AND ((@GroupName IS NULL) OR (@GroupName IS NOT NULL AND RG.GroupName = @GroupName))
 RETURN 
 GO
+
+
+--ES OWA Editing
+IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'EnterpriseFoldersOwaPermissions')
+CREATE TABLE EnterpriseFoldersOwaPermissions
+(
+	ID INT IDENTITY(1,1) NOT NULL PRIMARY KEY,
+	ItemID INT NOT NULL,
+	FolderID INT NOT NULL, 
+	AccountID INT NOT NULL 
+)
+GO
+
+IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_NAME ='FK_EnterpriseFoldersOwaPermissions_AccountId')
+ALTER TABLE [dbo].[EnterpriseFoldersOwaPermissions]
+DROP CONSTRAINT [FK_EnterpriseFoldersOwaPermissions_AccountId]
+GO
+
+ALTER TABLE [dbo].[EnterpriseFoldersOwaPermissions]  WITH CHECK ADD  CONSTRAINT [FK_EnterpriseFoldersOwaPermissions_AccountId] FOREIGN KEY([AccountID])
+REFERENCES [dbo].[ExchangeAccounts] ([AccountID])
+ON DELETE CASCADE
+GO
+
+IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS WHERE CONSTRAINT_NAME ='FK_EnterpriseFoldersOwaPermissions_FolderId')
+ALTER TABLE [dbo].[EnterpriseFoldersOwaPermissions]
+DROP CONSTRAINT [FK_EnterpriseFoldersOwaPermissions_FolderId]
+GO
+
+ALTER TABLE [dbo].[EnterpriseFoldersOwaPermissions]  WITH CHECK ADD  CONSTRAINT [FK_EnterpriseFoldersOwaPermissions_FolderId] FOREIGN KEY([FolderID])
+REFERENCES [dbo].[EnterpriseFolders] ([EnterpriseFolderID])
+ON DELETE CASCADE
+GO
+
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'DeleteAllEnterpriseFolderOwaUsers')
+DROP PROCEDURE DeleteAllEnterpriseFolderOwaUsers
+GO
+CREATE PROCEDURE [dbo].[DeleteAllEnterpriseFolderOwaUsers]
+(
+	@ItemID  int,
+	@FolderID int
+)
+AS
+DELETE FROM EnterpriseFoldersOwaPermissions
+WHERE ItemId = @ItemID AND FolderID = @FolderID
+GO
+
+
+
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'AddEnterpriseFolderOwaUser')
+DROP PROCEDURE AddEnterpriseFolderOwaUser
+GO
+CREATE PROCEDURE [dbo].[AddEnterpriseFolderOwaUser]
+(
+	@ESOwsaUserId INT OUTPUT,
+	@ItemID INT,
+	@FolderID INT, 
+	@AccountID INT 
+)
+AS
+INSERT INTO EnterpriseFoldersOwaPermissions
+(
+	ItemID ,
+	FolderID, 
+	AccountID
+)
+VALUES
+(
+	@ItemID,
+	@FolderID, 
+	@AccountID 
+)
+
+SET @ESOwsaUserId = SCOPE_IDENTITY()
+
+RETURN
+GO
+
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetEnterpriseFolderOwaUsers')
+DROP PROCEDURE GetEnterpriseFolderOwaUsers
+GO
+CREATE PROCEDURE [dbo].[GetEnterpriseFolderOwaUsers]
+(
+	@ItemID INT,
+	@FolderID INT
+)
+AS
+SELECT 
+	EA.AccountID,
+	EA.ItemID,
+	EA.AccountType,
+	EA.AccountName,
+	EA.DisplayName,
+	EA.PrimaryEmailAddress,
+	EA.MailEnabledPublicFolder,
+	EA.MailboxPlanId,
+	EA.SubscriberNumber,
+	EA.UserPrincipalName 
+	FROM EnterpriseFoldersOwaPermissions AS EFOP
+	LEFT JOIN  ExchangeAccounts AS EA ON EA.AccountID = EFOP.AccountID
+	WHERE EFOP.ItemID = @ItemID AND EFOP.FolderID = @FolderID
+GO
+
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetEnterpriseFolderId')
+DROP PROCEDURE GetEnterpriseFolderId
+GO
+CREATE PROCEDURE [dbo].[GetEnterpriseFolderId]
+(
+	@ItemID INT,
+	@FolderName varchar(max)
+)
+AS
+SELECT TOP 1
+	EnterpriseFolderID
+	FROM EnterpriseFolders
+	WHERE ItemId = @ItemID AND FolderName = @FolderName
+GO
+
+
+
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetUserEnterpriseFolderWithOwaEditPermission')
+DROP PROCEDURE GetUserEnterpriseFolderWithOwaEditPermission
+GO
+CREATE PROCEDURE [dbo].[GetUserEnterpriseFolderWithOwaEditPermission]
+(
+	@ItemID INT,
+	@AccountID INT
+)
+AS
+SELECT 
+	EF.FolderName
+	FROM EnterpriseFoldersOwaPermissions AS EFOP
+	LEFT JOIN  [dbo].[EnterpriseFolders] AS EF ON EF.EnterpriseFolderID = EFOP.FolderID
+	WHERE EFOP.ItemID = @ItemID AND EFOP.AccountID = @AccountID
+GO
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
index 87682b0f..ef29192f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
@@ -81,6 +81,16 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback SetEnterpriseFolderSettingsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback SetEnterpriseFolderGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetEnterpriseFolderPermissionSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetFolderOwaAccountsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetFolderOwaAccountsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetStatisticsOperationCompleted;
         
         private System.Threading.SendOrPostCallback GetStatisticsByOrganizationOperationCompleted;
@@ -169,6 +179,21 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event SetEnterpriseFolderSettingsCompletedEventHandler SetEnterpriseFolderSettingsCompleted;
         
+        /// <remarks/>
+        public event SetEnterpriseFolderGeneralSettingsCompletedEventHandler SetEnterpriseFolderGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetEnterpriseFolderPermissionSettingsCompletedEventHandler SetEnterpriseFolderPermissionSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetFolderOwaAccountsCompletedEventHandler GetFolderOwaAccountsCompleted;
+        
+        /// <remarks/>
+        public event SetFolderOwaAccountsCompletedEventHandler SetFolderOwaAccountsCompleted;
+        
+        /// <remarks/>
+        public event GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventHandler GetUserEnterpriseFolderWithOwaEditPermissionCompleted;
+        
         /// <remarks/>
         public event GetStatisticsCompletedEventHandler GetStatisticsCompleted;
         
@@ -1223,6 +1248,237 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetEnterpriseFolderGeneralSettings", 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 void SetEnterpriseFolderGeneralSettings(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType) {
+            this.Invoke("SetEnterpriseFolderGeneralSettings", new object[] {
+                        itemId,
+                        folder,
+                        directoyBrowsingEnabled,
+                        quota,
+                        quotaType});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetEnterpriseFolderGeneralSettings(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetEnterpriseFolderGeneralSettings", new object[] {
+                        itemId,
+                        folder,
+                        directoyBrowsingEnabled,
+                        quota,
+                        quotaType}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndSetEnterpriseFolderGeneralSettings(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderGeneralSettingsAsync(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType) {
+            this.SetEnterpriseFolderGeneralSettingsAsync(itemId, folder, directoyBrowsingEnabled, quota, quotaType, null);
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderGeneralSettingsAsync(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType, object userState) {
+            if ((this.SetEnterpriseFolderGeneralSettingsOperationCompleted == null)) {
+                this.SetEnterpriseFolderGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetEnterpriseFolderGeneralSettingsOperationCompleted);
+            }
+            this.InvokeAsync("SetEnterpriseFolderGeneralSettings", new object[] {
+                        itemId,
+                        folder,
+                        directoyBrowsingEnabled,
+                        quota,
+                        quotaType}, this.SetEnterpriseFolderGeneralSettingsOperationCompleted, userState);
+        }
+        
+        private void OnSetEnterpriseFolderGeneralSettingsOperationCompleted(object arg) {
+            if ((this.SetEnterpriseFolderGeneralSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetEnterpriseFolderGeneralSettingsCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetEnterpriseFolderPermissionSetting" +
+            "s", 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 void SetEnterpriseFolderPermissionSettings(int itemId, SystemFile folder, ESPermission[] permissions) {
+            this.Invoke("SetEnterpriseFolderPermissionSettings", new object[] {
+                        itemId,
+                        folder,
+                        permissions});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetEnterpriseFolderPermissionSettings(int itemId, SystemFile folder, ESPermission[] permissions, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetEnterpriseFolderPermissionSettings", new object[] {
+                        itemId,
+                        folder,
+                        permissions}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndSetEnterpriseFolderPermissionSettings(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderPermissionSettingsAsync(int itemId, SystemFile folder, ESPermission[] permissions) {
+            this.SetEnterpriseFolderPermissionSettingsAsync(itemId, folder, permissions, null);
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderPermissionSettingsAsync(int itemId, SystemFile folder, ESPermission[] permissions, object userState) {
+            if ((this.SetEnterpriseFolderPermissionSettingsOperationCompleted == null)) {
+                this.SetEnterpriseFolderPermissionSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetEnterpriseFolderPermissionSettingsOperationCompleted);
+            }
+            this.InvokeAsync("SetEnterpriseFolderPermissionSettings", new object[] {
+                        itemId,
+                        folder,
+                        permissions}, this.SetEnterpriseFolderPermissionSettingsOperationCompleted, userState);
+        }
+        
+        private void OnSetEnterpriseFolderPermissionSettingsOperationCompleted(object arg) {
+            if ((this.SetEnterpriseFolderPermissionSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetEnterpriseFolderPermissionSettingsCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetFolderOwaAccounts", 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 OrganizationUser[] GetFolderOwaAccounts(int itemId, SystemFile folder) {
+            object[] results = this.Invoke("GetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder});
+            return ((OrganizationUser[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetFolderOwaAccounts(int itemId, SystemFile folder, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public OrganizationUser[] EndGetFolderOwaAccounts(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((OrganizationUser[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetFolderOwaAccountsAsync(int itemId, SystemFile folder) {
+            this.GetFolderOwaAccountsAsync(itemId, folder, null);
+        }
+        
+        /// <remarks/>
+        public void GetFolderOwaAccountsAsync(int itemId, SystemFile folder, object userState) {
+            if ((this.GetFolderOwaAccountsOperationCompleted == null)) {
+                this.GetFolderOwaAccountsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFolderOwaAccountsOperationCompleted);
+            }
+            this.InvokeAsync("GetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder}, this.GetFolderOwaAccountsOperationCompleted, userState);
+        }
+        
+        private void OnGetFolderOwaAccountsOperationCompleted(object arg) {
+            if ((this.GetFolderOwaAccountsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetFolderOwaAccountsCompleted(this, new GetFolderOwaAccountsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetFolderOwaAccounts", 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 void SetFolderOwaAccounts(int itemId, SystemFile folder, OrganizationUser[] users) {
+            this.Invoke("SetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder,
+                        users});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetFolderOwaAccounts(int itemId, SystemFile folder, OrganizationUser[] users, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder,
+                        users}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndSetFolderOwaAccounts(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void SetFolderOwaAccountsAsync(int itemId, SystemFile folder, OrganizationUser[] users) {
+            this.SetFolderOwaAccountsAsync(itemId, folder, users, null);
+        }
+        
+        /// <remarks/>
+        public void SetFolderOwaAccountsAsync(int itemId, SystemFile folder, OrganizationUser[] users, object userState) {
+            if ((this.SetFolderOwaAccountsOperationCompleted == null)) {
+                this.SetFolderOwaAccountsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetFolderOwaAccountsOperationCompleted);
+            }
+            this.InvokeAsync("SetFolderOwaAccounts", new object[] {
+                        itemId,
+                        folder,
+                        users}, this.SetFolderOwaAccountsOperationCompleted, userState);
+        }
+        
+        private void OnSetFolderOwaAccountsOperationCompleted(object arg) {
+            if ((this.SetFolderOwaAccountsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetFolderOwaAccountsCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetUserEnterpriseFolderWithOwaEditPe" +
+            "rmission", 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[] GetUserEnterpriseFolderWithOwaEditPermission(int itemId, int[] accountIds) {
+            object[] results = this.Invoke("GetUserEnterpriseFolderWithOwaEditPermission", new object[] {
+                        itemId,
+                        accountIds});
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetUserEnterpriseFolderWithOwaEditPermission(int itemId, int[] accountIds, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetUserEnterpriseFolderWithOwaEditPermission", new object[] {
+                        itemId,
+                        accountIds}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string[] EndGetUserEnterpriseFolderWithOwaEditPermission(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetUserEnterpriseFolderWithOwaEditPermissionAsync(int itemId, int[] accountIds) {
+            this.GetUserEnterpriseFolderWithOwaEditPermissionAsync(itemId, accountIds, null);
+        }
+        
+        /// <remarks/>
+        public void GetUserEnterpriseFolderWithOwaEditPermissionAsync(int itemId, int[] accountIds, object userState) {
+            if ((this.GetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted == null)) {
+                this.GetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted);
+            }
+            this.InvokeAsync("GetUserEnterpriseFolderWithOwaEditPermission", new object[] {
+                        itemId,
+                        accountIds}, this.GetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted, userState);
+        }
+        
+        private void OnGetUserEnterpriseFolderWithOwaEditPermissionOperationCompleted(object arg) {
+            if ((this.GetUserEnterpriseFolderWithOwaEditPermissionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetUserEnterpriseFolderWithOwaEditPermissionCompleted(this, new GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetStatistics", 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 OrganizationStatistics GetStatistics(int itemId) {
@@ -2053,6 +2309,70 @@ namespace WebsitePanel.EnterpriseServer {
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void SetEnterpriseFolderSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetEnterpriseFolderGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetEnterpriseFolderPermissionSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetFolderOwaAccountsCompletedEventHandler(object sender, GetFolderOwaAccountsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetFolderOwaAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetFolderOwaAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public OrganizationUser[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((OrganizationUser[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetFolderOwaAccountsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventHandler(object sender, GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetUserEnterpriseFolderWithOwaEditPermissionCompletedEventArgs(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 GetStatisticsCompletedEventHandler(object sender, GetStatisticsCompletedEventArgs e);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index 1d903a9c..49501ef1 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -4543,6 +4543,69 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
+        public static void DeleteAllEnterpriseFolderOwaUsers(int itemId, int folderId)
+        {
+            SqlHelper.ExecuteNonQuery(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "DeleteAllEnterpriseFolderOwaUsers",
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@FolderID", folderId)
+            );
+        }
+
+        public static int AddEnterpriseFolderOwaUser(int itemId, int folderId, int accountId)
+        {
+            SqlParameter id = new SqlParameter("@ESOwsaUserId", SqlDbType.Int);
+            id.Direction = ParameterDirection.Output;
+
+            SqlHelper.ExecuteNonQuery(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "AddEnterpriseFolderOwaUser",
+                id,
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@FolderID", folderId),
+                new SqlParameter("@AccountId", accountId)
+            );
+
+            // read identity
+            return Convert.ToInt32(id.Value);
+        }
+
+        public static IDataReader GetEnterpriseFolderOwaUsers(int itemId, int folderId)
+        {
+            return SqlHelper.ExecuteReader(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "GetEnterpriseFolderOwaUsers",
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@FolderID", folderId)
+            );
+        }
+
+        public static IDataReader GetEnterpriseFolderId(int itemId, string folderName)
+        {
+            return SqlHelper.ExecuteReader(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "GetEnterpriseFolderId",
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@FolderName", folderName)
+            );
+        }
+
+        public static IDataReader GetUserEnterpriseFolderWithOwaEditPermission(int itemId, int accountId)
+        {
+            return SqlHelper.ExecuteReader(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "GetUserEnterpriseFolderWithOwaEditPermission",
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@AccountID", accountId)
+            );
+        }
+
         #endregion
 
         #region Support Service Levels
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
index d7fbc832..6402a7b0 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
@@ -152,6 +152,16 @@ namespace WebsitePanel.EnterpriseServer
             StartESBackgroundTaskInternal("SET_ENTERPRISE_FOLDER_SETTINGS", itemId, folder, permissions, directoyBrowsingEnabled, quota, quotaType);
         }
 
+        public static void SetESGeneralSettings(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
+        {
+            SetESGeneralSettingsInternal("SET_ENTERPRISE_FOLDER_GENERAL_SETTINGS", itemId, folder, directoyBrowsingEnabled, quota, quotaType);
+        }
+
+        public static void SetESFolderPermissionSettings(int itemId, SystemFile folder, ESPermission[] permissions)
+        {
+            SetESFolderPermissionSettingsInternal("SET_ENTERPRISE_FOLDER_GENERAL_SETTINGS", itemId, folder, permissions);
+        }
+
         public static int AddWebDavAccessToken(WebDavAccessToken accessToken)
         {
            return DataProvider.AddWebDavAccessToken(accessToken);
@@ -257,6 +267,69 @@ namespace WebsitePanel.EnterpriseServer
             return rootFolders;
         }
 
+        protected static void SetESGeneralSettingsInternal(string taskName, int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
+        {
+            // load organization
+            var org = OrganizationController.GetOrganization(itemId);
+
+            try
+            {
+                TaskManager.StartTask("ENTERPRISE_STORAGE", taskName, org.PackageId);
+
+                EnterpriseStorageController.SetFRSMQuotaOnFolder(itemId, folder.Name, quota, quotaType);
+                EnterpriseStorageController.SetDirectoryBrowseEnabled(itemId, folder.Url, directoyBrowsingEnabled);
+            }
+            catch (Exception ex)
+            {
+                // log error
+                TaskManager.WriteError(ex, "Error executing enterprise storage background task");
+            }
+            finally
+            {
+                // complete task
+                try
+                {
+                    TaskManager.CompleteTask();
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+
+        protected static void SetESFolderPermissionSettingsInternal(string taskName, int itemId, SystemFile folder, ESPermission[] permissions)
+        {
+            // load organization
+            var org = OrganizationController.GetOrganization(itemId);
+
+            new Thread(() =>
+            {
+                try
+                {
+                    TaskManager.StartTask("ENTERPRISE_STORAGE", taskName, org.PackageId);
+
+                    EnterpriseStorageController.SetFolderPermission(itemId, folder.Name, permissions);
+                }
+                catch (Exception ex)
+                {
+                    // log error
+                    TaskManager.WriteError(ex, "Error executing enterprise storage background task");
+                }
+                finally
+                {
+                    // complete task
+                    try
+                    {
+                        TaskManager.CompleteTask();
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+
+            }).Start();
+        }
+
         protected static void StartESBackgroundTaskInternal(string taskName, int itemId, SystemFile folder, ESPermission[] permissions, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
         {
             // load organization
@@ -1265,6 +1338,87 @@ namespace WebsitePanel.EnterpriseServer
             return null;
         }
 
+        public static OrganizationUser[] GetFolderOwaAccounts(int itemId, string folderName)
+        {
+            try
+            {
+                var folderId = GetFolderId(itemId, folderName);
+
+                var users = ObjectUtils.CreateListFromDataReader<OrganizationUser>(DataProvider.GetEnterpriseFolderOwaUsers(itemId, folderId));
+
+                return users.ToArray();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public static void SetFolderOwaAccounts(int itemId, string folderName, OrganizationUser[] users)
+        {
+            try
+            {
+                var folderId = GetFolderId(itemId, folderName);
+
+                DataProvider.DeleteAllEnterpriseFolderOwaUsers(itemId, folderId);
+
+                foreach (var user in users)
+                {
+                    DataProvider.AddEnterpriseFolderOwaUser(itemId, folderId, user.AccountId);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        protected static int GetFolderId(int itemId, string folderName)
+        {
+            try
+            {
+                GetFolder(itemId, folderName);
+
+                var dataReader = DataProvider.GetEnterpriseFolderId(itemId, folderName);
+
+                while (dataReader.Read())
+                {
+                    return (int)dataReader[0];
+                }
+
+                return -1;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public static List<string> GetUserEnterpriseFolderWithOwaEditPermission(int itemId, List<int> accountIds)
+        {
+            try
+            {
+                var result = new List<string>();
+
+
+                foreach (var accountId in accountIds)
+                {
+                    var reader =  DataProvider.GetUserEnterpriseFolderWithOwaEditPermission(itemId, accountId);
+
+                    while (reader.Read())
+                    {
+                        result.Add(Convert.ToString(reader["FolderName"]));
+                    }
+                }
+
+                return result.Distinct().ToList();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         #region WebDav portal
 
         public static string GetWebDavPortalUserSettingsByAccountId(int accountId)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
index 6668b40b..f5ba338b 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
@@ -196,6 +196,36 @@ namespace WebsitePanel.EnterpriseServer
             EnterpriseStorageController.StartSetEnterpriseFolderSettingsBackgroundTask(itemId, folder, permissions, directoyBrowsingEnabled, quota, quotaType);
         }
 
+        [WebMethod]
+        public void SetEnterpriseFolderGeneralSettings(int itemId, SystemFile folder, bool directoyBrowsingEnabled, int quota, QuotaType quotaType)
+        {
+            EnterpriseStorageController.SetESGeneralSettings(itemId, folder, directoyBrowsingEnabled, quota, quotaType);
+        }
+
+        [WebMethod]
+        public void SetEnterpriseFolderPermissionSettings(int itemId, SystemFile folder, ESPermission[] permissions)
+        {
+            EnterpriseStorageController.SetESFolderPermissionSettings(itemId, folder, permissions);
+        }
+
+        [WebMethod]
+        public OrganizationUser[] GetFolderOwaAccounts(int itemId, SystemFile folder)
+        {
+           return  EnterpriseStorageController.GetFolderOwaAccounts(itemId, folder.Name);
+        }
+
+        [WebMethod]
+        public void SetFolderOwaAccounts(int itemId, SystemFile folder, OrganizationUser[] users)
+        {
+            EnterpriseStorageController.SetFolderOwaAccounts(itemId, folder.Name, users);
+        }
+
+        [WebMethod]
+        public List<string> GetUserEnterpriseFolderWithOwaEditPermission(int itemId, List<int> accountIds)
+        {
+            return EnterpriseStorageController.GetUserEnterpriseFolderWithOwaEditPermission(itemId, accountIds);
+        }
+
         #endregion
 
         #region Statistics
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs
index f9337401..1a45b059 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/SessionKeysCollection.cs
@@ -45,6 +45,16 @@ namespace WebsitePanel.WebDav.Core.Config.Entities
             }
         }
 
+        public string OwaEditFoldersSessionKey
+        {
+            get
+            {
+                SessionKeysElement sessionKey =
+                    _sessionKeys.FirstOrDefault(x => x.Key == SessionKeysElement.OwaEditFoldersSessionKey);
+                return sessionKey != null ? sessionKey.Value : null;
+            }
+        }
+
         public string WebDavRootFoldersPermissions
         {
             get
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs
index ca2a44fd..76a0e7e8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/SessionKeysElement.cs
@@ -14,6 +14,7 @@ namespace WebsitePanel.WebDav.Core.Config.WebConfigSections
         public const string WebDavRootFolderPermissionsKey = "WebDavRootFolderPermissionsKey";
         public const string ResourseRenderCountKey = "ResourseRenderCountSessionKey";
         public const string ItemIdSessionKey = "ItemId";
+        public const string OwaEditFoldersSessionKey = "OwaEditFoldersSession";
 
         [ConfigurationProperty(KeyKey, IsKey = true, IsRequired = true)]
         public string Key
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
index 547f930c..dada9bab 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
@@ -34,7 +34,9 @@ namespace WebsitePanel.WebDav.Core.Owa
         {
             var resource = _webDavManager.GetResource(path);
 
-            var readOnly = _webDavAuthorizationService.GetPermissions(WspContext.User, path).HasFlag(WebDavPermissions.Write) == false;
+            var permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, path);
+
+            var readOnly = permissions.HasFlag(WebDavPermissions.Write) == false || permissions.HasFlag(WebDavPermissions.OwaEdit) == false;
 
             var cFileInfo = new CheckFileInfo
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/Enums/WebDavPermissions.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/Enums/WebDavPermissions.cs
index b3c9a52e..dd25dc50 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/Enums/WebDavPermissions.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/Enums/WebDavPermissions.cs
@@ -8,6 +8,8 @@ namespace WebsitePanel.WebDav.Core.Security.Authorization.Enums
         Empty = 0,
         None = 1,
         Read = 2,
-        Write = 4
+        Write = 4,
+        OwaRead = 8,
+        OwaEdit = 16
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/WebDavAuthorizationService.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/WebDavAuthorizationService.cs
index f0c285f3..d3fe710c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/WebDavAuthorizationService.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Security/Authorization/WebDavAuthorizationService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using Cobalt;
 using WebsitePanel.EnterpriseServer.Base.HostedSolution;
 using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.WebDav.Core.Config;
@@ -54,6 +55,17 @@ namespace WebsitePanel.WebDav.Core.Security.Authorization
                 }
             }
 
+            var owaEditFolders = GetOwaFoldersWithEditPermission(principal);
+
+            if (owaEditFolders.Contains(rootFolder))
+            {
+                resultPermissions |= WebDavPermissions.OwaEdit;
+            }
+            else
+            {
+                resultPermissions |= WebDavPermissions.OwaRead;
+            }
+
             return resultPermissions;
         }
 
@@ -105,5 +117,41 @@ namespace WebsitePanel.WebDav.Core.Security.Authorization
 
             return groups ?? new ExchangeAccount[0];
         }
+
+        private IEnumerable<string> GetOwaFoldersWithEditPermission(WspPrincipal principal)
+        {
+            var folders = HttpContext.Current.Session != null ? HttpContext.Current.Session[WebDavAppConfigManager.Instance.SessionKeys.OwaEditFoldersSessionKey] as IEnumerable<string> : null;
+
+            if (folders != null)
+            {
+                return folders;
+            }
+
+            var accountsIds = new List<int>();
+
+            accountsIds.Add(principal.AccountId);
+
+            var groups = GetUserSecurityGroups(principal);
+
+            accountsIds.AddRange(groups.Select(x=>x.AccountId));
+
+            try
+            {
+                folders = WspContext.Services.EnterpriseStorage.GetUserEnterpriseFolderWithOwaEditPermission(principal.ItemId, accountsIds.ToArray());
+            }
+            catch (Exception)
+            {
+                //TODO remove try catch when es &portal will be updated
+                return new List<string>();
+            }
+
+
+            if (HttpContext.Current.Session != null)
+            {
+                HttpContext.Current.Session[WebDavAppConfigManager.Instance.SessionKeys.OwaEditFoldersSessionKey] = folders;
+            }
+
+            return folders;
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index c4c8591b..dbb50095 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -318,7 +318,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
         {
             var permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, pathPart);
 
-            if (permissions.HasFlag(WebDavPermissions.Write) == false || Request.Browser.IsMobileDevice)
+            if (permissions.HasFlag(WebDavPermissions.Write) == false || permissions.HasFlag(WebDavPermissions.OwaEdit) == false || Request.Browser.IsMobileDevice)
             {
                 return new RedirectToRouteResult(FileSystemRouteNames.ViewOfficeOnline, null);
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
index 265b5f6e..3f07e5e5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
@@ -52,6 +52,7 @@
       <add key="ResourseRenderCountSessionKey" value="ResourseRenderCount" />
       <add key="ItemIdSessionKey" value="ItemId" />
       <add key="UserGroupsKey" value="UserGroups" />
+      <add key="OwaEditFoldersSession" value="OwaEditFolders"/>
     </sessionKeys>
     <fileIcons defaultPath="~/Content/Images/other-icon.png" folderPath="~/Content/Images/folder_100x100.png">
       <add extension=".txt" path="~/Content/Images/txt-icon.png" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
index f4e2aa27..ff127dbd 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
@@ -135,6 +135,7 @@
   <Control key="enterprisestorage_folders" />
   <Control key="create_enterprisestorage_folder" general_key="enterprisestorage_folders" />
   <Control key="enterprisestorage_folder_settings" general_key="enterprisestorage_folders" />
+  <Control key="enterprisestorage_folder_settings_general" general_key="enterprisestorage_folders" />
       
   <Control key="enterprisestorage_drive_maps" />
   <Control key="create_enterprisestorage_drive_map" general_key="enterprisestorage_drive_maps" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
index b78fd5a1..4f2a314a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -563,6 +563,9 @@
       <Control key="enterprisestorage_folders" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx" title="Enterprise Storage Folders" type="View" />
       <Control key="create_enterprisestorage_folder" src="WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx" title="Create New ES Folder" type="View" />
       <Control key="enterprisestorage_folder_settings" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx" title="Edit ES Folder" type="View" />
+      <Control key="enterprisestorage_folder_settings_folder_permissions" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx" title="Edit ES Folder" type="View" />
+      <Control key="enterprisestorage_folder_settings_owa_editing" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx" title="Edit ES Folder" type="View" />
+      
       <Control key="enterprisestorage_drive_maps" src="WebsitePanel/ExchangeServer/EnterpriseStorageDriveMaps.ascx" title="Enterprise Storage Drive Maps" type="View" />
       <Control key="create_enterprisestorage_drive_map" src="WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx" title="Create New ES Drive Map" type="View" />
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx
index 371dc3d8..38060605 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderGeneralSettings.ascx.resx
@@ -168,4 +168,7 @@
   <data name="rbtnQuotaSoft" xml:space="preserve">
     <value>Soft</value>
   </data>
+  <data name="colFolderGeneralSettings.Text" xml:space="preserve">
+    <value>General Settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx
new file mode 100644
index 00000000..5052b0b5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx
@@ -0,0 +1,135 @@
+<?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="btnSave.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating folder settings...');</value>
+  </data>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save Changes</value>
+  </data>
+  <data name="colFolderPermissions.Text" xml:space="preserve">
+    <value>Folder Permissions</value>
+  </data>
+  <data name="locPermissionsSection.Text" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit Folder</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
new file mode 100644
index 00000000..33677cf3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
@@ -0,0 +1,135 @@
+<?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="btnSave.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating folder settings...');</value>
+  </data>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save Changes</value>
+  </data>
+  <data name="colOwaEditing.Text" xml:space="preserve">
+    <value>Office Web App Editing</value>
+  </data>
+  <data name="locOwaEditingSection.Text" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit Folder</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx
index 84cc95b7..37ced623 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx
@@ -1,8 +1,11 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageFolderGeneralSettings.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageFolderGeneralSettings" %>
+
 <%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/EnterpriseStoragePermissions.ascx" TagName="ESPermissions" TagPrefix="wsp"%>
 <%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" Namespace="WebsitePanel.Portal.ExchangeServer.UserControls" Assembly="WebsitePanel.Portal.Modules" %>
+<%@ Register Src="UserControls/EnterpriseStorageEditFolderTabs.ascx" TagName="CollectionTabs" TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
@@ -16,62 +19,62 @@
 					<asp:Image ID="Image1" SkinID="ExchangeList48" runat="server" />
 					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Folder"></asp:Localize>
 
-					<asp:Literal ID="litFolderName" runat="server" Text="Folder" />
+					<asp:Literal ID="litFolderName" runat="server" Text="Folder 32" />
                 </div>
 				<div class="FormBody">
+				    <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="enterprisestorage_folder_settings" />
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
-					<table>
-						<tr>
-							<td class="FormLabel150"><asp:Localize ID="locFolderName" runat="server" meta:resourcekey="locFolderName" Text="Folder Name:"></asp:Localize></td>
-							<td>
-								<asp:TextBox ID="txtFolderName" runat="server" CssClass="HugeTextBox200" ></asp:TextBox>
-								<asp:RequiredFieldValidator ID="valRequireFolderName" runat="server" meta:resourcekey="valRequireFolderName" ControlToValidate="txtFolderName"
-									ErrorMessage="Enter Folder Name" ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
-							</td>
-						</tr>
-                        <tr>
-							<td class="FormLabel150"><asp:Localize ID="locFolderSize" runat="server" meta:resourcekey="locFolderSize" Text="Folder Limit Size (Gb):"></asp:Localize></td>
-							<td>
-								<asp:TextBox ID="txtFolderSize" runat="server" CssClass="HugeTextBox200"></asp:TextBox>
-                                <asp:RequiredFieldValidator ID="valRequireFolderSize" runat="server" meta:resourcekey="valRequireFolderSize" ControlToValidate="txtFolderSize"
-									ErrorMessage="Enter Folder Size" ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
-                                <asp:RangeValidator ID="rangeFolderSize" runat="server" ControlToValidate="txtFolderSize" MaximumValue="99999999" MinimumValue="0.01" Type="Double"
-                                    ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"
-                                    ErrorMessage="The quota you’ve entered exceeds the available quota for tenant" />
-							</td>
-						</tr>
-                        <tr>
-                            <td class="FormLabel150"><asp:Localize ID="locQuotaType" runat="server" meta:resourcekey="locQuotaType" Text="Quota Type:"></asp:Localize></td>
-                            <td class="FormRBtnL">
-                                <asp:RadioButton ID="rbtnQuotaSoft" runat="server" meta:resourcekey="rbtnQuotaSoft" Text="Soft" GroupName="QuotaType" Checked="true" />
-                                <asp:RadioButton ID="rbtnQuotaHard" runat="server" meta:resourcekey="rbtnQuotaHard" Text="Hard" GroupName="QuotaType" />
-                                <br />
-                                <br />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="FormLabel150"><asp:Localize ID="locFolderUrl" runat="server" meta:resourcekey="locFolderUrl" Text="Folder Url:"></asp:Localize></td>
-                            <td><asp:Label runat="server" ID="lblFolderUrl" /></td>
-                        </tr>
-                        <tr><td>&nbsp;</td></tr>
-                        <tr>
-                            <td class="FormLabel150"><asp:Localize ID="locDirectoryBrowsing" runat="server" meta:resourcekey="locDirectoryBrowsing" Text="Enable Directory Browsing:"></asp:Localize></td>
-						    <td>
-							    <asp:CheckBox id="chkDirectoryBrowsing" runat="server"></asp:CheckBox>
-						    </td>
-					    </tr>
-                        <tr><td>&nbsp;</td></tr>
-						<tr>
-							<td colspan="2">
-                                <fieldset id="PermissionsPanel" runat="server">
-                                    <legend><asp:Localize ID="PermissionsSection" runat="server" meta:resourcekey="locPermissionsSection" Text="Permissions"></asp:Localize></legend>
-                                    <wsp:ESPermissions id="permissions" runat="server" />
-                                </fieldset>
-						</tr>
-					    <tr><td>&nbsp;</td></tr>
+                    
+                    <wsp:CollapsiblePanel id="colFolderGeneralSettings" runat="server"
+                        TargetControlID="panelFolderGeneralSettings" meta:resourcekey="colFolderGeneralSettings" Text="">
+                    </wsp:CollapsiblePanel>		
+                    
+                     <asp:Panel runat="server" ID="panelFolderGeneralSettings">    
+					    <table>
+						    <tr>
+							    <td class="FormLabel150"><asp:Localize ID="locFolderName" runat="server" meta:resourcekey="locFolderName" Text="Folder Name:"></asp:Localize></td>
+							    <td>
+								    <asp:TextBox ID="txtFolderName" runat="server" CssClass="HugeTextBox200" ></asp:TextBox>
+								    <asp:RequiredFieldValidator ID="valRequireFolderName" runat="server" meta:resourcekey="valRequireFolderName" ControlToValidate="txtFolderName"
+									    ErrorMessage="Enter Folder Name" ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
+							    </td>
+						    </tr>
+                            <tr>
+							    <td class="FormLabel150"><asp:Localize ID="locFolderSize" runat="server" meta:resourcekey="locFolderSize" Text="Folder Limit Size (Gb):"></asp:Localize></td>
+							    <td>
+								    <asp:TextBox ID="txtFolderSize" runat="server" CssClass="HugeTextBox200"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="valRequireFolderSize" runat="server" meta:resourcekey="valRequireFolderSize" ControlToValidate="txtFolderSize"
+									    ErrorMessage="Enter Folder Size" ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
+                                    <asp:RangeValidator ID="rangeFolderSize" runat="server" ControlToValidate="txtFolderSize" MaximumValue="99999999" MinimumValue="0.01" Type="Double"
+                                        ValidationGroup="EditFolder" Display="Dynamic" Text="*" SetFocusOnError="True"
+                                        ErrorMessage="The quota you’ve entered exceeds the available quota for tenant" />
+							    </td>
+						    </tr>
+                            <tr>
+                                <td class="FormLabel150"><asp:Localize ID="locQuotaType" runat="server" meta:resourcekey="locQuotaType" Text="Quota Type:"></asp:Localize></td>
+                                <td class="FormRBtnL">
+                                    <asp:RadioButton ID="rbtnQuotaSoft" runat="server" meta:resourcekey="rbtnQuotaSoft" Text="Soft" GroupName="QuotaType" Checked="true" />
+                                    <asp:RadioButton ID="rbtnQuotaHard" runat="server" meta:resourcekey="rbtnQuotaHard" Text="Hard" GroupName="QuotaType" />
+                                    <br />
+                                    <br />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="FormLabel150"><asp:Localize ID="locFolderUrl" runat="server" meta:resourcekey="locFolderUrl" Text="Folder Url:"></asp:Localize></td>
+                                <td><asp:Label runat="server" ID="lblFolderUrl" /></td>
+                            </tr>
+                            <tr><td>&nbsp;</td></tr>
+                            <tr>
+                                <td class="FormLabel150"><asp:Localize ID="locDirectoryBrowsing" runat="server" meta:resourcekey="locDirectoryBrowsing" Text="Enable Directory Browsing:"></asp:Localize></td>
+						        <td>
+							        <asp:CheckBox id="chkDirectoryBrowsing" runat="server"></asp:CheckBox>
+						        </td>
+					        </tr>
+                            <tr><td>&nbsp;</td></tr>
+
+					    </table>
+					</asp:Panel>
 
-					</table>
-					
 				    <div class="FormFooterClean">
 					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave" ValidationGroup="EditFolder" OnClick="btnSave_Click"></asp:Button>
 					    <asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="EditFolder" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs
index 315780f2..ca4b3d1e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.cs
@@ -107,11 +107,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                         break;
                 }
 
-                var esPermissions = ES.Services.EnterpriseStorage.GetEnterpriseFolderPermissions(PanelRequest.ItemID,folder.Name);
-
                 chkDirectoryBrowsing.Checked = ES.Services.EnterpriseStorage.GetDirectoryBrowseEnabled(PanelRequest.ItemID, folder.Url);
-
-                permissions.SetPermissions(esPermissions);
             }
             catch (Exception ex)
             {
@@ -159,10 +155,9 @@ namespace WebsitePanel.Portal.ExchangeServer
                     }
                 }
 
-                ES.Services.EnterpriseStorage.SetEnterpriseFolderSettings(
+                ES.Services.EnterpriseStorage.SetEnterpriseFolderGeneralSettings(
                     PanelRequest.ItemID,
                     folder,
-                    permissions.GetPemissions(),
                     chkDirectoryBrowsing.Checked,
                     (int)(decimal.Parse(txtFolderSize.Text) * OneGb),
                     rbtnQuotaSoft.Checked ? QuotaType.Soft : QuotaType.Hard);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.designer.cs
index dc276b18..4488393f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -76,6 +48,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litFolderName;
         
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageEditFolderTabs tabs;
+        
         /// <summary>
         /// messageBox control.
         /// </summary>
@@ -85,6 +66,24 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
+        /// <summary>
+        /// colFolderGeneralSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel colFolderGeneralSettings;
+        
+        /// <summary>
+        /// panelFolderGeneralSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelFolderGeneralSettings;
+        
         /// <summary>
         /// locFolderName control.
         /// </summary>
@@ -211,33 +210,6 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkDirectoryBrowsing;
         
-        /// <summary>
-        /// PermissionsPanel 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 PermissionsPanel;
-        
-        /// <summary>
-        /// PermissionsSection 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 PermissionsSection;
-        
-        /// <summary>
-        /// permissions control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStoragePermissions permissions;
-        
         /// <summary>
         /// btnSave control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx
new file mode 100644
index 00000000..8bddadca
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx
@@ -0,0 +1,55 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageFolderSettingsFolderPermissions" %>
+
+
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnterpriseStoragePermissions.ascx" TagName="ESPermissions" TagPrefix="wsp"%>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" Namespace="WebsitePanel.Portal.ExchangeServer.UserControls" Assembly="WebsitePanel.Portal.Modules" %>
+<%@ Register Src="UserControls/EnterpriseStorageEditFolderTabs.ascx" TagName="CollectionTabs" TagPrefix="wsp" %>
+
+<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="Image1" SkinID="ExchangeList48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Folder"></asp:Localize>
+
+					<asp:Literal ID="litFolderName" runat="server" Text="Folder" />
+                </div>
+				<div class="FormBody">
+				    <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="enterprisestorage_folder_settings_folder_permissions" />
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <wsp:CollapsiblePanel id="colFolderPermissions" runat="server"
+                        TargetControlID="panelFolderPermissions" meta:resourcekey="colFolderPermissions" Text="">
+                    </wsp:CollapsiblePanel>		
+                    
+                     <asp:Panel runat="server" ID="panelFolderPermissions">                                                
+					    <table>
+						    <tr>
+							    <td colspan="2">
+                                    <fieldset id="PermissionsPanel" runat="server">
+                                        <legend><asp:Localize ID="PermissionsSection" runat="server" meta:resourcekey="locPermissionsSection" Text="Permissions"></asp:Localize></legend>
+                                        <wsp:ESPermissions id="permissions" runat="server" />
+                                    </fieldset>
+						    </tr>
+					        <tr><td>&nbsp;</td></tr>
+
+					    </table>
+                    </asp:Panel>
+					
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave" ValidationGroup="EditFolder" OnClick="btnSave_Click"></asp:Button>
+					    <asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="EditFolder" />
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs
new file mode 100644
index 00000000..219a9f4c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.OS;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class EnterpriseStorageFolderSettingsFolderPermissions : WebsitePanelModuleBase
+    {
+        #region Constants
+
+        private const int OneGb = 1024;
+
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
+                {
+                    Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
+                        "ItemID=" + PanelRequest.ItemID));
+                }
+
+                BindSettings();
+            }
+        }
+
+        private void BindSettings()
+        {
+            try
+            {
+                // get settings
+                Organization org = ES.Services.Organizations.GetOrganization(PanelRequest.ItemID);
+
+                SystemFile folder = ES.Services.EnterpriseStorage.GetEnterpriseFolder(
+                    PanelRequest.ItemID, PanelRequest.FolderID);
+
+                litFolderName.Text = string.Format("{0}", folder.Name);
+
+                // bind form
+                var esPermissions = ES.Services.EnterpriseStorage.GetEnterpriseFolderPermissions(PanelRequest.ItemID,folder.Name);
+
+                permissions.SetPermissions(esPermissions);
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ENETERPRISE_STORAGE_GET_FOLDER_SETTINGS", ex);
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                SystemFile folder = new SystemFile { Name = PanelRequest.FolderID };
+
+                if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
+                {
+                    ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
+                }
+
+                ES.Services.EnterpriseStorage.SetEnterpriseFolderPermissionSettings(
+                    PanelRequest.ItemID,
+                    folder,
+                    permissions.GetPemissions());
+
+
+                Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
+                        "ItemID=" + PanelRequest.ItemID));
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ENTERPRISE_STORAGE_UPDATE_FOLDER_SETTINGS", ex);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.designer.cs
new file mode 100644
index 00000000..503327d4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsFolderPermissions.ascx.designer.cs
@@ -0,0 +1,132 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class EnterpriseStorageFolderSettingsFolderPermissions {
+        
+        /// <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>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// litFolderName 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 litFolderName;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageEditFolderTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// colFolderPermissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel colFolderPermissions;
+        
+        /// <summary>
+        /// panelFolderPermissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelFolderPermissions;
+        
+        /// <summary>
+        /// PermissionsPanel 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 PermissionsPanel;
+        
+        /// <summary>
+        /// PermissionsSection 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 PermissionsSection;
+        
+        /// <summary>
+        /// permissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStoragePermissions permissions;
+        
+        /// <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;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
new file mode 100644
index 00000000..5a88b08e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
@@ -0,0 +1,54 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageFolderSettingsOwaEditing.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.EnterpriseStorageFolderSettingsOwaEditing" %>
+
+
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnterpriseStorageOwaUsersList.ascx" TagName="OwaUsers" TagPrefix="wsp"%>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnterpriseStorageEditFolderTabs.ascx" TagName="CollectionTabs" TagPrefix="wsp" %>
+
+<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="Image1" SkinID="ExchangeList48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Folder"></asp:Localize>
+
+					<asp:Literal ID="litFolderName" runat="server" Text="Folder" />
+                </div>
+				<div class="FormBody">
+				    <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="enterprisestorage_folder_settings_owa_editing" />
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <wsp:CollapsiblePanel id="colOwaEditing" runat="server"
+                        TargetControlID="panelFolderPermissions" meta:resourcekey="colOwaEditing" Text="">
+                    </wsp:CollapsiblePanel>		
+                    
+                     <asp:Panel runat="server" ID="panelFolderPermissions">                                                
+					    <table>
+						    <tr>
+							    <td colspan="2">
+                                    <fieldset id="OwaUsersPanel" runat="server">
+                                        <legend><asp:Localize ID="locOwaEditingSection" runat="server" meta:resourcekey="locOwaEditingSection" Text="Users"></asp:Localize></legend>
+                                        <wsp:OwaUsers id="owaUsers" runat="server" />
+                                    </fieldset>
+						    </tr>
+					        <tr><td>&nbsp;</td></tr>
+
+					    </table>
+                    </asp:Panel>
+					
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave" ValidationGroup="EditFolder" OnClick="btnSave_Click"></asp:Button>
+					    <asp:ValidationSummary ID="valSummary" runat="server" ShowMessageBox="True" ShowSummary="False" ValidationGroup="EditFolder" />
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.cs
new file mode 100644
index 00000000..108c1c24
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.OS;
+
+namespace WebsitePanel.Portal.ExchangeServer
+{
+    public partial class EnterpriseStorageFolderSettingsOwaEditing : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                if (!ES.Services.EnterpriseStorage.CheckUsersDomainExists(PanelRequest.ItemID))
+                {
+                    Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
+                        "ItemID=" + PanelRequest.ItemID));
+                }
+
+                BindSettings();
+            }
+        }
+
+        private void BindSettings()
+        {
+            try
+            {
+                // get settings
+                Organization org = ES.Services.Organizations.GetOrganization(PanelRequest.ItemID);
+
+                SystemFile folder = ES.Services.EnterpriseStorage.GetEnterpriseFolder(
+                    PanelRequest.ItemID, PanelRequest.FolderID);
+
+                litFolderName.Text = string.Format("{0}", folder.Name);
+
+                // bind form
+                var esPermissions = ES.Services.EnterpriseStorage.GetFolderOwaAccounts(PanelRequest.ItemID, folder);
+
+                owaUsers.SetUsers(esPermissions);
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ENETERPRISE_STORAGE_GET_FOLDER_SETTINGS", ex);
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                SystemFile folder = new SystemFile { Name = PanelRequest.FolderID };
+
+                if (!ES.Services.EnterpriseStorage.CheckEnterpriseStorageInitialization(PanelSecurity.PackageId, PanelRequest.ItemID))
+                {
+                    ES.Services.EnterpriseStorage.CreateEnterpriseStorage(PanelSecurity.PackageId, PanelRequest.ItemID);
+                }
+
+                ES.Services.EnterpriseStorage.SetFolderOwaAccounts(
+                    PanelRequest.ItemID,
+                    folder,
+                    owaUsers.GetUsers());
+
+
+                Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "enterprisestorage_folders",
+                        "ItemID=" + PanelRequest.ItemID));
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("ENTERPRISE_STORAGE_UPDATE_FOLDER_SETTINGS", ex);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.designer.cs
new file mode 100644
index 00000000..b927b94e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx.designer.cs
@@ -0,0 +1,132 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer {
+    
+    
+    public partial class EnterpriseStorageFolderSettingsOwaEditing {
+        
+        /// <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>
+        /// Image1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locTitle;
+        
+        /// <summary>
+        /// litFolderName 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 litFolderName;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageEditFolderTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// colOwaEditing control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel colOwaEditing;
+        
+        /// <summary>
+        /// panelFolderPermissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelFolderPermissions;
+        
+        /// <summary>
+        /// OwaUsersPanel 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 OwaUsersPanel;
+        
+        /// <summary>
+        /// locOwaEditingSection 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 locOwaEditingSection;
+        
+        /// <summary>
+        /// owaUsers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageOwaUsersList owaUsers;
+        
+        /// <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;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageEditFolderTabs.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageEditFolderTabs.ascx.resx
new file mode 100644
index 00000000..da04d0f8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageEditFolderTabs.ascx.resx
@@ -0,0 +1,129 @@
+<?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="Tab.FolderPermissions" xml:space="preserve">
+    <value>Folder Permissions</value>
+  </data>
+  <data name="Tab.GeneralSettings" xml:space="preserve">
+    <value>General Settings</value>
+  </data>
+  <data name="Tab.OwaEditPermissions" xml:space="preserve">
+    <value>Office Web App Editing</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageOwaUsersList.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageOwaUsersList.ascx.resx
new file mode 100644
index 00000000..47a2f1e3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/EnterpriseStorageOwaUsersList.ascx.resx
@@ -0,0 +1,156 @@
+<?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="btnAdd.Text" xml:space="preserve">
+    <value>Add...</value>
+  </data>
+  <data name="btnAddSelected.Text" xml:space="preserve">
+    <value>Add Accounts</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="ddlSearchColumnDisplayName.Text" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="ddlSearchColumnEmail.Text" xml:space="preserve">
+    <value>E-mail Address</value>
+  </data>
+  <data name="gvAccountsDisplayName.HeaderText" xml:space="preserve">
+    <value>Display Name</value>
+  </data>
+  <data name="gvAccountsEmail.HeaderText" xml:space="preserve">
+    <value>Email</value>
+  </data>
+  <data name="gvPopupAccounts.EmptyDataText" xml:space="preserve">
+    <value>No accounts found.</value>
+  </data>
+  <data name="gvUsers.EmptyDataText" xml:space="preserve">
+    <value>The list of users is empty. Click "Add..." button.</value>
+  </data>
+  <data name="gvUsersAccount.HeaderText" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="headerAddAccounts.Text" xml:space="preserve">
+    <value>Enabled Users</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx
new file mode 100644
index 00000000..1fdcdd00
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx
@@ -0,0 +1,31 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageEditFolderTabs.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageEditFolderTabs" %>
+
+<table width="100%" cellpadding="0" cellspacing="1">
+    <tr>
+        <td class="Tabs">                 
+            <asp:DataList ID="esTabs" runat="server" RepeatDirection="Horizontal" RepeatLayout="Flow" EnableViewState="false">
+                <ItemStyle Wrap="False" />
+                <ItemTemplate >
+                    <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked();">
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </ItemTemplate>
+                <SelectedItemStyle Wrap="False" />
+                <SelectedItemTemplate>
+                    <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked;">
+                        <%# Eval("Name") %>
+                    </asp:HyperLink>
+                </SelectedItemTemplate>                
+            </asp:DataList>
+        </td>
+    </tr>
+</table>
+<br />
+
+<script type="text/javascript">
+    function tabClicked() {
+        ShowProgressDialog('Loading');
+        ShowProgressDialogInternal();
+        return true;
+    }
+</script>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.cs
new file mode 100644
index 00000000..2065b00c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Portal.Code.UserControls;
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+    public partial class EnterpriseStorageEditFolderTabs : WebsitePanelControlBase
+    {
+        public string SelectedTab { get; set; }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindTabs();
+        }
+
+        private void BindTabs()
+        {
+            List<Tab> tabsList = new List<Tab>();
+            tabsList.Add(CreateTab("enterprisestorage_folder_settings", "Tab.GeneralSettings"));
+            tabsList.Add(CreateTab("enterprisestorage_folder_settings_folder_permissions", "Tab.FolderPermissions"));
+            tabsList.Add(CreateTab("enterprisestorage_folder_settings_owa_editing", "Tab.OwaEditPermissions"));
+
+            int idx = 0;
+
+            foreach (Tab tab in tabsList)
+            {
+                if (String.Compare(tab.Id, SelectedTab, true) == 0)
+                {
+                    break;
+                }
+
+                idx++;
+            }
+
+            esTabs.SelectedIndex = idx;
+            esTabs.DataSource = tabsList;
+            esTabs.DataBind();
+        }
+
+        private Tab CreateTab(string id, string text)
+        {
+            return new Tab(id,GetLocalizedString(text),
+                HostModule.EditUrl("AccountID", PanelRequest.AccountID.ToString(), id,
+                "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                "ItemID=" + PanelRequest.ItemID.ToString(), "FolderID=" + PanelRequest.FolderID));
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.designer.cs
new file mode 100644
index 00000000..8d176214
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageEditFolderTabs.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class EnterpriseStorageEditFolderTabs {
+        
+        /// <summary>
+        /// esTabs 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.DataList esTabs;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx
new file mode 100644
index 00000000..a5b8246c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx
@@ -0,0 +1,114 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="EnterpriseStorageOwaUsersList.ascx.cs" Inherits="WebsitePanel.Portal.ExchangeServer.UserControls.EnterpriseStorageOwaUsersList" %>
+
+<asp:UpdatePanel ID="UsersUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+	<div class="FormButtonsBarClean">
+		<asp:Button ID="btnAdd" runat="server" Text="Add..." CssClass="Button1"  OnClick="btnAdd_Click" meta:resourcekey="btnAdd"  />
+		<asp:Button ID="btnDelete" runat="server" Text="Delete" CssClass="Button1" OnClick="btnDelete_Click" meta:resourcekey="btnDelete"/>
+	</div>
+	<asp:GridView ID="gvUsers" runat="server" meta:resourcekey="gvUsers" AutoGenerateColumns="False"
+		Width="600px" CssSelectorClass="NormalGridView"
+		DataKeyNames="AccountName">
+		<Columns>
+			<asp:TemplateField>
+				<HeaderTemplate>
+					<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+				</HeaderTemplate>
+				<ItemTemplate>
+					<asp:CheckBox ID="chkSelect" runat="server" />
+				</ItemTemplate>
+				<ItemStyle Width="10px" />
+			</asp:TemplateField>
+			<asp:TemplateField meta:resourcekey="gvUsersAccount" HeaderText="gvUsersAccount">
+				<ItemStyle Width="96%" Wrap="false" HorizontalAlign="Left">
+				</ItemStyle>
+				<ItemTemplate>
+                    <asp:Literal ID="litAccount" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+                    <asp:HiddenField ID="hdnAccountId" runat="server" Value='<%# Eval("AccountId") %>' />
+				</ItemTemplate>
+			</asp:TemplateField>
+		</Columns>
+	</asp:GridView>
+    <br />
+
+
+<asp:Panel ID="AddAccountsPanel" runat="server" CssClass="Popup" style="display:none">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="headerAddAccounts" runat="server" meta:resourcekey="headerAddAccounts"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+<asp:UpdatePanel ID="AddAccountsUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+    <ContentTemplate>
+	            
+                <div class="FormButtonsBarClean">
+                    <div class="FormButtonsBarCleanRight">
+                        <asp:Panel ID="SearchPanel" runat="server" DefaultButton="cmdSearch">
+                            <asp:DropDownList ID="ddlSearchColumn" runat="server" CssClass="NormalTextBox">
+                                <asp:ListItem Value="DisplayName" meta:resourcekey="ddlSearchColumnDisplayName">DisplayName</asp:ListItem>
+                                <asp:ListItem Value="PrimaryEmailAddress" meta:resourcekey="ddlSearchColumnEmail">Email</asp:ListItem>
+                            </asp:DropDownList><asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100"></asp:TextBox><asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton"
+	                            CausesValidation="false" OnClick="cmdSearch_Click"/>
+                        </asp:Panel>
+                    </div>
+                </div>
+                <div class="Popup-Scroll">
+					<asp:GridView ID="gvPopupAccounts" runat="server" meta:resourcekey="gvPopupAccounts" AutoGenerateColumns="False"
+						Width="100%" CssSelectorClass="NormalGridView"
+						DataKeyNames="AccountName">
+						<Columns>
+							<asp:TemplateField>
+								<HeaderTemplate>
+									<asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+								</HeaderTemplate>
+								<ItemTemplate>
+									<asp:CheckBox ID="chkSelect" runat="server" />
+									<asp:Literal ID="litAccountType" runat="server" Visible="false" Text='<%# Eval("AccountType") %>'></asp:Literal>
+								</ItemTemplate>
+								<ItemStyle Width="10px" />
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsDisplayName">
+								<ItemStyle Width="50%" HorizontalAlign="Left"></ItemStyle>
+								<ItemTemplate>
+									<asp:Image ID="imgAccount" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
+									<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+                                    <asp:HiddenField ID="hdnAccountId" runat="server" Value='<%# Eval("AccountId") %>' />
+								</ItemTemplate>
+							</asp:TemplateField>
+							<asp:TemplateField meta:resourcekey="gvAccountsEmail">
+								<ItemStyle Width="50%" HorizontalAlign="Left"></ItemStyle>
+								<ItemTemplate>
+									<asp:Literal ID="litPrimaryEmailAddress" runat="server" Text='<%# Eval("PrimaryEmailAddress") %>'></asp:Literal>
+								</ItemTemplate>
+							</asp:TemplateField>
+						</Columns>
+					</asp:GridView>
+				</div>
+	</ContentTemplate>
+</asp:UpdatePanel>
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+			<asp:Button ID="btnAddSelected" runat="server" CssClass="Button1" meta:resourcekey="btnAddSelected" Text="Add Accounts" OnClick="btnAddSelected_Click" />
+			<asp:Button ID="btnCancelAdd" runat="server" CssClass="Button1" meta:resourcekey="btnCancel" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+        
+<asp:Button ID="btnAddAccountsFake" runat="server" style="display:none;" />
+<ajaxToolkit:ModalPopupExtender ID="AddAccountsModal" runat="server"
+	TargetControlID="btnAddAccountsFake" PopupControlID="AddAccountsPanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelAdd" />
+
+	</ContentTemplate>
+</asp:UpdatePanel>
+
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
new file mode 100644
index 00000000..3d39c38c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
@@ -0,0 +1,214 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls
+{
+    public partial class EnterpriseStorageOwaUsersList : WebsitePanelControlBase
+    {
+        public const string DirectionString = "DirectionString";
+
+        protected enum SelectedState
+        {
+            All,
+            Selected,
+            Unselected
+        }
+
+        public void SetUsers(OrganizationUser[] users)
+        {
+            BindAccounts(users, false);
+        }
+
+        public OrganizationUser[] GetUsers()
+        {
+            return GetGridViewUsers(EnterpriseStorageOwaUsersList.SelectedState.All).ToArray();
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // register javascript
+            if (!Page.ClientScript.IsClientScriptBlockRegistered("SelectAllCheckboxes"))
+            {
+                string script = @"    function SelectAllCheckboxes(box)
+                {
+		            var state = box.checked;
+                    var elm = box.parentElement.parentElement.parentElement.parentElement.getElementsByTagName(""INPUT"");
+                    for(i = 0; i < elm.length; i++)
+                        if(elm[i].type == ""checkbox"" && elm[i].id != box.id && elm[i].checked != state && !elm[i].disabled)
+		                    elm[i].checked = state;
+                }";
+                Page.ClientScript.RegisterClientScriptBlock(typeof(EnterpriseStorageOwaUsersList), "SelectAllCheckboxes",
+                    script, true);
+            }
+        }
+
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            // bind all accounts
+            BindPopupAccounts();
+
+            // show modal
+            AddAccountsModal.Show();
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            List<OrganizationUser> selectedAccounts = GetGridViewUsers(EnterpriseStorageOwaUsersList.SelectedState.Unselected);
+
+            BindAccounts(selectedAccounts.ToArray(), false);
+        }
+
+        protected void btnAddSelected_Click(object sender, EventArgs e)
+        {
+            List<OrganizationUser> selectedAccounts = GetGridViewAccounts();
+
+            BindAccounts(selectedAccounts.ToArray(), true);
+
+        }
+
+        public string GetAccountImage(int accountTypeId)
+        {
+            string imgName = string.Empty;
+
+            ExchangeAccountType accountType = (ExchangeAccountType)accountTypeId;
+            switch (accountType)
+            {
+                case ExchangeAccountType.Room:
+                    imgName = "room_16.gif";
+                    break;
+                case ExchangeAccountType.Equipment:
+                    imgName = "equipment_16.gif";
+                    break;
+                default:
+                    imgName = "admin_16.png";
+                    break;
+            }
+
+            return GetThemedImage("Exchange/" + imgName);
+        }
+
+        protected void BindPopupAccounts()
+        {
+            OrganizationUser[] accounts = ES.Services.Organizations.GetOrganizationUsersPaged(PanelRequest.ItemID, ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", null, 0, Int32.MaxValue).PageUsers;
+
+            accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();
+
+            Array.Sort(accounts, CompareAccount);
+
+            if (Direction == SortDirection.Ascending)
+            {
+                Array.Reverse(accounts);
+                Direction = SortDirection.Descending;
+            }
+            else
+                Direction = SortDirection.Ascending;
+
+            gvPopupAccounts.DataSource = accounts;
+            gvPopupAccounts.DataBind();
+        }
+
+        protected void BindAccounts(OrganizationUser[] newUsers, bool preserveExisting)
+        {
+            // get binded addresses
+            List<OrganizationUser> users = new List<OrganizationUser>();
+            if (preserveExisting)
+                users.AddRange(GetGridViewUsers(EnterpriseStorageOwaUsersList.SelectedState.All));
+
+            // add new accounts
+            if (newUsers != null)
+            {
+                foreach (OrganizationUser newUser in newUsers)
+                {
+                    // check if exists
+                    bool exists = false;
+                    foreach (OrganizationUser user in users)
+                    {
+                        if (String.Compare(user.AccountName, newUser.AccountName, true) == 0)
+                        {
+                            exists = true;
+                            break;
+                        }
+                    }
+
+                    if (exists)
+                        continue;
+
+                    users.Add(newUser);
+                }
+            }
+
+            gvUsers.DataSource = users;
+            gvUsers.DataBind();
+        }
+
+        protected List<OrganizationUser> GetGridViewUsers(EnterpriseStorageOwaUsersList.SelectedState state)
+        {
+            List<OrganizationUser> users = new List<OrganizationUser>();
+            for (int i = 0; i < gvUsers.Rows.Count; i++)
+            {
+                GridViewRow row = gvUsers.Rows[i];
+                CheckBox chkSelect = (CheckBox)row.FindControl("chkSelect");
+                if (chkSelect == null)
+                    continue;
+
+                OrganizationUser user = new OrganizationUser();
+                user.AccountName = (string)gvUsers.DataKeys[i][0];
+                user.DisplayName = ((Literal)row.FindControl("litAccount")).Text;
+                user.AccountId = Convert.ToInt32(((HiddenField)row.FindControl("hdnAccountId")).Value);
+
+                if (state == EnterpriseStorageOwaUsersList.SelectedState.All ||
+                    (state == EnterpriseStorageOwaUsersList.SelectedState.Selected && chkSelect.Checked) ||
+                    (state == EnterpriseStorageOwaUsersList.SelectedState.Unselected && !chkSelect.Checked))
+                    users.Add(user);
+            }
+
+            return users;
+        }
+
+        protected List<OrganizationUser> GetGridViewAccounts()
+        {
+            List<OrganizationUser> accounts = new List<OrganizationUser>();
+            for (int i = 0; i < gvPopupAccounts.Rows.Count; i++)
+            {
+                GridViewRow row = gvPopupAccounts.Rows[i];
+                CheckBox chkSelect = (CheckBox)row.FindControl("chkSelect");
+                if (chkSelect == null)
+                    continue;
+
+                if (chkSelect.Checked)
+                {
+                    accounts.Add(new OrganizationUser
+                    {
+                        AccountName = (string)gvPopupAccounts.DataKeys[i][0],
+                        DisplayName = ((Literal)row.FindControl("litDisplayName")).Text,
+                        AccountId = Convert.ToInt32(((HiddenField)row.FindControl("hdnAccountId")).Value)
+                    });
+                }
+            }
+
+            return accounts;
+
+        }
+
+        protected void cmdSearch_Click(object sender, ImageClickEventArgs e)
+        {
+            BindPopupAccounts();
+        }
+
+        protected SortDirection Direction
+        {
+            get { return ViewState[DirectionString] == null ? SortDirection.Descending : (SortDirection)ViewState[DirectionString]; }
+            set { ViewState[DirectionString] = value; }
+        }
+
+        protected static int CompareAccount(OrganizationUser user1, OrganizationUser user2)
+        {
+            return string.Compare(user1.DisplayName, user2.DisplayName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.designer.cs
new file mode 100644
index 00000000..d9681b0e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.designer.cs
@@ -0,0 +1,159 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ExchangeServer.UserControls {
+    
+    
+    public partial class EnterpriseStorageOwaUsersList {
+        
+        /// <summary>
+        /// UsersUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel UsersUpdatePanel;
+        
+        /// <summary>
+        /// btnAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAdd;
+        
+        /// <summary>
+        /// btnDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnDelete;
+        
+        /// <summary>
+        /// gvUsers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvUsers;
+        
+        /// <summary>
+        /// AddAccountsPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel AddAccountsPanel;
+        
+        /// <summary>
+        /// headerAddAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize headerAddAccounts;
+        
+        /// <summary>
+        /// AddAccountsUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel AddAccountsUpdatePanel;
+        
+        /// <summary>
+        /// SearchPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel SearchPanel;
+        
+        /// <summary>
+        /// ddlSearchColumn control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlSearchColumn;
+        
+        /// <summary>
+        /// txtSearchValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtSearchValue;
+        
+        /// <summary>
+        /// cmdSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
+        
+        /// <summary>
+        /// gvPopupAccounts control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvPopupAccounts;
+        
+        /// <summary>
+        /// btnAddSelected control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddSelected;
+        
+        /// <summary>
+        /// btnCancelAdd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCancelAdd;
+        
+        /// <summary>
+        /// btnAddAccountsFake control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnAddAccountsFake;
+        
+        /// <summary>
+        /// AddAccountsModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender AddAccountsModal;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index e5fa35b0..f989847b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -211,6 +211,20 @@
     <Compile Include="Code\ReportingServices\IResourceStorage.cs" />
     <Compile Include="Code\ReportingServices\ReportingServicesUtils.cs" />
     <Compile Include="Code\UserControls\Tab.cs" />
+    <Compile Include="ExchangeServer\EnterpriseStorageFolderSettingsFolderPermissions.ascx.cs">
+      <DependentUpon>EnterpriseStorageFolderSettingsFolderPermissions.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\EnterpriseStorageFolderSettingsFolderPermissions.ascx.designer.cs">
+      <DependentUpon>EnterpriseStorageFolderSettingsFolderPermissions.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\EnterpriseStorageFolderSettingsOwaEditing.ascx.cs">
+      <DependentUpon>EnterpriseStorageFolderSettingsOwaEditing.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\EnterpriseStorageFolderSettingsOwaEditing.ascx.designer.cs">
+      <DependentUpon>EnterpriseStorageFolderSettingsOwaEditing.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ExchangeServer\OrganizationDeletedUsers.ascx.cs">
       <DependentUpon>OrganizationDeletedUsers.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -229,6 +243,20 @@
       <DependentUpon>OrganizationDeletedUserGeneralSettings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="ExchangeServer\UserControls\EnterpriseStorageEditFolderTabs.ascx.cs">
+      <DependentUpon>EnterpriseStorageEditFolderTabs.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\EnterpriseStorageEditFolderTabs.ascx.designer.cs">
+      <DependentUpon>EnterpriseStorageEditFolderTabs.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\EnterpriseStorageOwaUsersList.ascx.cs">
+      <DependentUpon>EnterpriseStorageOwaUsersList.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ExchangeServer\UserControls\EnterpriseStorageOwaUsersList.ascx.designer.cs">
+      <DependentUpon>EnterpriseStorageOwaUsersList.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ProviderControls\SmarterMail100_EditAccount.ascx.cs">
       <DependentUpon>SmarterMail100_EditAccount.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4455,7 +4483,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ApplyEnableHardQuotaFeature.ascx" />
+    <Content Include="ExchangeServer\EnterpriseStorageFolderSettingsFolderPermissions.ascx" />
+    <Content Include="ExchangeServer\EnterpriseStorageFolderSettingsOwaEditing.ascx" />
     <Content Include="ExchangeServer\ExchangeCheckDomainName.ascx" />
+    <Content Include="ExchangeServer\UserControls\EnterpriseStorageEditFolderTabs.ascx" />
+    <Content Include="ExchangeServer\UserControls\EnterpriseStorageOwaUsersList.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditAccount.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditDomain.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditDomain_Features.ascx" />
@@ -4499,6 +4531,10 @@
     <Content Include="ProviderControls\App_LocalResources\SmarterMail100_EditList.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\EnterpriseStorageEditFolderTabs.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageFolderSettingsFolderPermissions.ascx.resx" />
+    <Content Include="ExchangeServer\UserControls\App_LocalResources\EnterpriseStorageOwaUsersList.ascx.resx" />
+    <Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageFolderSettingsOwaEditing.ascx.resx" />
     <EmbeddedResource Include="RDS\App_LocalResources\RDSEditCollectionSettings.ascx.resx" />
     <Content Include="RDS\AssignedRDSServers.ascx" />
     <Content Include="RDS\AddRDSServer.ascx" />

From 6dc1d0c259ff9180dede4db9800b086f0b2165ac Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 2 Mar 2015 05:10:53 -0800
Subject: [PATCH 02/46] webdav portal root quote added

---
 .../Sources/WebsitePanel.WebDav.Core/IFolder.cs   |  4 ++--
 .../Sources/WebsitePanel.WebDav.Core/IResource.cs |  1 +
 .../Managers/WebDavManager.cs                     |  6 +++---
 .../WebsitePanel.WebDavPortal/Content/Site.css    | 10 ++++++++++
 .../Controllers/FileSystemController.cs           |  4 ++--
 .../Profiles/Webdav/ResourceTableItemProfile.cs   |  2 ++
 .../Models/FileSystem/ResourceTableItemModel.cs   |  3 +++
 .../Scripts/appScripts/fileBrowsing.js            | 15 ++++++++++++---
 8 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
index f37b9f94..52b32743 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
@@ -295,11 +295,11 @@ namespace WebsitePanel.WebDav.Core
                     {
                         XmlResponseList = XmlDoc.GetElementsByTagName("d:response");
                     }
-                    var children = new WebDavHierarchyItem[XmlResponseList.Count];
+                    var children = new WebDavResource[XmlResponseList.Count];
                     int counter = 0;
                     foreach (XmlNode XmlCurrentResponse in XmlResponseList)
                     {
-                        var item = new WebDavHierarchyItem();
+                        var item = new WebDavResource();
                         item.SetCredentials(_credentials);
 
                         foreach (XmlNode XmlCurrentNode in XmlCurrentResponse.ChildNodes)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
index d1545431..34f4f81a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
@@ -50,6 +50,7 @@ namespace WebsitePanel.WebDav.Core
                 SendChunked = false;
                 AllowWriteStreamBuffering = false;
 
+                IsRootItem = item.IsRootItem;
                 SetCredentials(credentials);
                 SetHierarchyItem(item);
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
index 98ea32ec..4d1ab904 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
@@ -50,9 +50,9 @@ namespace WebsitePanel.WebDav.Core.Managers
                 children = ConnectToWebDavServer().Select(x => new WebDavResource
                 {
                     Href = new Uri(x.Url), 
-                    ItemType = ItemType.Folder, 
-                    ContentLength = x.Size, 
-                    AllocatedSpace = x.FRSMQuotaMB, 
+                    ItemType = ItemType.Folder,
+                    ContentLength = x.Size * 1024 * 1024,
+                    AllocatedSpace = x.FRSMQuotaMB * 1024 * 1024, 
                     IsRootItem = true
                 }).ToArray();
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index f539d480..9137665c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -295,6 +295,16 @@ tr.selected-file {
     display: block;
 }
 
+.column-name  {
+    position: relative;
+}
+
+.column-name #quota {
+    position: absolute;
+    right: 0px;
+    top: 20%;
+}
+
 /* Theme Mods */
 
 input,div{border-radius:0px!important;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index dbb50095..46beea31 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -151,11 +151,11 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
             if (string.IsNullOrEmpty(dtRequest.Search.Value) == false)
             {
-                folderItems = _webdavManager.SearchFiles(WspContext.User.ItemId, pathPart, dtRequest.Search.Value, WspContext.User.Login, true).Select(x => new WebDavResource(null, x));
+                folderItems = _webdavManager.SearchFiles(WspContext.User.ItemId, pathPart, dtRequest.Search.Value, WspContext.User.Login, true).Cast<WebDavResource>();
             }
             else
             {
-                folderItems = _webdavManager.OpenFolder(pathPart).Select(x=>new WebDavResource(null, x));
+                folderItems = _webdavManager.OpenFolder(pathPart).Cast<WebDavResource>();
             }
 
             var tableItems = Mapper.Map<IEnumerable<WebDavResource>, IEnumerable<ResourceTableItemModel>>(folderItems).ToList();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
index a20e44b3..cc712682 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
@@ -45,7 +45,9 @@ namespace WebsitePanel.WebDavPortal.Mapping.Profiles.Webdav
                 .ForMember(ti => ti.LastModified, x => x.MapFrom(hi => hi.LastModified))
                 .ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
 
+                .ForMember(ti => ti.IsRoot, x => x.MapFrom(hi => hi.IsRootItem))
                 .ForMember(ti => ti.Size, x => x.MapFrom(hi => hi.ContentLength))
+                .ForMember(ti => ti.Quota, x => x.MapFrom(hi => hi.AllocatedSpace))
                 .ForMember(ti => ti.IsFolder, x => x.MapFrom(hi => hi.ItemType == ItemType.Folder));
         }
     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
index 24ac5e13..2d2121cf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
@@ -12,11 +12,14 @@ namespace WebsitePanel.WebDavPortal.Models.FileSystem
         public bool IsTargetBlank { get; set; }
         public bool IsFolder { get; set; }
         public long Size { get; set; }
+        public bool IsRoot { get; set; }
+        public long Quota { get; set; }
         public string Type { get; set; }
         public DateTime LastModified { get; set; }
         public string LastModifiedFormated { get; set; }
         public string IconHref { get; set; }
 
+
         public override dynamic this[int index]
         {
             get
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
index 10478859..ec557926 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
@@ -86,10 +86,11 @@ WspFileBrowser.prototype = {
             "columnDefs": [
                 {
                     "render": function(data, type, row) {
-                        return '<img class="table-icon" src="' + row.IconHref + '"/>' +
-                            '<a href="' + row.Url + '" ' + (row.IsTargetBlank ? 'target="_blank"' : '') + ' class="file-link ' + (row.IsFolder ?  'processing-dialog':'') + '" title="' + row.DisplayName + '">' +
+                        return '<div class="column-name"><img class="table-icon" src="' + row.IconHref + '"/>' +
+                            '<a href="' + row.Url + '" ' + (row.IsTargetBlank ? 'target="_blank"' : '') + ' class="file-link" title="' + row.DisplayName + '">' +
                                     row.DisplayName +
-                                '</a>';
+                                '</a>' + (row.IsRoot ? '<span id="quota">' + wsp.fileBrowser.bytesToSize(row.Size) + ' / ' + wsp.fileBrowser.bytesToSize(row.Quota) + '</span>' : '')
+                        +'</div>';
                     },
                     "targets": 0
                 },
@@ -186,6 +187,14 @@ WspFileBrowser.prototype = {
                 }
             });
         };
+    },
+
+    bytesToSize: function(bytes) {
+        if (bytes == 0) return '0 Byte';
+        var k = 1024;
+        var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+        var i = Math.floor(Math.log(bytes) / Math.log(k));
+        return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
     }
 };
 

From b51b6ee201edf7c62a60d4f3b6b3501d4ce1039c Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 2 Mar 2015 10:29:07 -0500
Subject: [PATCH 03/46] Added tag build-2.1.0.599 for changeset fe670172cd10


From ef3d4d2e5089bac193d918d2450dd65161061a9c Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 2 Mar 2015 12:20:48 -0500
Subject: [PATCH 04/46] Added tag build-2.1.0.600 for changeset e2e05db39b2b


From 716855ae0551656dc29f6644a7168c6d8522ef21 Mon Sep 17 00:00:00 2001
From: dev_amdtel <devnull@localhost>
Date: Mon, 2 Mar 2015 23:44:26 +0400
Subject: [PATCH 05/46] fix import existing resources for old dns providers
 (including SimpleDNS)

---
 .../DnsServers/DnsServerController.cs                        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
index d659f9aa..bab622ac 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
@@ -32,6 +32,7 @@ using System.Collections.Specialized;
 using System.Globalization;
 using System.Linq;
 using System.Xml;
+using System.Text;
 using System.Xml.Serialization;
 using WebsitePanel.Providers;
 using WebsitePanel.Providers.DNS;
@@ -385,7 +386,9 @@ namespace WebsitePanel.EnterpriseServer
             var idn = new IdnMapping();
 
             if (itemType == typeof(DnsZone))
-                items.AddRange(dns.GetZones().Select(z => idn.GetUnicode(z)));
+                items.AddRange(dns.GetZones().Select(z =>
+                    Encoding.UTF8.GetByteCount(z) == z.Length ? // IsASCII
+                    idn.GetUnicode(z) : z ));
 
             return items;
         }

From 170cdc035827041909ea8f883cb4751084820558 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 2 Mar 2015 20:15:58 -0500
Subject: [PATCH 06/46] Remove Duplicate Handlers

---
 WebsitePanel/Sources/WebsitePanel.Server/Web.config | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Web.config b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
index d9d1bde5..0dcd0c7d 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
@@ -5,17 +5,6 @@
     <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"/>

From d7af90326c21dc19eaa9d978f7c286f20b408d08 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 2 Mar 2015 20:29:52 -0500
Subject: [PATCH 07/46] Added tag build-2.1.0.601 for changeset 8ccdc857fa3f


From 6af59c8cc86a6dd4da0efa6a2a8d015ca639975b Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 2 Mar 2015 22:48:46 -0500
Subject: [PATCH 08/46] Added tag build-2.1.0.602 for changeset 28e4e60c0e5c


From 839f6cda2b7198e05e6a193c0374e91574aeb444 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 2 Mar 2015 23:46:37 -0800
Subject: [PATCH 09/46] owa editing groups added

---
 .../EnterpriseStorageFolderSettingsOwaEditing.ascx.resx      | 2 +-
 .../EnterpriseStorageFolderSettingsOwaEditing.ascx           | 2 +-
 .../UserControls/EnterpriseStorageOwaUsersList.ascx.cs       | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
index 33677cf3..012d8bf8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
@@ -127,7 +127,7 @@
     <value>Office Web App Editing</value>
   </data>
   <data name="locOwaEditingSection.Text" xml:space="preserve">
-    <value>Users</value>
+    <value>Users And Groups</value>
   </data>
   <data name="locTitle.Text" xml:space="preserve">
     <value>Edit Folder</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
index 5a88b08e..07ed6c6c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
@@ -34,7 +34,7 @@
 						    <tr>
 							    <td colspan="2">
                                     <fieldset id="OwaUsersPanel" runat="server">
-                                        <legend><asp:Localize ID="locOwaEditingSection" runat="server" meta:resourcekey="locOwaEditingSection" Text="Users"></asp:Localize></legend>
+                                        <legend><asp:Localize ID="locOwaEditingSection" runat="server" meta:resourcekey="locOwaEditingSection" Text="Users And Groups"></asp:Localize></legend>
                                         <wsp:OwaUsers id="owaUsers" runat="server" />
                                     </fieldset>
 						    </tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
index 3d39c38c..bf79f327 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
@@ -94,7 +94,8 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
 
         protected void BindPopupAccounts()
         {
-            OrganizationUser[] accounts = ES.Services.Organizations.GetOrganizationUsersPaged(PanelRequest.ItemID, ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", null, 0, Int32.MaxValue).PageUsers;
+            ExchangeAccount[] accounts = ES.Services.EnterpriseStorage.SearchESAccounts(PanelRequest.ItemID,
+                ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", "");
 
             accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();
 
@@ -206,7 +207,7 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             set { ViewState[DirectionString] = value; }
         }
 
-        protected static int CompareAccount(OrganizationUser user1, OrganizationUser user2)
+        protected static int CompareAccount(ExchangeAccount user1, ExchangeAccount user2)
         {
             return string.Compare(user1.DisplayName, user2.DisplayName);
         }

From 0ebe24141ee12bd94f0f62b8c8d826670a04a4ed Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 3 Mar 2015 06:41:52 -0800
Subject: [PATCH 10/46] webdav portal search view added

---
 .../OS/SystemFile.cs                          |   1 +
 .../Windows2012.cs                            |   6 +-
 .../Extensions/UriExtensions.cs               |   2 +-
 .../WebsitePanel.WebDav.Core/IItemContent.cs  |   1 +
 .../WebsitePanel.WebDav.Core/IResource.cs     |   2 +
 .../Interfaces/Managers/IWebDavManager.cs     |   1 +
 .../Managers/WebDavManager.cs                 |  15 +--
 .../App_Start/RouteConfig.cs                  |  12 ++
 .../App_Start/Routes/FileSystemRouteNames.cs  |   3 +
 .../Content/Site.css                          |  43 ++++++-
 .../Controllers/FileSystemController.cs       |  31 ++++-
 .../Webdav/ResourceTableItemProfile.cs        |   1 +
 .../FileSystem/ResourceTableItemModel.cs      |   5 +-
 .../Resources/UI.Designer.cs                  |  36 ++++++
 .../Resources/UI.resx                         |  12 ++
 .../Scripts/appScripts/authentication.js      |  11 +-
 .../Scripts/appScripts/fileBrowsing.js        | 109 +++++++++++++++---
 .../Views/FileSystem/ShowContent.cshtml       |   6 -
 .../ShowContentSearchResultTable.cshtml       |  28 +++++
 .../FileSystem/_ShowContentBigIcons.cshtml    |  15 ---
 .../Views/FileSystem/_ShowContentTable.cshtml |   5 -
 .../FileSystem/_ShowContentTopMenu.cshtml     |  89 +++++++++-----
 .../Views/Shared/_Layout.cshtml               |   9 +-
 .../WebsitePanel.WebDavPortal.csproj          |   1 +
 24 files changed, 345 insertions(+), 99 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
index 830bccab..83d68d90 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
@@ -145,6 +145,7 @@ namespace WebsitePanel.Providers.OS
         }
 
         public string RelativeUrl { get; set; }
+        public string Summary { get; set; }
 
         public string DriveLetter
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
index e5ff425c..b2eed0b3 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
@@ -304,7 +304,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
                     var rootFolder = Path.Combine(settings.LocationDrive + ":\\", settings.HomeFolder);
                     rootFolder = Path.Combine(rootFolder, organizationId);
 
-                    var wsSql = string.Format(@"SELECT System.FileName, System.DateModified, System.Size, System.Kind, System.ItemPathDisplay, System.ItemType FROM SYSTEMINDEX WHERE System.FileName LIKE '%{0}%' AND ({1})",
+                    var wsSql = string.Format(@"SELECT System.FileName, System.DateModified, System.Size, System.Kind, System.ItemPathDisplay, System.ItemType, System.Search.AutoSummary FROM SYSTEMINDEX WHERE System.FileName LIKE '%{0}%' AND ({1})",
                         searchText, string.Join(" OR ", searchPaths.Select(x => string.Format("{0} = '{1}'", recursive ? "SCOPE" : "DIRECTORY", Path.Combine(rootFolder, x))).ToArray()));
 
                     conn.Open();
@@ -318,7 +318,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
                             var file = new SystemFile {Name = reader[0] as string};
 
                             file.Changed = file.CreatedDate = reader[1] is DateTime ? (DateTime)reader[1] : new DateTime();
-                            file.Size = reader[2] is long ? (long) reader[2] : 0;
+                            file.Size = reader[2] is Decimal ? Convert.ToInt64((Decimal) reader[2]) : 0;
 
                             var kind = reader[3] is IEnumerable ? ((IEnumerable)reader[3]).Cast<string>().ToList() : null;
                             var itemType = reader[5] as string ?? string.Empty;
@@ -342,6 +342,8 @@ namespace WebsitePanel.Providers.EnterpriseStorage
                                 }
                             }
 
+                            file.Summary = reader[6] as string;
+
                             result.Add(file);
                         }
                     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
index 3f6bd4c6..8ba4aeeb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
@@ -3,7 +3,7 @@ using System.Linq;
 
 namespace WebsitePanel.WebDav.Core.Extensions
 {
-    static class UriExtensions
+    public static class UriExtensions
     {
         public static Uri Append(this Uri uri, params string[] paths)
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IItemContent.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IItemContent.cs
index 399aeba0..681efa2e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IItemContent.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IItemContent.cs
@@ -9,6 +9,7 @@ namespace WebsitePanel.WebDav.Core
             long ContentLength { get; }
             long AllocatedSpace { get; set; }
             string ContentType { get; }
+            string Summary { get; set; }
 
             void Download(string filename);
             byte[] Download();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
index 34f4f81a..1a099ebf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
@@ -89,6 +89,8 @@ namespace WebsitePanel.WebDav.Core
                 }
             }
 
+            public string Summary { get; set; }
+
             /// <summary>
             ///     Downloads content of the resource to a file specified by filename
             /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/IWebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/IWebDavManager.cs
index fd1fdc3a..bf634dd8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/IWebDavManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/IWebDavManager.cs
@@ -19,5 +19,6 @@ namespace WebsitePanel.WebDav.Core.Interfaces.Managers
         string GetFileUrl(string path);
         void DeleteResource(string path);
         void LockFile(string path);
+        string GetFileFolderPath(string path);
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
index 4d1ab904..d3f837a7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
@@ -103,7 +103,7 @@ namespace WebsitePanel.WebDav.Core.Managers
 
         public bool IsFile(string path)
         {
-            string folder = GetFileFolder(path);
+            string folder = GetFileFolderPath(path);
 
             if (string.IsNullOrWhiteSpace(folder))
             {
@@ -124,7 +124,7 @@ namespace WebsitePanel.WebDav.Core.Managers
         {
             try
             {
-                string folder = GetFileFolder(path);
+                string folder = GetFileFolderPath(path);
 
                 var resourceName = GetResourceName(path);
 
@@ -212,7 +212,7 @@ namespace WebsitePanel.WebDav.Core.Managers
             path = RemoveLeadingFromPath(path, "edit");
             path = RemoveLeadingFromPath(path, WspContext.User.OrganizationId);
 
-            string folderPath = GetFileFolder(path);
+            string folderPath = GetFileFolderPath(path);
 
             OpenFolder(folderPath);
 
@@ -232,7 +232,7 @@ namespace WebsitePanel.WebDav.Core.Managers
         {
             try
             {
-                string folder = GetFileFolder(path);
+                string folder = GetFileFolderPath(path);
 
                 var resourceName = GetResourceName(path);
 
@@ -250,7 +250,7 @@ namespace WebsitePanel.WebDav.Core.Managers
         {
             try
             {
-                string folder = GetFileFolder(path);
+                string folder = GetFileFolderPath(path);
 
                 var resourceName = GetResourceName(path);
 
@@ -270,7 +270,7 @@ namespace WebsitePanel.WebDav.Core.Managers
         {
             try
             {
-                string folder = GetFileFolder(path);
+                string folder = GetFileFolderPath(path);
 
                 var resourceName = GetResourceName(path);
 
@@ -345,6 +345,7 @@ namespace WebsitePanel.WebDav.Core.Managers
                 webDavitem.SetLastModified(file.Changed);
                 webDavitem.ContentLength = file.Size;
                 webDavitem.AllocatedSpace = file.FRSMQuotaMB;
+                webDavitem.Summary = file.Summary;
 
                 convertResult.Add(webDavitem);
             }
@@ -372,7 +373,7 @@ namespace WebsitePanel.WebDav.Core.Managers
                 targetStream.Write(buffer, 0, n);
         }
 
-        private string GetFileFolder(string path)
+        public string GetFileFolderPath(string path)
         {
             path = path.TrimEnd('/');
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
index 1a5981a4..a5dc75e8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
@@ -46,6 +46,18 @@ namespace WebsitePanel.WebDavPortal
 
             #region Enterprise storage 
 
+            routes.MapRoute(
+                    name: FileSystemRouteNames.SearchFiles,
+                    url: "storage/search/{org}/{*pathPart}",
+                    defaults: new { controller = "FileSystem", action = "SearchFiles", pathPart = UrlParameter.Optional }
+                    );
+
+            routes.MapRoute(
+                    name: FileSystemRouteNames.SearchFilesContent,
+                    url: "storage/ajax/search/{org}/{*pathPart}",
+                    defaults: new { controller = "FileSystem", action = "SearchFilesContent", pathPart = UrlParameter.Optional }
+                    );
+
             routes.MapRoute(
                     name: FileSystemRouteNames.ChangeWebDavViewType,
                     url: "storage/change-view-type/{viewType}",
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
index 23ac46e2..9a6832b2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
@@ -21,5 +21,8 @@ namespace WebsitePanel.WebDavPortal.UI.Routes
         public const string DeleteFiles = "DeleteFilesRoute";
 
         public const string DownloadFile = "DownloadFileRoute";
+
+        public const string SearchFiles = "SearchFilesRoute";
+        public const string SearchFilesContent = "SearchFilesPostRoute";
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index 9137665c..988dabfa 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -60,6 +60,17 @@ tr.selected-file {
 
 .table-icon {
     height: 30px;
+    vertical-align: top;
+}
+
+.column-name .file-info {
+    display: inline-block;
+    padding-left: 5px;
+    width: 90%;
+}
+
+.table-icon.search {
+    height: 45px;
 }
 
 .noselect {
@@ -77,6 +88,8 @@ tr.selected-file {
 
 #webdav-items-table .file-link {
     padding-left: 5px;
+    padding-top: 5px;
+    display: inline-block;
     vertical-align: middle !important;
 }
 
@@ -86,6 +99,11 @@ tr.selected-file {
     height: 32px;
 }
 
+#summary.summary {
+    font-size: 11px;
+    color: rgb(152, 152, 152);
+}
+
 .drag-and-drop-area input {
     /* IE 8 */
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
@@ -252,16 +270,29 @@ tr.selected-file {
     width: 200px;
 }
 
-.search-block {
-    float: right;
+.breadcrumb-wsp {
+    display: inline-block;
+    padding-top: 5px;    
 }
 
-.search-block input, .search-block label {
+.search-block {
+    float: right;
+    margin-right: 10px !important;
+    width: 36%;
+}
+
+.search-block input{
+    display: inline-block;
+    font-weight: normal;
+}
+
+.search-block label {
     display: inline-block;
     width: initial;
     font-weight: normal;
 }
 
+
 .elements-container {
     padding-top: 10px;
 }
@@ -371,4 +402,10 @@ div#breadcrumb_wrapper a:last-child {
 .header-portal-title {
     float: none;
     display: inline-block;
+}
+
+@media (min-width: 768px) {
+    .navbar-right {
+        margin-right: 0;
+    }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 46beea31..9d4016e1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -35,6 +35,7 @@ using WebsitePanel.WebDavPortal.Models.Common.Enums;
 using WebsitePanel.WebDavPortal.Models.FileSystem;
 using WebsitePanel.WebDavPortal.UI;
 using WebsitePanel.WebDavPortal.UI.Routes;
+using WebsitePanel.WebDav.Core.Extensions;
 
 namespace WebsitePanel.WebDavPortal.Controllers
 
@@ -143,7 +144,6 @@ namespace WebsitePanel.WebDavPortal.Controllers
             }
         }
 
-
         [HttpGet]
         public ActionResult GetContentDetails(string org, string pathPart, [ModelBinder(typeof (JqueryDataTableModelBinder))] JqueryDataTableRequest dtRequest)
         {
@@ -160,7 +160,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
             var tableItems = Mapper.Map<IEnumerable<WebDavResource>, IEnumerable<ResourceTableItemModel>>(folderItems).ToList();
 
-            FillContentModel(tableItems);
+            FillContentModel(tableItems, org);
 
             var orders = dtRequest.Orders.ToList();
             orders.Insert(0, new JqueryDataTableOrder{Column = 3, Ascending = false});
@@ -184,6 +184,24 @@ namespace WebsitePanel.WebDavPortal.Controllers
             return PartialView("_ResourseCollectionPartial", result);
         }
 
+        public ActionResult SearchFiles(string org, string pathPart, string searchValue)
+        {
+            if (string.IsNullOrEmpty(searchValue))
+            {
+                return RedirectToRoute(FileSystemRouteNames.ShowContentPath);
+            }
+
+            var model = new ModelForWebDav
+            {
+                UrlSuffix = pathPart,
+                Permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, pathPart),
+                UserSettings = _userSettingsManager.GetUserSettings(WspContext.User.AccountId),
+                SearchValue = searchValue
+            };
+
+            return View("ShowContentSearchResultTable", model);
+        }
+
         [HttpGet]
         public ActionResult DownloadFile(string org, string pathPart)
         {
@@ -329,17 +347,17 @@ namespace WebsitePanel.WebDavPortal.Controllers
         }
         #endregion
 
-        private void FillContentModel(IEnumerable<ResourceTableItemModel> items)
+        private void FillContentModel(IEnumerable<ResourceTableItemModel> items, string organizationId)
         {
             foreach (var item in items)
             {
                 var opener = _openerManager[Path.GetExtension(item.DisplayName)];
+                var pathPart = item.Href.AbsolutePath.Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
 
                 switch (opener)
                 {
                     case FileOpenerType.OfficeOnline:
                     {
-                        var pathPart = item.Href.AbsolutePath.Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
                         item.Url = string.Concat(Url.RouteUrl(FileSystemRouteNames.EditOfficeOnline, new {org = WspContext.User.OrganizationId, pathPart = ""}), pathPart);
                         break;
                     }
@@ -350,6 +368,11 @@ namespace WebsitePanel.WebDavPortal.Controllers
                     }
                 }
 
+                var folderPath = Server.UrlDecode(_webdavManager.GetFileFolderPath(pathPart));
+
+                item.FolderUrlAbsoluteString =  Server.UrlDecode(Url.RouteUrl(FileSystemRouteNames.ShowContentPath, new  {org = organizationId, pathPart = folderPath}, Request.Url.Scheme));
+                item.FolderUrlLocalString = Url.RouteUrl(FileSystemRouteNames.ShowContentPath, new { org = organizationId, pathPart = folderPath });
+
                 if (Request.Browser.IsMobileDevice)
                 {
                     item.IsTargetBlank = false;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
index cc712682..17d1b07e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
@@ -45,6 +45,7 @@ namespace WebsitePanel.WebDavPortal.Mapping.Profiles.Webdav
                 .ForMember(ti => ti.LastModified, x => x.MapFrom(hi => hi.LastModified))
                 .ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
 
+                .ForMember(ti => ti.Summary, x => x.MapFrom(hi => hi.Summary))
                 .ForMember(ti => ti.IsRoot, x => x.MapFrom(hi => hi.IsRootItem))
                 .ForMember(ti => ti.Size, x => x.MapFrom(hi => hi.ContentLength))
                 .ForMember(ti => ti.Quota, x => x.MapFrom(hi => hi.AllocatedSpace))
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
index 2d2121cf..bc605c28 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Models/FileSystem/ResourceTableItemModel.cs
@@ -18,7 +18,10 @@ namespace WebsitePanel.WebDavPortal.Models.FileSystem
         public DateTime LastModified { get; set; }
         public string LastModifiedFormated { get; set; }
         public string IconHref { get; set; }
-
+        public string FolderUrlAbsoluteString { get; set; }
+        public string FolderUrlLocalString { get; set; }
+        public string FolderName { get; set; }
+        public string Summary { get; set; }
 
         public override dynamic this[int index]
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
index e3836593..0aa9d823 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
@@ -150,6 +150,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File.
+        /// </summary>
+        public static string File {
+            get {
+                return ResourceManager.GetString("File", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File Upload.
         /// </summary>
@@ -168,6 +177,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Info.
+        /// </summary>
+        public static string Info {
+            get {
+                return ResourceManager.GetString("Info", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} items was removed..
         /// </summary>
@@ -258,6 +276,24 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Search Documents.
+        /// </summary>
+        public static string SearchDocuments {
+            get {
+                return ResourceManager.GetString("SearchDocuments", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search Results.
+        /// </summary>
+        public static string SearchResults {
+            get {
+                return ResourceManager.GetString("SearchResults", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Select files to upload.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
index 5cb4b1a3..7d3fbf56 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
@@ -147,12 +147,18 @@
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="File" xml:space="preserve">
+    <value>File</value>
+  </data>
   <data name="FileUpload" xml:space="preserve">
     <value>File Upload</value>
   </data>
   <data name="GigabyteShort" xml:space="preserve">
     <value>Gb</value>
   </data>
+  <data name="Info" xml:space="preserve">
+    <value>Info</value>
+  </data>
   <data name="ItemsWasRemovedFormat" xml:space="preserve">
     <value>{0} items was removed.</value>
   </data>
@@ -183,6 +189,12 @@
   <data name="Search" xml:space="preserve">
     <value>Search</value>
   </data>
+  <data name="SearchDocuments" xml:space="preserve">
+    <value>Search Documents</value>
+  </data>
+  <data name="SearchResults" xml:space="preserve">
+    <value>Search Results</value>
+  </data>
   <data name="SelectFilesToUpload" xml:space="preserve">
     <value>Select files to upload</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/authentication.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/authentication.js
index 3752ad1e..35a5b8ff 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/authentication.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/authentication.js
@@ -1,18 +1,19 @@
-function CheckAuthenticationExpiration(authcookieName, logoutUrl) {
-    var c = $.cookie(authcookieName);
-
+function CheckAuthenticationExpiration(authTimeOutCookieName, authCookieName, logoutUrl) {
+    var c = $.cookie(authTimeOutCookieName);
+    
     if (c != null && c != "" && !isNaN(c)) {
         var now = new Date();
         var ms = parseInt(c, 10);
         var expiration = new Date().setTime(ms);
         if (now > expiration) {
+            $.removeCookie(authTimeOutCookieName, { path: '/' });
             window.location.replace(logoutUrl);
         }
     }
 }
 
-function StartAuthExpirationCheckTimer(authcookieName, logoutUrl) {
+function StartAuthExpirationCheckTimer(authTimeOutCookieName, authCookieName, logoutUrl) {
     setInterval(function() {
-        CheckAuthenticationExpiration(authcookieName, logoutUrl);
+        CheckAuthenticationExpiration(authTimeOutCookieName, authCookieName, logoutUrl);
     }, 20000);
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
index ec557926..f14edab4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
@@ -1,6 +1,12 @@
 function WspFileBrowser() {
-    this.settings = { deletionBlockSelector: ".file-actions-menu .file-deletion", deletionUrl: "storage/files-group-action/delete" };
-    this.table = null;
+    this.settings = {
+        deletionBlockSelector: ".file-actions-menu .file-deletion",
+        deletionUrl: "storage/files-group-action/delete",
+        textDateModified: "Date modified",
+        textSize: "Size"
+    };
+    this.itemsTable = null;
+    this.searchTable = null;
 }
 
 WspFileBrowser.prototype = {
@@ -34,7 +40,8 @@ WspFileBrowser.prototype = {
         }).get();
     },
 
-    deleteSelectedItems: function(e) {
+    deleteSelectedItems: function (e) {
+
         $.ajax({
             type: 'POST',
             url: wsp.fileBrowser.settings.deletionUrl,
@@ -45,7 +52,7 @@ WspFileBrowser.prototype = {
 
                 wsp.fileBrowser.clearDeletedItems(model.DeletedFiles);
                 wsp.fileBrowser.refreshDeletionBlock();
-                wsp.fileBrowser.refreshDataTable();
+                wsp.fileBrowser.refreshDataTable(wsp.fileBrowser.itemsTable);
 
                 wsp.dialogs.hideProcessDialog();
             },
@@ -53,7 +60,7 @@ WspFileBrowser.prototype = {
                 wsp.messages.addErrorMessage(errorThrown);
 
                 wsp.fileBrowser.refreshDeletionBlock();
-                wsp.fileBrowser.refreshDataTable();
+                wsp.fileBrowser.refreshDataTable(wsp.fileBrowser.itemsTable);
 
                 wsp.dialogs.hideProcessDialog();
             }
@@ -79,10 +86,11 @@ WspFileBrowser.prototype = {
     },
 
     initDataTable: function (tableId, ajaxUrl) {
-        this.table = $(tableId).dataTable({
+        this.itemsTable = $(tableId).dataTable({
             "ajax": ajaxUrl,
             "processing": false,
             "serverSide": true,
+            "dom": 'rtlp',
             "columnDefs": [
                 {
                     "render": function(data, type, row) {
@@ -128,18 +136,87 @@ WspFileBrowser.prototype = {
 
         $(tableId).removeClass('dataTable');
 
-        var oTable = this.table;
-        $(tableId+'_filter input').unbind();
-        $(tableId+'_filter input').bind('keyup', function (e) {
-            if (e.keyCode == 13) {
-                oTable.fnFilter(this.value);
-            }
-        });
+        //var oTable = this.table;
+
+        //$(searchInputId).bind('keyup', function (e) {
+        //    if (e.keyCode == 13) {
+        //        oTable.fnFilter(this.value);
+        //    }
+        //});
+
+        //$(searchInputId).keydown(function (event) {
+        //    if (event.keyCode == 13) {
+        //        event.preventDefault();
+        //        return false;
+        //    }
+
+        //    return true;
+        //});
+
     },
 
-    refreshDataTable: function () {
-        if (this.table != null) {
-            this.table.fnDraw(false);
+    initSearchDataTable: function (tableId, ajaxUrl, initSearch) {
+
+        var settings = this.settings;
+        var classThis = this;
+
+        this.searchTable = $(tableId).dataTable({
+            "ajax": ajaxUrl,
+            "processing": false,
+            "serverSide": true,
+            "oSearch": { "sSearch": initSearch },
+            "dom": 'rtlp',
+            "columnDefs": [
+                {
+                    "render": function (data, type, row) {
+                        return '<div class="column-name">' +
+                                    '<img class="table-icon search" src="' + row.IconHref + '"/>' +
+                                    '<div class="file-info">' +
+                                        '<a href="' + row.Url + '" ' + (row.IsTargetBlank ? 'target="_blank"' : '') + ' class="file-link" title="' + row.DisplayName + '">' +
+                                            row.DisplayName +
+                                        '</a>' +
+                                        '<div id="summary" class="summary">' + (row.Summary ? (row.Summary + '').substring(0, 500) + '...' : '') + '</div>' +
+                                        '<div>' +
+                                            '<a href="' + row.FolderUrlLocalString + '" ' + 'target="_blank" class="file-link" >' +
+                                                  row.FolderUrlAbsoluteString +
+                                            '</a>' +
+                                        '</div>' +
+                                    '</div>' +
+                                '</div>';
+                    },
+                    "targets": 0
+                },
+                {
+                    "render": function (data, type, row) {
+                        return '<div>' +settings.textDateModified+': '+ row.LastModifiedFormated+ '</div>' +
+                                '<div>' + settings.textSize + ': ' + classThis.bytesToSize(row.Size) + '</div>';
+                    },
+                    "orderable": false,
+                    "width": "25%",
+                    "targets": 1
+                }
+            ],
+            "createdRow": function (row, data, index) {
+                $(row).addClass('element-container');
+            },
+            "fnPreDrawCallback": function () {
+                // gather info to compose a message
+                wsp.dialogs.showProcessDialog();
+                return true;
+            },
+            "fnDrawCallback": function () {
+                // in case your overlay needs to be put away automatically you can put it here
+                wsp.dialogs.hideProcessDialog();
+            }
+        });
+
+        $(tableId).removeClass('dataTable');
+
+    },
+
+    refreshDataTable: function (table) {
+        if (table != null) {
+            table.fnDraw(false);
         }
     },
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
index b36be144..af490ffc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
@@ -53,9 +53,3 @@ else
         </script>
     }
 }
-
-@section popups
-{
-    @Html.Partial("_ProcessDialog", null)
-    @Html.Partial("_ConfirmDialog")
-}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml
new file mode 100644
index 00000000..f75107fc
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml
@@ -0,0 +1,28 @@
+@using WebsitePanel.WebDavPortal.Resources
+@using WebsitePanel.WebDavPortal.UI.Routes
+@model WebsitePanel.WebDavPortal.Models.ModelForWebDav
+           
+
+@Html.Partial("_ShowContentTopMenu", Model)
+
+<div class="prevent-deselect container">
+    <table id="search-items-table" class="display table table-striped table-bordered noselect" cellspacing="0" width="100%">
+        <thead>
+            <tr>
+                <th>@UI.File</th>
+                <th>@UI.Details</th>
+            </tr>
+        </thead>
+    </table>
+</div>
+
+@section scripts
+{
+    <script>
+        $(document).ready(function() {
+            wsp.fileBrowser.setSettings({ deletionUrl: "@Url.RouteUrl(FileSystemRouteNames.DeleteFiles)" });
+            wsp.fileBrowser.initSearchDataTable('#search-items-table', '@Url.RouteUrl(FileSystemRouteNames.ShowContentDetails)', '@Model.SearchValue');
+        });
+    </script>
+}
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentBigIcons.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentBigIcons.cshtml
index e87f9c2d..8591768f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentBigIcons.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentBigIcons.cshtml
@@ -3,21 +3,6 @@
 @using WebsitePanel.WebDavPortal.UI.Routes
 @model WebsitePanel.WebDavPortal.Models.ModelForWebDav
 
-<div class="container">
-    
-    <div class="search-block navbar-right">
-        <div>
-            @using (Html.BeginRouteForm(FileSystemRouteNames.ShowContentPath))
-            {
-                <label>
-                    @UI.Search:
-                </label>
-                    @Html.TextBoxFor(x => x.SearchValue, new { @class = "form-control input-sm"})
-            }
-        </div>
-    </div>
-</div>
-
 <div class="container">
 
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTable.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTable.cshtml
index 8aed098b..a729ca02 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTable.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTable.cshtml
@@ -15,8 +15,3 @@
     </table>
 </div>
 
-@section popups
-{
-    @Html.Partial("_ProcessDialog", null)
-    @Html.Partial("_ConfirmDialog")
-}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
index 4a6089ff..0a31a28c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
@@ -10,42 +10,69 @@
     @if (Model != null)
     {
         string header = WspContext.User.OrganizationId;
-        <a href="/@header/" class="processing-dialog">@header</a>
         string[] elements = Model.UrlSuffix.Split(new[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
-        for (int i = 0; i < elements.Length; i++)
-        {
-            <span style="top: 2px;"> / </span>
-            <a href="@string.Concat("/" + header + "/", string.Join("/", elements.Take(i + 1)))" class="processing-dialog">@elements[i]</a>
-        }
-    }
-</div>
-<div class="container file-actions-menu prevent-deselect">
-    @if (Model.Permissions.HasFlag(WebDavPermissions.Write))
-    {
-        <div class="file-deletion navbar-left">
-            <a id="delete-button" class="btn btn-danger btn-sm active" role="button"
-               data-target="#confirm-dialog"
-               data-target-positive-button-text="@UI.Delete"
-               data-target-title-text="@UI.DeleteFileQuestion"
-               data-target-content="@UI.DialogsContentConfrimFileDeletion">@UI.Delete</a>
+
+        <div class="breadcrumb-wsp">
+            @if (String.IsNullOrEmpty(Model.SearchValue))
+            {
+                <a href="/@header/" class="processing-dialog">@header</a>
+
+                for (int i = 0; i < elements.Length; i++)
+                {
+                    <span style="top: 2px;"> / </span>
+                    <a href="@string.Concat("/" + header + "/", string.Join("/", elements.Take(i + 1)))" class="processing-dialog">@elements[i]</a>
+                }
+            }
+            else
+            {
+                <a href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath)" class="processing-dialog">@UI.SearchResults</a>
+            }
+        </div>
+
+        <div class="search-block navbar-right">
+            <div>
+                @using (Html.BeginRouteForm(FileSystemRouteNames.SearchFiles, FormMethod.Post))
+                {
+                    <div>
+                        <label>
+                            @UI.SearchDocuments:
+                        </label>
+                        @Html.TextBox("searchValue", Model.SearchValue, new { @class = "form-control input-sm" })
+                    </div>
+                }
+            </div>
         </div>
     }
-    
-    <div class="file-upload navbar-right">
-        @if (Request.Browser.IsMobileDevice == false)
+</div>
+@if (string.IsNullOrEmpty(Model.SearchValue))
+{
+    <div class="container file-actions-menu prevent-deselect">
+        @if (Model.Permissions.HasFlag(WebDavPermissions.Write))
         {
-            <div class="btn-toolbar change-view-block" role="toolbar">
-                <div class="btn-group">
-                    <a class="btn btn-default" title="@UI.Details" href="@Url.RouteUrl(FileSystemRouteNames.ChangeWebDavViewType, new { viewType = FolderViewTypes.BigIcons, org = WspContext.User.OrganizationId, pathPart = Model.UrlSuffix })"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span></a>
-                    <a class="btn btn-default" title="@UI.Table" href="@Url.RouteUrl(FileSystemRouteNames.ChangeWebDavViewType, new { viewType = FolderViewTypes.Table, org = WspContext.User.OrganizationId, pathPart = Model.UrlSuffix })"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span></a>
-                </div>
+            <div class="file-deletion navbar-left">
+                <a id="delete-button" class="btn btn-danger btn-sm active" role="button"
+                   data-target="#confirm-dialog"
+                   data-target-positive-button-text="@UI.Delete"
+                   data-target-title-text="@UI.DeleteFileQuestion"
+                   data-target-content="@UI.DialogsContentConfrimFileDeletion">@UI.Delete</a>
             </div>
         }
 
-        @if (Model.Permissions.HasFlag(WebDavPermissions.Write))
-        {
-            <a id="upload-button" class="btn btn-success btn-sm active" href="@Url.RouteUrl(FileSystemRouteNames.UploadFile)" role="button">@UI.FileUpload</a>
-        }
+        <div class="file-upload navbar-right">
+            @if (Request.Browser.IsMobileDevice == false)
+            {
+                <div class="btn-toolbar change-view-block" role="toolbar">
+                    <div class="btn-group">
+                        <a class="btn btn-default" title="@UI.Details" href="@Url.RouteUrl(FileSystemRouteNames.ChangeWebDavViewType, new {viewType = FolderViewTypes.BigIcons, org = WspContext.User.OrganizationId, pathPart = Model.UrlSuffix})"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span></a>
+                        <a class="btn btn-default" title="@UI.Table" href="@Url.RouteUrl(FileSystemRouteNames.ChangeWebDavViewType, new {viewType = FolderViewTypes.Table, org = WspContext.User.OrganizationId, pathPart = Model.UrlSuffix})"><span class="glyphicon glyphicon-th-list" aria-hidden="true"></span></a>
+                    </div>
+                </div>
+            }
+
+            @if (Model.Permissions.HasFlag(WebDavPermissions.Write))
+            {
+                <a id="upload-button" class="btn btn-success btn-sm active" href="@Url.RouteUrl(FileSystemRouteNames.UploadFile)" role="button">@UI.FileUpload</a>
+            }
+        </div>
     </div>
-    
-</div>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
index 0378af8e..ba5378f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Shared/_Layout.cshtml
@@ -47,6 +47,9 @@
     </div>
     
     <div class="prevent-deselect">
+        @Html.Partial("_ProcessDialog", null)
+        @Html.Partial("_ConfirmDialog")
+
         @RenderSection("popups", required: false)
     </div>
     
@@ -62,9 +65,9 @@
         @Scripts.Render("~/bundles/authScripts")
         
         <script>
-            $(document).ready(function() {
-                StartAuthExpirationCheckTimer("@WebDavAppConfigManager.Instance.AuthTimeoutCookieName", "@Url.RouteUrl(AccountRouteNames.Logout)");
-            });
+    $(document).ready(function () {
+        StartAuthExpirationCheckTimer("@WebDavAppConfigManager.Instance.AuthTimeoutCookieName", "@FormsAuthentication.FormsCookieName", "@Url.RouteUrl(AccountRouteNames.Logout)");
+    });
         </script>
     }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
index 9327be8f..6ccbc782 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
@@ -459,6 +459,7 @@
     <Content Include="Views\FileSystem\_ShowContentTopMenu.cshtml" />
     <Content Include="Views\FileSystem\_ShowContentBigIcons.cshtml" />
     <Content Include="Views\FileSystem\UploadFiles.cshtml" />
+    <Content Include="Views\FileSystem\ShowContentSearchResultTable.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Models\FileSystem\Enums\" />

From a4cb95e2db86a717e4b0da5f0afeebcc9941fe57 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 3 Mar 2015 07:01:01 -0800
Subject: [PATCH 11/46] webdav portal fix

---
 .../Views/FileSystem/_ShowContentTopMenu.cshtml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
index 0a31a28c..496ac682 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
@@ -10,7 +10,7 @@
     @if (Model != null)
     {
         string header = WspContext.User.OrganizationId;
-        string[] elements = Model.UrlSuffix.Split(new[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
+        string[] elements = string.IsNullOrEmpty(Model.UrlSuffix)? new string[0]: Model.UrlSuffix.Split(new[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
 
         <div class="breadcrumb-wsp">
             @if (String.IsNullOrEmpty(Model.SearchValue))

From 1969cd398c584f44fca41e362b45818965b09916 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 3 Mar 2015 07:43:23 -0800
Subject: [PATCH 12/46] Session Host certificates

---
 WebsitePanel/Database/update_db.sql           |  95 +++++++-
 .../RemoteDesktopServicesProxy.cs             | 166 +++++++++++--
 .../Data/DataProvider.cs                      |  31 +++
 .../RemoteDesktopServicesController.cs        |  96 +++++++-
 .../esRemoteDesktopServices.asmx.cs           |  16 +-
 .../IRemoteDesktopServices.cs                 |   4 +-
 .../RemoteDesktopServices/RdsCertificate.cs   |  18 ++
 .../RemoteDesktopServices/RdsUserSession.cs   |   2 +
 .../WebsitePanel.Providers.Base.csproj        |   1 +
 .../Windows2012.cs                            | 229 +++++++-----------
 .../RemoteDesktopServicesProxy.cs             |  42 ++--
 .../RemoteDesktopServices.asmx.cs             |   8 +-
 .../WebsitePanel_SharedResources.ascx.resx    |   3 +
 .../App_LocalResources/RDSServers.ascx.resx   |   3 +
 .../WebsitePanel/Code/Helpers/RDSHelper.cs    |  14 +-
 .../App_LocalResources/RDS_Settings.ascx.resx |   3 +
 .../ProviderControls/RDS_Settings.ascx        |  14 +-
 .../ProviderControls/RDS_Settings.ascx.cs     |  25 +-
 .../RDS_Settings.ascx.designer.cs             |  46 ++--
 .../AssignedRDSServers.ascx.resx              |   2 +-
 .../RDSCollections.ascx.resx                  |   3 +
 .../RDSEditApplicationUsers.ascx.resx         |   6 +
 .../RDSEditCollectionUsers.ascx.resx          |   3 +
 .../WebsitePanel/RDS/AssignedRDSServers.ascx  |   5 +
 .../RDS/AssignedRDSServers.ascx.cs            |  20 +-
 .../RDS/AssignedRDSServers.ascx.designer.cs   |  46 ++--
 .../WebsitePanel/RDS/RDSCollections.ascx      |   5 +
 .../WebsitePanel/RDS/RDSCollections.ascx.cs   |  19 +-
 .../RDS/RDSCollections.ascx.designer.cs       |  18 ++
 .../WebsitePanel/RDS/RDSCreateCollection.ascx |  22 +-
 .../RDS/RDSCreateCollection.ascx.cs           |  16 +-
 .../RDS/RDSCreateCollection.ascx.designer.cs  |  36 ---
 .../RDS/RDSEditApplicationUsers.ascx          |   8 +-
 .../RDS/RDSEditApplicationUsers.ascx.cs       |   5 +
 .../RDSEditApplicationUsers.ascx.designer.cs  |  22 +-
 .../RDS/RDSEditCollectionUsers.ascx           |   6 +
 .../RDS/RDSEditCollectionUsers.ascx.cs        |  18 +-
 .../RDSEditCollectionUsers.ascx.designer.cs   |  18 ++
 .../WebsitePanel/RDS/RDSUserSessions.ascx     |   3 +-
 .../WebsitePanel/RDS/RDSUserSessions.ascx.cs  |  12 +
 .../UserControls/RDSCollectionApps.ascx.cs    |   2 +-
 .../WebsitePanel/RDSServers.ascx              | 156 +++++++++++-
 .../WebsitePanel/RDSServers.ascx.cs           |  81 ++++++-
 .../WebsitePanel/RDSServers.ascx.designer.cs  | 221 ++++++++++++++---
 .../WebsitePanel.Portal.Modules.csproj        |   4 +-
 45 files changed, 1196 insertions(+), 377 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCertificate.cs

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 54df0493..cbe31226 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -5508,6 +5508,23 @@ CREATE TABLE [dbo].[RDSCollectionSettings](
 
 GO
 
+IF NOT EXISTS(SELECT * FROM SYS.TABLES WHERE name = 'RDSCertificates')
+CREATE TABLE [dbo].[RDSCertificates](
+	[ID] [int] IDENTITY(1,1) NOT NULL,
+	[ServiceId] [int] NOT NULL,
+	[Content] [ntext] NOT NULL,
+	[Hash] [nvarchar](255) NOT NULL,
+	[FileName] [nvarchar](255) NOT NULL,
+	[ValidFrom] [datetime] NULL,
+	[ExpiryDate] [datetime] NULL
+ CONSTRAINT [PK_RDSCertificates] PRIMARY KEY CLUSTERED 
+(
+	[ID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
 
 ALTER TABLE [dbo].[RDSCollectionUsers]
 DROP CONSTRAINT [FK_RDSCollectionUsers_RDSCollectionId]
@@ -5548,6 +5565,66 @@ GO
 
 /*Remote Desktop Services Procedures*/
 
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'AddRDSCertificate')
+DROP PROCEDURE AddRDSCertificate
+GO
+CREATE PROCEDURE [dbo].[AddRDSCertificate]
+(
+	@RDSCertificateId INT OUTPUT,
+	@ServiceId INT,
+	@Content NTEXT,
+	@Hash NVARCHAR(255),
+	@FileName NVARCHAR(255),
+	@ValidFrom DATETIME,
+	@ExpiryDate DATETIME
+)
+AS
+INSERT INTO RDSCertificates
+(
+	ServiceId,
+	Content,
+	Hash,
+	FileName,
+	ValidFrom,
+	ExpiryDate	
+)
+VALUES
+(
+	@ServiceId,
+	@Content,
+	@Hash,
+	@FileName,
+	@ValidFrom,
+	@ExpiryDate
+)
+
+SET @RDSCertificateId = SCOPE_IDENTITY()
+
+RETURN
+GO
+
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetRDSCertificateByServiceId')
+DROP PROCEDURE GetRDSCertificateByServiceId
+GO
+CREATE PROCEDURE [dbo].[GetRDSCertificateByServiceId]
+(
+	@ServiceId INT
+)
+AS
+SELECT TOP 1
+	Id,
+	ServiceId,
+	Content, 
+	Hash,
+	FileName,
+	ValidFrom,
+	ExpiryDate
+	FROM RDSCertificates
+	WHERE ServiceId = @ServiceId
+	ORDER BY Id DESC
+GO
+
 IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'AddRDSServer')
 DROP PROCEDURE AddRDSServer
 GO
@@ -6042,7 +6119,7 @@ CREATE PROCEDURE [dbo].GetOrganizationRdsUsersCount
 )
 AS
 SELECT
-  @TotalNumber = Count([RDSCollectionId])
+  @TotalNumber = Count(DISTINCT([AccountId]))
   FROM [dbo].[RDSCollectionUsers]
   WHERE [RDSCollectionId] in (SELECT [ID] FROM [RDSCollections] where [ItemId]  = @ItemId )
 RETURN
@@ -8192,6 +8269,22 @@ AS
 				INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
 				INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
 				WHERE pt.ParentPackageID = @PackageID AND ea.AccountType = 11)
+		ELSE IF @QuotaID = 450
+			SET @Result = (SELECT COUNT(DISTINCT(RCU.[AccountId])) FROM [dbo].[RDSCollectionUsers] RCU
+				INNER JOIN ExchangeAccounts EA ON EA.AccountId = RCU.AccountId
+				INNER JOIN ServiceItems  si ON ea.ItemID = si.ItemID
+				INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
+				WHERE PT.ParentPackageID = @PackageID)
+		ELSE IF @QuotaID = 451
+			SET @Result = (SELECT COUNT(RS.[ID]) FROM [dbo].[RDSServers] RS				
+				INNER JOIN ServiceItems  si ON RS.ItemID = si.ItemID
+				INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
+				WHERE PT.ParentPackageID = @PackageID)
+		ELSE IF @QuotaID = 491
+			SET @Result = (SELECT COUNT(RC.[ID]) FROM [dbo].[RDSCollections] RC
+				INNER JOIN ServiceItems  si ON RC.ItemID = si.ItemID
+				INNER JOIN PackagesTreeCache pt ON si.PackageID = pt.PackageID
+				WHERE PT.ParentPackageID = @PackageID)
 		ELSE IF @QuotaName like 'ServiceLevel.%' -- Support Service Level Quota
 		BEGIN
 			DECLARE @LevelID int
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
index 3214d80d..c5fba734 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
@@ -120,6 +120,10 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback InstallSessionHostsCertificateOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetRdsCertificateByServiceIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddRdsCertificateOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -260,6 +264,12 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event InstallSessionHostsCertificateCompletedEventHandler InstallSessionHostsCertificateCompleted;
         
+        /// <remarks/>
+        public event GetRdsCertificateByServiceIdCompletedEventHandler GetRdsCertificateByServiceIdCompleted;
+        
+        /// <remarks/>
+        public event AddRdsCertificateCompletedEventHandler AddRdsCertificateCompleted;
+        
         /// <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) {
@@ -2245,20 +2255,16 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/InstallSessionHostsCertificate", 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 InstallSessionHostsCertificate(int collectionId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] certificate, string password) {
+        public ResultObject InstallSessionHostsCertificate(RdsServer rdsServer) {
             object[] results = this.Invoke("InstallSessionHostsCertificate", new object[] {
-                        collectionId,
-                        certificate,
-                        password});
+                        rdsServer});
             return ((ResultObject)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginInstallSessionHostsCertificate(int collectionId, byte[] certificate, string password, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginInstallSessionHostsCertificate(RdsServer rdsServer, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("InstallSessionHostsCertificate", new object[] {
-                        collectionId,
-                        certificate,
-                        password}, callback, asyncState);
+                        rdsServer}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -2268,19 +2274,17 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void InstallSessionHostsCertificateAsync(int collectionId, byte[] certificate, string password) {
-            this.InstallSessionHostsCertificateAsync(collectionId, certificate, password, null);
+        public void InstallSessionHostsCertificateAsync(RdsServer rdsServer) {
+            this.InstallSessionHostsCertificateAsync(rdsServer, null);
         }
         
         /// <remarks/>
-        public void InstallSessionHostsCertificateAsync(int collectionId, byte[] certificate, string password, object userState) {
+        public void InstallSessionHostsCertificateAsync(RdsServer rdsServer, object userState) {
             if ((this.InstallSessionHostsCertificateOperationCompleted == null)) {
                 this.InstallSessionHostsCertificateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnInstallSessionHostsCertificateOperationCompleted);
             }
             this.InvokeAsync("InstallSessionHostsCertificate", new object[] {
-                        collectionId,
-                        certificate,
-                        password}, this.InstallSessionHostsCertificateOperationCompleted, userState);
+                        rdsServer}, this.InstallSessionHostsCertificateOperationCompleted, userState);
         }
         
         private void OnInstallSessionHostsCertificateOperationCompleted(object arg) {
@@ -2290,6 +2294,88 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCertificateByServiceId", 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 RdsCertificate GetRdsCertificateByServiceId(int serviceId) {
+            object[] results = this.Invoke("GetRdsCertificateByServiceId", new object[] {
+                        serviceId});
+            return ((RdsCertificate)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetRdsCertificateByServiceId(int serviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetRdsCertificateByServiceId", new object[] {
+                        serviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public RdsCertificate EndGetRdsCertificateByServiceId(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((RdsCertificate)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetRdsCertificateByServiceIdAsync(int serviceId) {
+            this.GetRdsCertificateByServiceIdAsync(serviceId, null);
+        }
+        
+        /// <remarks/>
+        public void GetRdsCertificateByServiceIdAsync(int serviceId, object userState) {
+            if ((this.GetRdsCertificateByServiceIdOperationCompleted == null)) {
+                this.GetRdsCertificateByServiceIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsCertificateByServiceIdOperationCompleted);
+            }
+            this.InvokeAsync("GetRdsCertificateByServiceId", new object[] {
+                        serviceId}, this.GetRdsCertificateByServiceIdOperationCompleted, userState);
+        }
+        
+        private void OnGetRdsCertificateByServiceIdOperationCompleted(object arg) {
+            if ((this.GetRdsCertificateByServiceIdCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetRdsCertificateByServiceIdCompleted(this, new GetRdsCertificateByServiceIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddRdsCertificate", 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 AddRdsCertificate(RdsCertificate certificate) {
+            object[] results = this.Invoke("AddRdsCertificate", new object[] {
+                        certificate});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginAddRdsCertificate(RdsCertificate certificate, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("AddRdsCertificate", new object[] {
+                        certificate}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndAddRdsCertificate(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void AddRdsCertificateAsync(RdsCertificate certificate) {
+            this.AddRdsCertificateAsync(certificate, null);
+        }
+        
+        /// <remarks/>
+        public void AddRdsCertificateAsync(RdsCertificate certificate, object userState) {
+            if ((this.AddRdsCertificateOperationCompleted == null)) {
+                this.AddRdsCertificateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddRdsCertificateOperationCompleted);
+            }
+            this.InvokeAsync("AddRdsCertificate", new object[] {
+                        certificate}, this.AddRdsCertificateOperationCompleted, userState);
+        }
+        
+        private void OnAddRdsCertificateOperationCompleted(object arg) {
+            if ((this.AddRdsCertificateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddRdsCertificateCompleted(this, new AddRdsCertificateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -3465,4 +3551,56 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetRdsCertificateByServiceIdCompletedEventHandler(object sender, GetRdsCertificateByServiceIdCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetRdsCertificateByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetRdsCertificateByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public RdsCertificate Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((RdsCertificate)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void AddRdsCertificateCompletedEventHandler(object sender, AddRdsCertificateCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddRdsCertificateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal AddRdsCertificateCompletedEventArgs(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]));
+            }
+        }
+    }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index 1d903a9c..0c75029f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -4613,6 +4613,37 @@ namespace WebsitePanel.EnterpriseServer
 
         #region RDS
 
+        public static int AddRdsCertificate(int serviceId, string content, byte[] hash, string fileName, DateTime? validFrom, DateTime? expiryDate)
+        {
+            SqlParameter rdsCertificateId = new SqlParameter("@RDSCertificateID", SqlDbType.Int);
+            rdsCertificateId.Direction = ParameterDirection.Output;
+
+            SqlHelper.ExecuteNonQuery(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "AddRDSCertificate",
+                rdsCertificateId,
+                new SqlParameter("@ServiceId", serviceId),
+                new SqlParameter("@Content", content),
+                new SqlParameter("@Hash", Convert.ToBase64String(hash)),
+                new SqlParameter("@FileName", fileName),
+                new SqlParameter("@ValidFrom", validFrom),
+                new SqlParameter("@ExpiryDate", expiryDate)
+            );
+
+            return Convert.ToInt32(rdsCertificateId.Value);
+        }
+
+        public static IDataReader GetRdsCertificateByServiceId(int serviceId)
+        {
+            return SqlHelper.ExecuteReader(
+                ConnectionString,
+                CommandType.StoredProcedure,
+                "GetRDSCertificateByServiceId",
+                new SqlParameter("@ServiceId", serviceId)
+            );
+        }
+
         public static IDataReader GetRdsCollectionSettingsByCollectionId(int collectionId)
         {
             return SqlHelper.ExecuteReader(
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index c3bd42d7..763e96aa 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -278,19 +278,28 @@ namespace WebsitePanel.EnterpriseServer
             return SaveRdsCollectionLocalAdminsInternal(users, collectionId);
         }
 
-        public static ResultObject InstallSessionHostsCertificate(int collectionId, byte[] certificate, string password)
+        public static ResultObject InstallSessionHostsCertificate(RdsServer rdsServer)
         {
-            return InstallSessionHostsCertificateInternal(collectionId, certificate, password);
+            return InstallSessionHostsCertificateInternal(rdsServer);
         }
 
-        private static ResultObject InstallSessionHostsCertificateInternal(int collectionId, byte[] certificate, string password)
+        public static RdsCertificate GetRdsCertificateByServiceId(int serviceId)
+        {
+            return GetRdsCertificateByServiceIdInternal(serviceId);
+        }
+
+        public static ResultObject AddRdsCertificate(RdsCertificate certificate)
+        {
+            return AddRdsCertificateInternal(certificate);
+        }
+
+        private static ResultObject InstallSessionHostsCertificateInternal(RdsServer rdsServer)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "INSTALL_CERTIFICATE");
 
             try
-            {
-                var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
-                Organization org = OrganizationController.GetOrganization(collection.ItemId);
+            {                
+                Organization org = OrganizationController.GetOrganization(rdsServer.ItemId.Value);                
 
                 if (org == null)
                 {
@@ -299,10 +308,17 @@ namespace WebsitePanel.EnterpriseServer
                     return result;
                 }
 
-                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
-                var servers = ObjectUtils.CreateListFromDataReader<RdsServer>(DataProvider.GetRDSServersByCollectionId(collection.Id)).ToList();
+                int serviceId = GetRemoteDesktopServiceID(org.PackageId);
+                var rds = GetRemoteDesktopServices(serviceId);
+                var certificate = GetRdsCertificateByServiceIdInternal(serviceId);
+                
+                var array = Convert.FromBase64String(certificate.Hash);
+                char[] chars = new char[array.Length / sizeof(char)];
+                System.Buffer.BlockCopy(array, 0, chars, 0, array.Length);
+                string password = new string(chars);
+                byte[] content = Convert.FromBase64String(certificate.Content);
 
-                rds.InstallCertificate(certificate, password, servers.Select(s => s.FqdName).ToArray());
+                rds.InstallCertificate(content, password, new string[] {rdsServer.FqdName});
             }
             catch (Exception ex)
             {
@@ -323,6 +339,49 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
+        private static RdsCertificate GetRdsCertificateByServiceIdInternal(int serviceId)
+        {
+            var result = ObjectUtils.FillObjectFromDataReader<RdsCertificate>(DataProvider.GetRdsCertificateByServiceId(serviceId));
+
+            return result;
+        }
+
+        private static ResultObject AddRdsCertificateInternal(RdsCertificate certificate)
+        {
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_RDS_SERVER");
+
+            try
+            {
+                byte[] hash = new byte[certificate.Hash.Length * sizeof(char)];
+                System.Buffer.BlockCopy(certificate.Hash.ToCharArray(), 0, hash, 0, hash.Length);
+                certificate.Id = DataProvider.AddRdsCertificate(certificate.ServiceId, certificate.Content, hash, certificate.FileName, certificate.ValidFrom, certificate.ExpiryDate);                
+            }
+            catch (Exception ex)
+            {
+                if (ex.InnerException != null)
+                {
+                    result.AddError("Unable to add RDS Certificate", ex.InnerException);
+                }
+                else
+                {
+                    result.AddError("Unable to add RDS Certificate", ex);
+                }
+            }
+            finally
+            {
+                if (!result.IsSuccess)
+                {
+                    TaskManager.CompleteResultTask(result);
+                }
+                else
+                {
+                    TaskManager.CompleteResultTask();
+                }
+            }
+
+            return result;
+        }
+
         private static RdsCollection GetRdsCollectionInternal(int collectionId)
         {
             var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));
@@ -370,7 +429,7 @@ namespace WebsitePanel.EnterpriseServer
             var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));            
 
             var organizationUsers = OrganizationController.GetOrganizationUsersPaged(collection.ItemId, null, null, null, 0, Int32.MaxValue).PageUsers;
-            var organizationAdmins = rds.GetRdsCollectionLocalAdmins(servers.First().FqdName);
+            var organizationAdmins = rds.GetRdsCollectionLocalAdmins(org.OrganizationId, collection.Name);
 
             return organizationUsers.Where(o => organizationAdmins.Select(a => a.ToLower()).Contains(o.DomainUserName.ToLower())).ToList();
         }
@@ -394,7 +453,7 @@ namespace WebsitePanel.EnterpriseServer
                 var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
                 var servers = ObjectUtils.CreateListFromDataReader<RdsServer>(DataProvider.GetRDSServersByCollectionId(collection.Id)).ToList();                
 
-                rds.SaveRdsCollectionLocalAdmins(users, servers.Select(s => s.FqdName).ToArray());
+                rds.SaveRdsCollectionLocalAdmins(users.Select(u => u.AccountName).ToArray(), servers.Select(s => s.FqdName).ToArray(), org.OrganizationId, collection.Name);
             }
             catch (Exception ex)
             {
@@ -760,8 +819,21 @@ namespace WebsitePanel.EnterpriseServer
             }
 
             var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(organization.PackageId));
+            var userSessions = rds.GetRdsUserSessions(collection.Name).ToList();
+            var organizationUsers = OrganizationController.GetOrganizationUsersPaged(collection.ItemId, null, null, null, 0, Int32.MaxValue).PageUsers;            
 
-            return rds.GetRdsUserSessions(collection.Name).ToList();
+            foreach(var userSession in userSessions)
+            {
+                var organizationUser = organizationUsers.FirstOrDefault(o => o.SamAccountName.Equals(userSession.SamAccountName, StringComparison.CurrentCultureIgnoreCase));
+
+                if (organizationUser != null)
+                {
+                    userSession.IsVip = organizationUser.IsVIP;
+                    result.Add(userSession);
+                }
+            }
+
+            return result;
         }
 
         private static RdsServersPaged GetFreeRdsServersPagedInternal(int itemId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
index 8cd3ecdb..f377ff8d 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
@@ -327,9 +327,21 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public ResultObject InstallSessionHostsCertificate(int collectionId, byte[] certificate, string password)
+        public ResultObject InstallSessionHostsCertificate(RdsServer rdsServer)
         {
-            return RemoteDesktopServicesController.InstallSessionHostsCertificate(collectionId, certificate, password);
+            return RemoteDesktopServicesController.InstallSessionHostsCertificate(rdsServer);
+        }
+
+        [WebMethod]
+        public RdsCertificate GetRdsCertificateByServiceId(int serviceId)
+        {
+            return RemoteDesktopServicesController.GetRdsCertificateByServiceId(serviceId);
+        }
+
+        [WebMethod]
+        public ResultObject AddRdsCertificate(RdsCertificate certificate)
+        {
+            return RemoteDesktopServicesController.AddRdsCertificate(certificate);
         }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
index a176c00f..695f2576 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
@@ -74,8 +74,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         string GetRdsServerStatus(string serverName);
         void ShutDownRdsServer(string serverName);
         void RestartRdsServer(string serverName);
-        void SaveRdsCollectionLocalAdmins(List<OrganizationUser> users, List<string> hosts);
-        List<string> GetRdsCollectionLocalAdmins(string hostName);
+        void SaveRdsCollectionLocalAdmins(List<string> users, List<string> hosts, string collectionName, string organizationId);
+        List<string> GetRdsCollectionLocalAdmins(string organizationId, string collectionName);
         void MoveRdsServerToTenantOU(string hostName, string organizationId);
         void RemoveRdsServerFromTenantOU(string hostName, string organizationId);
         void InstallCertificate(byte[] certificate, string password, List<string> hostNames);
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCertificate.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCertificate.cs
new file mode 100644
index 00000000..9d8e0e3e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsCertificate.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.Providers.RemoteDesktopServices
+{
+    public class RdsCertificate
+    {
+        public int Id { get; set; }
+        public int ServiceId { get; set; }
+        public string FileName { get; set; }
+        public string Content { get; set; }
+        public string Hash { get; set; }
+        public DateTime? ValidFrom { get; set; }
+        public DateTime? ExpiryDate { get; set; }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsUserSession.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsUserSession.cs
index 8c3e9729..4d6b4e19 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsUserSession.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsUserSession.cs
@@ -13,5 +13,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         public string SessionState { get; set; }
         public string HostServer { get; set; }
         public string DomainName { get; set; }
+        public bool IsVip { get; set; }
+        public string SamAccountName { get; set; }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
index 752209d3..c0f01014 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
@@ -129,6 +129,7 @@
     <Compile Include="OS\QuotaType.cs" />
     <Compile Include="OS\SystemFilesPaged.cs" />
     <Compile Include="RemoteDesktopServices\IRemoteDesktopServices.cs" />
+    <Compile Include="RemoteDesktopServices\RdsCertificate.cs" />
     <Compile Include="RemoteDesktopServices\RdsCollection.cs" />
     <Compile Include="RemoteDesktopServices\RdsCollectionPaged.cs" />
     <Compile Include="RemoteDesktopServices\RdsCollectionSettings.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index dea195b8..ca1b4c3b 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -64,6 +64,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string Computers = "Computers";
         private const string AdDcComputers = "Domain Controllers";
         private const string Users = "users";
+        private const string Admins = "Admins";        
         private const string RdsGroupFormat = "rds-{0}-{1}";
         private const string RdsModuleName = "RemoteDesktopServices";
         private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";
@@ -310,7 +311,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                     //ActiveDirectoryUtils.AddObjectToGroup(GetComputerPath(ConnectionBroker), GetComputerGroupPath(organizationId, collection.Name));
                 }
 
-                CheckOrCreateHelpDeskComputerGroup();                             
+                CheckOrCreateHelpDeskComputerGroup();
+                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
 
                 if (!ActiveDirectoryUtils.AdObjectExists(GetUsersGroupPath(organizationId, collection.Name)))
                 {
@@ -347,7 +349,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                         CreateLocalAdministratorsGroup(rdsServer.FqdName, runSpace);
                     }
 
-                    AddHelpDeskAdminsGroupToLocalAdmins(runSpace, rdsServer.FqdName);
+                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);
                     AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
                 }
             }                   
@@ -513,11 +515,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 foreach(var server in servers)
                 {
+                    RemoveGroupFromLocalAdmin(server.FqdName, server.Name, GetLocalAdminsGroupName(collectionName), runSpace);
                     RemoveComputerFromCollectionAdComputerGroup(organizationId, collectionName, server);
                 }
 
                 ActiveDirectoryUtils.DeleteADObject(GetComputerGroupPath(organizationId, collectionName));
-                ActiveDirectoryUtils.DeleteADObject(GetUsersGroupPath(organizationId, collectionName));                
+                ActiveDirectoryUtils.DeleteADObject(GetUsersGroupPath(organizationId, collectionName));
+                ActiveDirectoryUtils.DeleteADObject(GetGroupPath(organizationId, collectionName, GetLocalAdminsGroupName(collectionName)));                
             }
             catch (Exception e)
             {
@@ -529,12 +533,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
 
             return result;
-        }
-
-        public List<string> GetCollectionUsers(string collectionName)
-        {
-            return GetUsersToCollectionAdGroup(collectionName);
-        }
+        }        
 
         public bool SetUsersInCollection(string organizationId, string collectionName, List<string> users)
         {
@@ -542,7 +541,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             try
             {
-                SetUsersToCollectionAdGroup(collectionName, organizationId, users);
+                var usersGroupName = GetUsersGroupName(collectionName);
+                var usersGroupPath = GetUsersGroupPath(organizationId, collectionName);
+                SetUsersToCollectionAdGroup(collectionName, organizationId, users, usersGroupName, usersGroupPath);
             }
             catch (Exception e)
             {
@@ -573,14 +574,15 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 ExecuteShellCommand(runSpace, cmd, false);
 
-                CheckOrCreateHelpDeskComputerGroup();                
+                CheckOrCreateHelpDeskComputerGroup();
+                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
 
                 if (!CheckLocalAdminsGroupExists(server.FqdName, runSpace))
                 {
                     CreateLocalAdministratorsGroup(server.FqdName, runSpace);
                 }
 
-                AddHelpDeskAdminsGroupToLocalAdmins(runSpace, server.FqdName);
+                AddAdGroupToLocalAdmins(runSpace, server.FqdName, helpDeskGroupSamAccountName);
                 AddComputerToCollectionAdComputerGroup(organizationId, collectionName, server);
             }
             catch (Exception e)
@@ -616,6 +618,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 
                 ExecuteShellCommand(runSpace, cmd, false);
 
+                RemoveGroupFromLocalAdmin(server.FqdName, server.Name, GetLocalAdminsGroupName(collectionName), runSpace);
                 RemoveComputerFromCollectionAdComputerGroup(organizationId, collectionName, server);
             }
             finally
@@ -978,7 +981,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #region Local Admins
 
-        public void SaveRdsCollectionLocalAdmins(List<OrganizationUser> users, List<string> hosts)
+        public void SaveRdsCollectionLocalAdmins(List<string> users, List<string> hosts, string collectionName, string organizationId)
         {
             Runspace runspace = null;            
 
@@ -987,6 +990,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 runspace = OpenRunspace();
                 var index = ServerSettings.ADRootDomain.LastIndexOf(".");
                 var domainName = ServerSettings.ADRootDomain;
+                string groupName = GetLocalAdminsGroupName(collectionName);
+                string groupPath = GetGroupPath(organizationId, collectionName, groupName);
+                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
+                string localAdminsGroupSamAccountName = CheckOrCreateAdGroup(groupPath, GetOrganizationPath(organizationId), groupName, WspAdministratorsGroupDescription);
 
                 if (index > 0)
                 {
@@ -1004,24 +1011,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                             Log.WriteWarning(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
                             throw new Exception(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
                         }                        
-                    }
-                    
-                    var existingAdmins = GetExistingLocalAdmins(hostName, runspace).Select(e => e.ToLower());
-                    var formUsers = users.Select(u => string.Format("{0}\\{1}", domainName, u.SamAccountName).ToLower());
-                    var newUsers = users.Where(u => !existingAdmins.Contains(string.Format("{0}\\{1}", domainName, u.SamAccountName).ToLower()));
-                    var removedUsers = existingAdmins.Where(e => !formUsers.Contains(e));
+                    }                                       
 
-                    foreach (var user in newUsers)
-                    {
-                        AddNewLocalAdmin(hostName, user.SamAccountName, runspace);
-                    }
+                    AddAdGroupToLocalAdmins(runspace, hostName, helpDeskGroupSamAccountName);
+                    AddAdGroupToLocalAdmins(runspace, hostName, localAdminsGroupSamAccountName);
 
-                    foreach (var user in removedUsers)
-                    {
-                        RemoveLocalAdmin(hostName, user, runspace);
-                    }
-
-                    AddHelpDeskAdminsGroupToLocalAdmins(runspace, hostName);
+                    SetUsersToCollectionAdGroup(collectionName, organizationId, users, GetLocalAdminsGroupName(collectionName), groupPath);
                 }                
             }
             finally
@@ -1030,27 +1025,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }                       
         }
 
-        public List<string> GetRdsCollectionLocalAdmins(string hostName)
-        {            
-            Runspace runspace = null;
-            var result = new List<string>();
-
-            try
-            {
-                runspace = OpenRunspace();
-                
-                if (CheckLocalAdminsGroupExists(hostName, runspace))
-                {
-                    result = GetExistingLocalAdmins(hostName, runspace);
-                }
-            }
-            finally
-            {
-                CloseRunspace(runspace);
-            }            
-
-            return result;
-        }
+        public List<string> GetRdsCollectionLocalAdmins(string organizationId, string collectionName)
+        {
+            string groupName = GetLocalAdminsGroupName(collectionName);
+            return GetUsersToCollectionAdGroup(collectionName, groupName, organizationId);
+        }        
 
         private bool CheckLocalAdminsGroupExists(string hostName, Runspace runspace)
         {
@@ -1097,59 +1076,19 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
 
             return errors;
-        }
-
-        private List<string> GetExistingLocalAdmins(string hostName, Runspace runspace)
-        {
-            var result = new List<string>();
-
-            var scripts = new List<string>
-            {
-                string.Format("net localgroup {0} | select -skip 6", WspAdministratorsGroupName)
-            };
-
-            object[] errors = null;
-            var exitingAdmins = ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);            
-
-            if (!errors.Any())
-            {
-                foreach(var user in exitingAdmins.Take(exitingAdmins.Count - 2))
-                {
-                    result.Add(user.ToString());
-                }
-            }
-
-            return result;
-        }
-
-        private object[] AddNewLocalAdmin(string hostName, string samAccountName, Runspace runspace)
-        {
+        }      
+        
+        private void RemoveGroupFromLocalAdmin(string fqdnName, string hostName, string groupName, Runspace runspace)
+        {            
             var scripts = new List<string>
             {
                 string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, WspAdministratorsGroupName),
-                string.Format("$GroupObj.Add(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, samAccountName)
+                string.Format("$GroupObj.Remove(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, RDSHelpDeskGroup),
+                string.Format("$GroupObj.Remove(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, groupName)
             };
 
             object[] errors = null;
-            ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
-
-            return errors;
-        }
-
-        private object[] RemoveLocalAdmin(string hostName, string user, Runspace runspace)
-        {
-            var userObject = user.Split('\\');
-
-            var scripts = new List<string>
-            {
-                string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, WspAdministratorsGroupName),
-                string.Format("$GroupObj.Remove(\"WinNT://{0}/{1}\")", userObject[0], userObject[1])
-            };
-
-            object[] errors = null;
-            ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
-
-            return errors;
+            ExecuteRemoteShellCommand(runspace, fqdnName, scripts, out errors);
         }
         
         #endregion
@@ -1177,23 +1116,22 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }
 
-        private void AddHelpDeskAdminsGroupToLocalAdmins(Runspace runspace, string hostName)
-        {
-            var helpDeskAdminsGroupPath = GetHelpDeskGroupPath(RDSHelpDeskGroup);
+        private string CheckOrCreateAdGroup(string groupPath, string rootPath, string groupName, string description)
+        {            
             DirectoryEntry groupEntry = null;
 
-            if (!ActiveDirectoryUtils.AdObjectExists(helpDeskAdminsGroupPath))
+            if (!ActiveDirectoryUtils.AdObjectExists(groupPath))
             {
-                ActiveDirectoryUtils.CreateGroup(GetRootOUPath(), RDSHelpDeskGroup);
-                groupEntry = ActiveDirectoryUtils.GetADObject(helpDeskAdminsGroupPath);
+                ActiveDirectoryUtils.CreateGroup(rootPath, groupName);
+                groupEntry = ActiveDirectoryUtils.GetADObject(groupPath);
 
                 if (groupEntry.Properties.Contains("Description"))
                 {
-                    groupEntry.Properties["Description"][0] = RDSHelpDeskGroupDescription;
+                    groupEntry.Properties["Description"][0] = description;
                 }
                 else
                 {
-                    groupEntry.Properties["Description"].Add(RDSHelpDeskGroupDescription);
+                    groupEntry.Properties["Description"].Add(description);
                 }
 
                 groupEntry.CommitChanges();
@@ -1201,11 +1139,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             if (groupEntry == null)
             {
-                groupEntry = ActiveDirectoryUtils.GetADObject(helpDeskAdminsGroupPath);
+                groupEntry = ActiveDirectoryUtils.GetADObject(groupPath);
             }
 
-            var samAccountName = ActiveDirectoryUtils.GetADObjectProperty(groupEntry, "sAMAccountName");
-            
+            return ActiveDirectoryUtils.GetADObjectProperty(groupEntry, "sAMAccountName").ToString();
+        }
+
+        private void AddAdGroupToLocalAdmins(Runspace runspace, string hostName, string samAccountName)
+        {                                    
             var scripts = new List<string>
             {
                 string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, WspAdministratorsGroupName),
@@ -1227,7 +1168,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             try
             {
                 var guid = Guid.NewGuid();                
-                var x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);
+                var x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);                
                 //var content = x509Cert.Export(X509ContentType.Pfx);
                 var filePath = SaveCertificate(certificate, guid);
                 runspace = OpenRunspace();
@@ -1355,21 +1296,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return false;
         }
 
-        private void SetUsersToCollectionAdGroup(string collectionName, string organizationId, IEnumerable<string> users)
-        {
-            var usersGroupName = GetUsersGroupName(collectionName);
-            var usersGroupPath = GetUsersGroupPath(organizationId, collectionName);
+        private void SetUsersToCollectionAdGroup(string collectionName, string organizationId, IEnumerable<string> users, string groupName, string groupPath)
+        {            
             var orgPath = GetOrganizationPath(organizationId);
             var orgEntry = ActiveDirectoryUtils.GetADObject(orgPath);
-            var groupUsers = ActiveDirectoryUtils.GetGroupObjects(usersGroupName, "user", orgEntry);
-
-            //remove all users from group
+            var groupUsers = ActiveDirectoryUtils.GetGroupObjects(groupName, "user", orgEntry);
+            
             foreach (string userPath in groupUsers)
             {
-                ActiveDirectoryUtils.RemoveObjectFromGroup(userPath, usersGroupPath);                
+                ActiveDirectoryUtils.RemoveObjectFromGroup(userPath, groupPath);                
             }          
-
-            //adding users to group
+            
             foreach (var user in users)
             {                
                 var userPath = GetUserPath(organizationId, user);                
@@ -1377,20 +1314,19 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 if (ActiveDirectoryUtils.AdObjectExists(userPath))
                 {                    
                     var userObject = ActiveDirectoryUtils.GetADObject(userPath);
-                    var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(userObject, "sAMAccountName");                    
-                    var userGroupsPath = GetUsersGroupPath(organizationId, collectionName);
-                    ActiveDirectoryUtils.AddObjectToGroup(userPath, userGroupsPath);                    
+                    var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(userObject, "sAMAccountName");                                        
+                    ActiveDirectoryUtils.AddObjectToGroup(userPath, groupPath);                    
                 }                
             }
         }
 
-        private List<string> GetUsersToCollectionAdGroup(string collectionName)
+        private List<string> GetUsersToCollectionAdGroup(string collectionName, string groupName, string organizationId)
         {
-            var users = new List<string>();
+            var users = new List<string>();    
+            var orgPath = GetOrganizationPath(organizationId);
+            var orgEntry = ActiveDirectoryUtils.GetADObject(orgPath);
 
-            var usersGroupName = GetUsersGroupName(collectionName);
-
-            foreach (string userPath in ActiveDirectoryUtils.GetGroupObjects(usersGroupName, "user"))
+            foreach (string userPath in ActiveDirectoryUtils.GetGroupObjects(groupName, "user", orgEntry))
             {
                 var userObject = ActiveDirectoryUtils.GetADObject(userPath);
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(userObject, "sAMAccountName");
@@ -1738,6 +1674,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return string.Format(RdsGroupFormat, collectionName, Users.ToLowerInvariant());
         }
 
+        private string GetLocalAdminsGroupName(string collectionName)
+        {
+            return string.Format(RdsGroupFormat, collectionName, Admins.ToLowerInvariant());
+        }
+
         internal string GetComputerGroupPath(string organizationId, string collection)
         {
             StringBuilder sb = new StringBuilder();
@@ -1766,6 +1707,20 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return sb.ToString();
         }
 
+        private string GetGroupPath(string organizationId, string collectionName, string groupName)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendCNPath(sb, groupName);
+            AppendOUPath(sb, organizationId);
+            AppendOUPath(sb, RootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        }
+
         private string GetUserPath(string organizationId, string loginName)
         {
             StringBuilder sb = new StringBuilder();
@@ -2290,18 +2245,22 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             cmd.Parameters.Add("CollectionName", collectionName);
             cmd.Parameters.Add("ConnectionBroker", ConnectionBroker);
             var userSessions = ExecuteShellCommand(runSpace, cmd, false, out errors);            
-            var properties = typeof(RdsUserSession).GetProperties();
+            var properties = typeof(RdsUserSession).GetProperties();            
 
             foreach(var userSession in  userSessions)
             {
-                var session = new RdsUserSession();                                
-
-                foreach(var prop in properties)
+                var session = new RdsUserSession
                 {
-                    prop.SetValue(session, GetPSObjectProperty(userSession, prop.Name).ToString(), null);
-                }
-
-                session.UserName = GetUserFullName(session.DomainName, session.UserName, runSpace);
+                    CollectionName = GetPSObjectProperty(userSession, "CollectionName").ToString(),
+                    DomainName = GetPSObjectProperty(userSession, "DomainName").ToString(),
+                    HostServer = GetPSObjectProperty(userSession, "HostServer").ToString(),
+                    SessionState = GetPSObjectProperty(userSession, "SessionState").ToString(),
+                    UnifiedSessionId = GetPSObjectProperty(userSession, "UnifiedSessionId").ToString(),
+                    SamAccountName = GetPSObjectProperty(userSession, "UserName").ToString(),
+                };                                
+                                
+                session.IsVip = false;
+                session.UserName = GetUserFullName(session.DomainName, session.SamAccountName, runSpace);
                 result.Add(session);
             }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
index 7d50298d..e9681bb1 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
@@ -18,7 +18,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
     using System.Web.Services.Protocols;
     using System;
     using System.Diagnostics;
-    using WebsitePanel.Providers.HostedSolution;
     
     
     /// <remarks/>
@@ -1515,17 +1514,21 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/SaveRdsCollectionLocalAdmins", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void SaveRdsCollectionLocalAdmins(OrganizationUser[] users, string[] hosts) {
+        public void SaveRdsCollectionLocalAdmins(string[] users, string[] hosts, string organizationId, string collectionName) {
             this.Invoke("SaveRdsCollectionLocalAdmins", new object[] {
                         users,
-                        hosts});
+                        hosts,
+                        organizationId,
+                        collectionName});
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginSaveRdsCollectionLocalAdmins(OrganizationUser[] users, string[] hosts, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSaveRdsCollectionLocalAdmins(string[] users, string[] hosts, string organizationId, string collectionName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SaveRdsCollectionLocalAdmins", new object[] {
                         users,
-                        hosts}, callback, asyncState);
+                        hosts,
+                        organizationId,
+                        collectionName}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -1534,18 +1537,20 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         }
         
         /// <remarks/>
-        public void SaveRdsCollectionLocalAdminsAsync(OrganizationUser[] users, string[] hosts) {
-            this.SaveRdsCollectionLocalAdminsAsync(users, hosts, null);
+        public void SaveRdsCollectionLocalAdminsAsync(string[] users, string[] hosts, string organizationId, string collectionName) {
+            this.SaveRdsCollectionLocalAdminsAsync(users, hosts, organizationId, collectionName, null);
         }
         
         /// <remarks/>
-        public void SaveRdsCollectionLocalAdminsAsync(OrganizationUser[] users, string[] hosts, object userState) {
+        public void SaveRdsCollectionLocalAdminsAsync(string[] users, string[] hosts, string organizationId, string collectionName, object userState) {
             if ((this.SaveRdsCollectionLocalAdminsOperationCompleted == null)) {
                 this.SaveRdsCollectionLocalAdminsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveRdsCollectionLocalAdminsOperationCompleted);
             }
             this.InvokeAsync("SaveRdsCollectionLocalAdmins", new object[] {
                         users,
-                        hosts}, this.SaveRdsCollectionLocalAdminsOperationCompleted, userState);
+                        hosts,
+                        organizationId,
+                        collectionName}, this.SaveRdsCollectionLocalAdminsOperationCompleted, userState);
         }
         
         private void OnSaveRdsCollectionLocalAdminsOperationCompleted(object arg) {
@@ -1558,16 +1563,18 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetRdsCollectionLocalAdmins", 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[] GetRdsCollectionLocalAdmins(string hostName) {
+        public string[] GetRdsCollectionLocalAdmins(string organizationId, string collectionName) {
             object[] results = this.Invoke("GetRdsCollectionLocalAdmins", new object[] {
-                        hostName});
+                        organizationId,
+                        collectionName});
             return ((string[])(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetRdsCollectionLocalAdmins(string hostName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetRdsCollectionLocalAdmins(string organizationId, string collectionName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetRdsCollectionLocalAdmins", new object[] {
-                        hostName}, callback, asyncState);
+                        organizationId,
+                        collectionName}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -1577,17 +1584,18 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         }
         
         /// <remarks/>
-        public void GetRdsCollectionLocalAdminsAsync(string hostName) {
-            this.GetRdsCollectionLocalAdminsAsync(hostName, null);
+        public void GetRdsCollectionLocalAdminsAsync(string organizationId, string collectionName) {
+            this.GetRdsCollectionLocalAdminsAsync(organizationId, collectionName, null);
         }
         
         /// <remarks/>
-        public void GetRdsCollectionLocalAdminsAsync(string hostName, object userState) {
+        public void GetRdsCollectionLocalAdminsAsync(string organizationId, string collectionName, object userState) {
             if ((this.GetRdsCollectionLocalAdminsOperationCompleted == null)) {
                 this.GetRdsCollectionLocalAdminsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsCollectionLocalAdminsOperationCompleted);
             }
             this.InvokeAsync("GetRdsCollectionLocalAdmins", new object[] {
-                        hostName}, this.GetRdsCollectionLocalAdminsOperationCompleted, userState);
+                        organizationId,
+                        collectionName}, this.GetRdsCollectionLocalAdminsOperationCompleted, userState);
         }
         
         private void OnGetRdsCollectionLocalAdminsOperationCompleted(object arg) {
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
index 038cc907..9e49fb21 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
@@ -566,12 +566,12 @@ namespace WebsitePanel.Server
         }
 
         [WebMethod, SoapHeader("settings")]
-        public void SaveRdsCollectionLocalAdmins(List<OrganizationUser> users, List<string> hosts)
+        public void SaveRdsCollectionLocalAdmins(List<string> users, List<string> hosts, string organizationId, string collectionName)
         {
             try
             {
                 Log.WriteStart("'{0}' SaveRdsCollectionLocalAdmins", ProviderSettings.ProviderName);
-                RDSProvider.SaveRdsCollectionLocalAdmins(users, hosts);
+                RDSProvider.SaveRdsCollectionLocalAdmins(users, hosts, collectionName, organizationId);
                 Log.WriteEnd("'{0}' SaveRdsCollectionLocalAdmins", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -582,12 +582,12 @@ namespace WebsitePanel.Server
         }
 
         [WebMethod, SoapHeader("settings")]
-        public List<string> GetRdsCollectionLocalAdmins(string hostName)
+        public List<string> GetRdsCollectionLocalAdmins(string organizationId, string collectionName)
         {
             try
             {
                 Log.WriteStart("'{0}' GetRdsCollectionLocalAdmins", ProviderSettings.ProviderName);
-                var result = RDSProvider.GetRdsCollectionLocalAdmins(hostName);
+                var result = RDSProvider.GetRdsCollectionLocalAdmins(organizationId, collectionName);
                 Log.WriteEnd("'{0}' GetRdsCollectionLocalAdmins", ProviderSettings.ProviderName);
 
                 return result;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 033cf7f3..27590807 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -5656,6 +5656,9 @@
   <data name="ERROR.RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED" xml:space="preserve">
     <value>Session host certificate not installed</value>
   </data>
+  <data name="Success.RDSSESSIONHOST_CERTIFICATE_INSTALLED" xml:space="preserve">
+    <value>Session host certificate has been installed</value>
+  </data>
   <data name="ERROR.RDSCOLLECTIONSETTINGS_NOT_UPDATES" xml:space="preserve">
     <value>RDS Collection settings not updated</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/RDSServers.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/RDSServers.ascx.resx
index 4677be06..a769c20c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/RDSServers.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/RDSServers.ascx.resx
@@ -120,6 +120,9 @@
   <data name="btnAddRDSServer.Text" xml:space="preserve">
     <value>Add RDS Server</value>
   </data>
+  <data name="gvPopupStatus.HeaderText" xml:space="preserve">
+    <value>Status</value>
+  </data>
   <data name="gvRDSServers.Empty" xml:space="preserve">
     <value>The list of RDS Servers is empty.&lt;br&gt;&lt;br&gt;To add a new Server click "Add RDS Sever" button.</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
index 0e13992a..9b7c00d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
@@ -52,11 +52,15 @@ namespace WebsitePanel.Portal
         {
             rdsServers = ES.Services.RDS.GetRdsServersPaged("", filterValue, sortColumn, startRowIndex, maximumRows);
 
-            return rdsServers.Servers;
-            //return new RdsServer[] { new RdsServer { Name = "rds.1.server", FqdName = "", Address = "127.0.0.1" },
-            //                         new RdsServer { Name = "rds.2.server", FqdName = "", Address = "127.0.0.2" },
-            //                         new RdsServer { Name = "rds.3.server", FqdName = "", Address = "127.0.0.3" },
-            //                         new RdsServer { Name = "rds.4.server", FqdName = "", Address = "127.0.0.4" }};
+            foreach (var rdsServer in rdsServers.Servers)
+            {
+                if (rdsServer.ItemId.HasValue)
+                {
+                    rdsServer.Status = ES.Services.RDS.GetRdsServerStatus(rdsServer.ItemId.Value, rdsServer.FqdName);
+                }
+            }
+
+            return rdsServers.Servers;            
         }
 
         public int GetOrganizationRdsServersPagedCount(int itemId, string filterValue)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
index f3221c01..1b443a76 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
@@ -126,4 +126,7 @@
   <data name="ServerNameColumn.HeaderText" xml:space="preserve">
     <value>Server Name</value>
   </data>
+  <data name="lblPFXInstallPassword.Text" xml:space="preserve">
+    <value>Certificate Password:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
index 879afc47..57dbeecb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
@@ -1,5 +1,17 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDS_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.RDS_Settings" %>
-<table>
+<table>    
+    <tr>
+        <td colspan ="2" style="padding: 10px 0 10px 0;"><asp:FileUpload ID="upPFX" runat="server"/></td>
+    </tr>
+    <tr><td></td></tr>
+    <tr>
+        <td class="SubHead" style="width:200px" nowrap>
+            <asp:Localize runat="server" meta:resourcekey="lblPFXInstallPassword" />
+        </td>
+        <td>                        
+            <asp:TextBox ID="txtPFXInstallPassword" runat="server" TextMode="Password" Width="200px" />
+        </td>
+    </tr>
     <tr>
         <td class="SubHead" width="200" nowrap>
             <asp:Label runat="server" ID="lblConnectionBroker" meta:resourcekey="lblConnectionBroker" Text="Connection Broker:"/>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
index 596af4e5..d85a1c61 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Web.UI.WebControls;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.RemoteDesktopServices;
 
 namespace WebsitePanel.Portal.ProviderControls
 {
@@ -54,11 +55,10 @@ namespace WebsitePanel.Portal.ProviderControls
         }
 
         public void BindSettings(System.Collections.Specialized.StringDictionary settings)
-        {
+        {                
             txtConnectionBroker.Text = settings["ConnectionBroker"];
 
             GWServers = settings["GWServrsList"];
-
             UpdateLyncServersGrid();
 
             txtRootOU.Text = settings["RootOU"];
@@ -86,7 +86,26 @@ namespace WebsitePanel.Portal.ProviderControls
             settings["UseCentralNPS"] = chkUseCentralNPS.Checked.ToString();
             settings["CentralNPS"] = chkUseCentralNPS.Checked ? txtCentralNPS.Text : string.Empty;
 
-            settings["GWServrsList"] = GWServers;	
+            settings["GWServrsList"] = GWServers;
+
+            try
+            {
+                if (upPFX.HasFile.Equals(true))
+                {                    
+                    var certificate = new RdsCertificate
+                    {
+                        ServiceId = PanelRequest.ServiceId,
+                        Content = Convert.ToBase64String(upPFX.FileBytes),
+                        FileName = upPFX.FileName,
+                        Hash = txtPFXInstallPassword.Text
+                    };
+
+                    ES.Services.RDS.AddRdsCertificate(certificate);
+                }
+            }
+            catch (Exception)
+            {                
+            }
         }
 
         protected void chkUseCentralNPS_CheckedChanged(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
index f0638a0c..9e1ba55e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,6 +12,24 @@ namespace WebsitePanel.Portal.ProviderControls {
     
     public partial class RDS_Settings {
         
+        /// <summary>
+        /// upPFX 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.FileUpload upPFX;
+        
+        /// <summary>
+        /// txtPFXInstallPassword 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 txtPFXInstallPassword;
+        
         /// <summary>
         /// lblConnectionBroker control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/AssignedRDSServers.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/AssignedRDSServers.ascx.resx
index 33277c17..e2d6204d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/AssignedRDSServers.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/AssignedRDSServers.ascx.resx
@@ -145,7 +145,7 @@
     <value>Assigned RDS Servers</value>
   </data>
   <data name="locQuota.Text" xml:space="preserve">
-    <value>Total RDS Servers Allocated:</value>
+    <value>Total Remote Desktop Servers Allocated:</value>
   </data>
   <data name="cmdDisable.Text" xml:space="preserve">
     <value>Disable</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSCollections.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSCollections.ascx.resx
index b231aa48..3a2deaac 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSCollections.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSCollections.ascx.resx
@@ -147,4 +147,7 @@
   <data name="gvServer.Header" xml:space="preserve">
     <value>RDS Server</value>
   </data>
+  <data name="locQuota.Text" xml:space="preserve">
+    <value>Total Remote Desktop Collections Created:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditApplicationUsers.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditApplicationUsers.ascx.resx
index eb391f90..4d916746 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditApplicationUsers.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditApplicationUsers.ascx.resx
@@ -153,4 +153,10 @@
   <data name="locLblApplicationName" xml:space="preserve">
     <value>Application Name</value>
   </data>
+  <data name="btnExit.Text" xml:space="preserve">
+    <value>Back to Applications List</value>
+  </data>
+  <data name="btnSaveExit.Text" xml:space="preserve">
+    <value>Save Changes and Exit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollectionUsers.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollectionUsers.ascx.resx
index b7086125..60f1cf4b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollectionUsers.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditCollectionUsers.ascx.resx
@@ -144,4 +144,7 @@
   <data name="secRdsUsers.Text" xml:space="preserve">
     <value>RDS Users</value>
   </data>
+  <data name="locQuota.Text" xml:space="preserve">
+    <value>Total RDS Users Assigned:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
index 6016913e..9ff6017f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx
@@ -72,6 +72,11 @@
 						    </asp:TemplateField>
 					    </Columns>
 				    </asp:GridView>
+                    <div>
+				        <asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota" Text="RDS Servers:"></asp:Localize>
+				        &nbsp;&nbsp;&nbsp;
+				        <wsp:QuotaViewer ID="rdsServersQuota" runat="server" QuotaTypeId="2" DisplayGauge="true"/>
+                    </div>
                     <asp:ObjectDataSource ID="odsRDSAssignedServersPaged" runat="server" EnablePaging="True"
 							SelectCountMethod="GetOrganizationRdsServersPagedCount"
 							SelectMethod="GetOrganizationRdsServersPaged"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.cs
index 8aeba976..97b16cbd 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.cs
@@ -41,18 +41,32 @@ namespace WebsitePanel.Portal.RDS
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
             if (!IsPostBack)
             {
-
+                BindQuota(cntx);
             }
-
-            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+            
             if (cntx.Quotas.ContainsKey(Quotas.RDS_SERVERS))
             {
                 btnAddServerToOrg.Enabled = (!(cntx.Quotas[Quotas.RDS_SERVERS].QuotaAllocatedValue <= gvRDSAssignedServers.Rows.Count) || (cntx.Quotas[Quotas.RDS_SERVERS].QuotaAllocatedValue == -1));
             }
         }
 
+        private void BindQuota(PackageContext cntx)
+        {
+            OrganizationStatistics stats = ES.Services.Organizations.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
+            OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
+            rdsServersQuota.QuotaUsedValue = stats.CreatedRdsServers;
+            rdsServersQuota.QuotaValue = stats.AllocatedRdsServers;
+
+            if (stats.AllocatedUsers != -1)
+            {
+                rdsServersQuota.QuotaAvailable = tenantStats.AllocatedRdsServers - tenantStats.CreatedRdsServers;
+            }
+        }
+
         protected void btnAddServerToOrg_Click(object sender, EventArgs e)
         {
             Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "rds_add_server",
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.designer.cs
index 707c1a39..99306518 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/AssignedRDSServers.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -139,6 +111,24 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvRDSAssignedServers;
         
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// rdsServersQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer rdsServersQuota;
+        
         /// <summary>
         /// odsRDSAssignedServersPaged control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx
index a311aaa3..a5369d97 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx
@@ -66,6 +66,11 @@
 		                    </asp:TemplateField>
 					    </Columns>
 				    </asp:GridView>
+                    <div>
+				        <asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota" Text="Collections Created:"></asp:Localize>
+				        &nbsp;&nbsp;&nbsp;
+				        <wsp:QuotaViewer ID="collectionsQuota" runat="server" QuotaTypeId="2" DisplayGauge="true" />
+                    </div>
                     <asp:ObjectDataSource ID="odsRDSCollectionsPaged" runat="server" EnablePaging="True"
 							SelectCountMethod="GetRDSCollectonsPagedCount"
 							SelectMethod="GetRDSCollectonsPaged"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.cs
index efdaaa56..3ca6445f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.cs
@@ -42,17 +42,32 @@ namespace WebsitePanel.Portal.RDS
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
             if (!IsPostBack)
             {
+                BindQuota(cntx);
             }
-
-            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+            
             if (cntx.Quotas.ContainsKey(Quotas.RDS_COLLECTIONS))
             {
                 btnAddCollection.Enabled = (!(cntx.Quotas[Quotas.RDS_COLLECTIONS].QuotaAllocatedValue <= gvRDSCollections.Rows.Count) || (cntx.Quotas[Quotas.RDS_COLLECTIONS].QuotaAllocatedValue == -1));
             }
         }
 
+        private void BindQuota(PackageContext cntx)
+        {            
+            OrganizationStatistics stats = ES.Services.Organizations.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
+            OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
+            collectionsQuota.QuotaUsedValue = stats.CreatedRdsCollections;
+            collectionsQuota.QuotaValue = stats.AllocatedRdsCollections;
+
+            if (stats.AllocatedUsers != -1)
+            {
+                collectionsQuota.QuotaAvailable = tenantStats.AllocatedRdsCollections - tenantStats.CreatedRdsCollections;
+            }            
+        }
+
         public string GetServerName(string collectionId)
         {
             int id = int.Parse(collectionId);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.designer.cs
index 7b951606..44424f9b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCollections.ascx.designer.cs
@@ -111,6 +111,24 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvRDSCollections;
         
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// collectionsQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer collectionsQuota;
+        
         /// <summary>
         /// odsRDSCollectionsPaged control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
index e7277028..9549a550 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx
@@ -28,27 +28,7 @@
                                 <asp:RequiredFieldValidator ID="valCollectionName" runat="server" ErrorMessage="*" ControlToValidate="txtCollectionName" ValidationGroup="SaveRDSCollection"></asp:RequiredFieldValidator>
 						    </td>                            
 					    </tr>                        
-					</table> 
-
-                    <wsp:CollapsiblePanel id="secSelectSertificate" runat="server"
-                        TargetControlID="panelSelectSertificate" meta:resourcekey="secSelectSertificate" Text="">
-                    </wsp:CollapsiblePanel>		
-                    
-                    <asp:Panel runat="server" ID="panelSelectSertificate">                                                
-                        <div style="padding: 10px;">
-                            <div class="FormBody">
-                                <div class="FormField">
-                                    <asp:FileUpload ID="upPFX" runat="server"/>
-                                </div>
-                                <div class="FormFieldDescription">
-                                    <asp:Localize runat="server" meta:resourcekey="lblPFXInstallPassword" />
-                                </div>
-                                <div class="FormField">
-                                    <asp:TextBox ID="txtPFXInstallPassword" runat="server" TextMode="Password" CssClass="NormalTextBox" />
-                                </div>
-                            </div>
-                        </div>                            
-                    </asp:Panel>                   
+					</table>                                                                              
 
                     <fieldset id="RDSServersPanel" runat="server">
                         <legend><asp:Localize ID="locRDSServersSection" runat="server" meta:resourcekey="locRDSServersSection" Text="RDS Servers"></asp:Localize></legend>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
index 21ef3c4d..2d21ad7e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
@@ -63,21 +63,7 @@ namespace WebsitePanel.Portal.RDS
                 }
 
                 RdsCollection collection = new RdsCollection{ Name = txtCollectionName.Text, DisplayName = txtCollectionName.Text, Servers = servers.GetServers(), Description = "" };
-                int collectionId = ES.Services.RDS.AddRdsCollection(PanelRequest.ItemID, collection);
-
-                try
-                {
-                    if (upPFX.HasFile.Equals(true))
-                    {
-                        byte[] pfx = upPFX.FileBytes;
-                        string certPassword = txtPFXInstallPassword.Text;
-                        //ES.Services.RDS.InstallSessionHostsCertificate(collectionId, pfx, certPassword);
-                    }
-                }
-                catch(Exception ex)
-                {
-                    messageBox.ShowErrorMessage("RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED", ex);
-                }
+                int collectionId = ES.Services.RDS.AddRdsCollection(PanelRequest.ItemID, collection);                
 
                 Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_edit_collection", "CollectionId=" + collectionId, "ItemID=" + PanelRequest.ItemID));
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.designer.cs
index f61636b8..b1666d95 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.designer.cs
@@ -75,42 +75,6 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator valCollectionName;
         
-        /// <summary>
-        /// secSelectSertificate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.CollapsiblePanel secSelectSertificate;
-        
-        /// <summary>
-        /// panelSelectSertificate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel panelSelectSertificate;
-        
-        /// <summary>
-        /// upPFX 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.FileUpload upPFX;
-        
-        /// <summary>
-        /// txtPFXInstallPassword 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 txtPFXInstallPassword;
-        
         /// <summary>
         /// RDSServersPanel control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx
index 6095f06d..e7cf4275 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx
@@ -55,8 +55,12 @@
                         </div>                            
                     </asp:Panel>
                     <div class="FormFooterClean">
-                        <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="SaveRDSCollection" 
-                            OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />
+                        <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave" 
+                            OnClick="btnSave_Click" OnClientClick="ShowProgressDialog('Updating ...');"></asp:Button>
+                        <asp:Button id="btnSaveExit" runat="server" Text="Save Changes and Exit" CssClass="Button1" meta:resourcekey="btnSaveExit" 
+                            OnClick="btnSaveExit_Click" OnClientClick="ShowProgressDialog('Updating ...');"></asp:Button>
+                        <asp:Button id="btnExit" runat="server" Text="Back to Applications List" CssClass="Button1" meta:resourcekey="btnExit" 
+                            OnClick="btnExit_Click" OnClientClick="ShowProgressDialog('Loading ...');"></asp:Button>
 			        </div>
 				</div>				
 			</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
index 41bdec12..2a9be753 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
@@ -100,5 +100,10 @@ namespace WebsitePanel.Portal.RDS
                 Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_collection_edit_apps", "CollectionId=" + PanelRequest.CollectionID, "ItemID=" + PanelRequest.ItemID));
             }
         }
+
+        protected void btnExit_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_collection_edit_apps", "CollectionId=" + PanelRequest.CollectionID, "ItemID=" + PanelRequest.ItemID));
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.designer.cs
index fd65d541..62030191 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.designer.cs
@@ -139,12 +139,30 @@ namespace WebsitePanel.Portal.RDS {
         protected global::WebsitePanel.Portal.RDS.UserControls.RDSCollectionUsers users;
         
         /// <summary>
-        /// buttonPanel control.
+        /// btnSave control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::WebsitePanel.Portal.ItemButtonPanel buttonPanel;
+        protected global::System.Web.UI.WebControls.Button btnSave;
+        
+        /// <summary>
+        /// btnSaveExit 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 btnSaveExit;
+        
+        /// <summary>
+        /// btnExit 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 btnExit;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx
index 7f71695d..57a37195 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx
@@ -1,6 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDSEditCollectionUsers.ascx.cs" Inherits="WebsitePanel.Portal.RDS.RDSEditCollectionUsers" %>
 <%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
 <%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/RDSCollectionUsers.ascx" TagName="CollectionUsers" TagPrefix="wsp"%>
 <%@ Register Src="UserControls/RDSCollectionTabs.ascx" TagName="CollectionTabs" TagPrefix="wsp" %>
 <%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../UserControls/CollapsiblePanel.ascx" %>
@@ -34,6 +35,11 @@
                             <wsp:CollectionUsers id="users" runat="server" />
                         </div>                            
                     </asp:Panel>
+                    <div>
+				        <asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota" Text="Users Created:"></asp:Localize>
+				        &nbsp;&nbsp;&nbsp;
+				        <wsp:QuotaViewer ID="usersQuota" runat="server" QuotaTypeId="2" DisplayGauge="true" />
+                    </div>
                     <div class="FormFooterClean">
                         <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="SaveRDSCollection" 
                             OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
index beaeed58..767eab4f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
@@ -39,9 +39,10 @@ namespace WebsitePanel.Portal.RDS
     {
         
         protected void Page_Load(object sender, EventArgs e)
-        {
+        {            
             if (!IsPostBack)
             {
+                BindQuota();
                 var collectionUsers = ES.Services.RDS.GetRdsCollectionUsers(PanelRequest.CollectionID);
                 var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
                 
@@ -50,6 +51,20 @@ namespace WebsitePanel.Portal.RDS
             }
         }
 
+        private void BindQuota()
+        {
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+            OrganizationStatistics stats = ES.Services.Organizations.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
+            OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
+            usersQuota.QuotaUsedValue = stats.CreatedRdsUsers;
+            usersQuota.QuotaValue = stats.AllocatedRdsUsers;
+
+            if (stats.AllocatedUsers != -1)
+            {
+                usersQuota.QuotaAvailable = tenantStats.AllocatedRdsUsers - tenantStats.CreatedRdsUsers;
+            }
+        }
+
         private bool SaveRdsUsers()
         {
             try
@@ -73,6 +88,7 @@ namespace WebsitePanel.Portal.RDS
             }
 
             SaveRdsUsers();
+            BindQuota();
         }
 
         protected void btnSaveExit_Click(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.designer.cs
index b4cdce32..e584e549 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.designer.cs
@@ -93,6 +93,24 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::WebsitePanel.Portal.RDS.UserControls.RDSCollectionUsers users;
         
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// usersQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer usersQuota;
+        
         /// <summary>
         /// buttonPanel control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
index 642ed06a..9afc8a5b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
@@ -38,10 +38,11 @@
                                     <asp:GridView ID="gvRDSUserSessions" runat="server" AutoGenerateColumns="False" EnableViewState="true"
                                         Width="100%" EmptyDataText="gvRDSUserSessions" CssSelectorClass="NormalGridView"
                                         OnRowCommand="gvRDSCollections_RowCommand" AllowPaging="True" AllowSorting="True">
-                                        <Columns>
+                                        <Columns>                                            
                                             <asp:TemplateField meta:resourcekey="gvUserName" HeaderText="gvUserName">
                                                 <ItemStyle Width="30%" Wrap="false"/>
                                                 <ItemTemplate>
+                                                    <asp:Image ID="vipImage" runat="server" ImageUrl='<%# GetAccountImage(Convert.ToBoolean(Eval("IsVip"))) %>' ImageAlign="AbsMiddle"/>
                                                     <asp:Literal ID="litUserName" runat="server" Text='<%# Eval("UserName") %>'/>
                                                     <asp:HiddenField ID="hfUnifiedSessionId" runat="server"  Value='<%# Eval("UnifiedSessionId") %>'/>
                                                 </ItemTemplate>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
index 79e37ea8..9938e16e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
@@ -5,6 +5,8 @@ using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.Providers.RemoteDesktopServices;
 
 namespace WebsitePanel.Portal.RDS
@@ -101,5 +103,15 @@ namespace WebsitePanel.Portal.RDS
             gvRDSUserSessions.DataSource = userSessions;
             gvRDSUserSessions.DataBind();
         }
+
+        public string GetAccountImage(bool vip)
+        {
+            if (vip)
+            {
+                return GetThemedImage("Exchange/vip_user_16.png");
+            }
+
+            return GetThemedImage("Exchange/accounting_mail_16.png");
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
index 15bf0ecc..0474d715 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
@@ -210,7 +210,7 @@ namespace WebsitePanel.Portal.RDS.UserControls
 
                 RemoteApplication app = new RemoteApplication();
                 app.Alias = (string)gvApps.DataKeys[i][0];
-                app.DisplayName = ((HyperLink)row.FindControl("lnkDisplayName")).Text;
+                app.DisplayName = ((LinkButton)row.FindControl("lnkDisplayName")).Text;
                 app.FilePath = ((HiddenField)row.FindControl("hfFilePath")).Value;
                 app.RequiredCommandLine = ((HiddenField)row.FindControl("hfRequiredCommandLine")).Value;
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
index 0aa32a4e..c38baf43 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
@@ -5,11 +5,18 @@
 <%@ Register Src="UserControls/UserDetails.ascx" TagName="UserDetails" TagPrefix="uc2" %>
 <%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
 <%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
 
-<asp:UpdatePanel runat="server" ID="updatePanelUsers">
-    <ContentTemplate> 
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
 
+<asp:UpdatePanel runat="server" ID="messageBoxPanel" UpdateMode="Conditional">
+    <ContentTemplate>
         <wsp:SimpleMessageBox id="messageBox" runat="server" />
+    </ContentTemplate>    
+</asp:UpdatePanel>
+<asp:UpdatePanel runat="server" ID="updatePanelUsers">
+    <ContentTemplate>         
 
         <div class="FormButtonsBar">
             <div class="Left">
@@ -43,11 +50,45 @@
 	        <Columns>
 		        <asp:BoundField DataField="Name" HtmlEncode="true" SortExpression="Name" HeaderText="Server name">
 		            <HeaderStyle Wrap="false" />
-                    <ItemStyle Wrap="False" Width="25%"/>
+                    <ItemStyle Wrap="False" Width="15%"/>
                 </asp:BoundField>
-		        <asp:BoundField DataField="Address" HeaderText="IP Address"><ItemStyle  Width="15%"/></asp:BoundField>
-                <asp:BoundField DataField="ItemName" HeaderText="Organization"><ItemStyle  Width="20%"/></asp:BoundField>
-                <asp:BoundField DataField="Description" HeaderText="Comments"><ItemStyle  Width="30%"/></asp:BoundField>
+		        <asp:BoundField DataField="Address" HeaderText="IP Address"><ItemStyle  Width="10%"/></asp:BoundField>
+                <asp:BoundField DataField="ItemName" HeaderText="Organization"><ItemStyle  Width="10%"/></asp:BoundField>
+                <asp:BoundField DataField="Description" HeaderText="Comments"><ItemStyle  Width="20%"/></asp:BoundField>
+                <asp:TemplateField meta:resourcekey="gvPopupStatus">
+                    <ItemStyle Width="20%" HorizontalAlign="Left" />
+                    <ItemTemplate>
+                        <asp:Literal ID="litStatus" runat="server" Text='<%# Eval("Status") %>'></asp:Literal>
+                        <asp:HiddenField ID="hdnRdsCollectionId" runat="server" Value='<%# Eval("RdsCollectionId") %>' />
+                    </ItemTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField meta:resourcekey="gvViewInfo">
+                    <ItemStyle Width="8%" HorizontalAlign="Right"/>
+                    <ItemTemplate>
+                        <asp:LinkButton OnClientClick="ShowProgressDialog('Getting Server Info ...');return true;" Visible='<%# Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>' CommandName="ViewInfo" CommandArgument='<%# Eval("Id")%>' ID="lbViewInfo" runat="server" Text="View Info"/>
+                    </ItemTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField meta:resourcekey="gvRestart">
+                    <ItemStyle HorizontalAlign="Right"/>
+                    <ItemTemplate>
+                        <asp:LinkButton ID="lbRestart" CommandName="Restart" CommandArgument='<%# Eval("Id")%>' Visible='<%# Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
+                            runat="server" Text="Restart" OnClientClick="if(confirm('Are you sure you want to restart selected server?')) ShowProgressDialog('Loading...'); else return false;"/>
+                    </ItemTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField meta:resourcekey="gvShutdown">
+                    <ItemStyle Width="9%" HorizontalAlign="Right"/>
+                    <ItemTemplate>
+                        <asp:LinkButton ID="lbShutdown" CommandName="ShutDown" CommandArgument='<%# Eval("Id")%>' Visible='<%# Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
+                            runat="server" Text="Shut Down" OnClientClick="if(confirm('Are you sure you want to shut down selected server?')) ShowProgressDialog('Loading...'); else return false;"/>
+                    </ItemTemplate>
+                </asp:TemplateField>
+                <asp:TemplateField>
+			        <ItemTemplate>
+				        <asp:LinkButton ID="lnkInstallCertificate" runat="server" Text="Certificate" Visible='<%# Eval("ItemId") != null && Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
+					        CommandName="InstallCertificate" CommandArgument='<%# Eval("Id") %>' ToolTip="Repair Certificate"
+                            OnClientClick="if(confirm('Are you sure you want to install certificate?')) ShowProgressDialog('Installing certificate...'); else return false;"></asp:LinkButton>                        
+			        </ItemTemplate>
+		        </asp:TemplateField>
                 <asp:TemplateField>
 			        <ItemTemplate>
 				        <asp:LinkButton ID="lnkRemove" runat="server" Text="Remove" Visible='<%# Eval("ItemId") == null %>'
@@ -60,8 +101,107 @@
         <asp:ObjectDataSource ID="odsRDSServersPaged" runat="server" EnablePaging="True" SelectCountMethod="GetRDSServersPagedCount"
             SelectMethod="GetRDSServersPaged" SortParameterName="sortColumn" TypeName="WebsitePanel.Portal.RDSHelper" OnSelected="odsRDSServersPaged_Selected">
             <SelectParameters>
-                <asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
+                <asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />                
             </SelectParameters>
         </asp:ObjectDataSource>
-    </ContentTemplate>
+
+        <asp:Panel ID="ServerInfoPanel" runat="server" CssClass="Popup" style="display:none">
+            <table class="Popup-Header" cellpadding="0" cellspacing="0">
+                <tr>
+                    <td class="Popup-HeaderLeft"/>
+                    <td class="Popup-HeaderTitle">
+                        <asp:Localize ID="Localize1" runat="server" meta:resourcekey="headerServerInfo"/>
+                    </td>
+                    <td class="Popup-HeaderRight"/>
+                </tr>
+            </table>
+            <div class="Popup-Content">
+                <div class="Popup-Body">
+                    <br />
+                    <asp:UpdatePanel ID="serverInfoUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+                        <ContentTemplate>
+                            <div class="Popup-Scroll" style="height:auto;">
+                                <wsp:CollapsiblePanel id="secServerInfo" runat="server" TargetControlID="panelHardwareInfo" meta:resourcekey="secRdsApplicationEdit" Text=""/>                            
+                                <asp:Panel runat="server" ID="panelHardwareInfo">
+                                    <table>
+                                        <tr>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="locProcessor" runat="server" Text="Processor:"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="litProcessor" runat="server"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="locLoadPercentage" Text="Load Percentage:" runat="server"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="litLoadPercentage" runat="server"/>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="locMemoryAllocated" runat="server" Text="Allocated Memory:"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="litMemoryAllocated" runat="server"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="locFreeMemory" Text="Free Memory:" runat="server"/>
+                                            </td>
+                                            <td class="FormLabel150" style="width: 150px;">
+                                                <asp:Literal ID="litFreeMemory" runat="server"/>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </asp:Panel>
+                                <wsp:CollapsiblePanel id="secRdsApplicationEdit" runat="server" TargetControlID="panelDiskDrives" meta:resourcekey="secRdsApplicationEdit" Text="Disk Drives"/>
+                                <asp:Panel runat="server" ID="panelDiskDrives">
+                                    <table>
+                                        <asp:Repeater ID="rpServerDrives" runat="server" EnableViewState="false">
+                                            <ItemTemplate>
+                                                <tr>
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="litDeviceId" runat="server" Text='<%# Eval("DeviceId") %>'/>
+                                                    </td>
+                                                    <td class="FormLabel150" style="width: 150px;"/>                                                                                                                                    
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="locVolumeName" Text="Volume Name:" runat="server"/>
+                                                    </td>
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="litVolumeName" Text='<%# Eval("VolumeName") %>' runat="server"/>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="locSize" Text="Size:" runat="server"/>
+                                                    </td>
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="litSize" Text='<%# Eval("SizeMb") + " MB" %>' runat="server"/>
+                                                    </td>                                                                                                                                    
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="locFreeSpace" Text="Free Space:" runat="server"/>
+                                                    </td>
+                                                    <td class="FormLabel150" style="width: 150px;">
+                                                        <asp:Literal ID="litFreeSpace" Text='<%# Eval("FreeSpaceMb") + " MB" %>' runat="server"/>
+                                                    </td>
+                                                </tr>
+                                            </ItemTemplate>
+                                        </asp:Repeater>
+                                    </table>
+                                </asp:Panel>
+                            </div>
+                        </ContentTemplate>
+                    </asp:UpdatePanel>
+                    <br />
+                </div>
+                <div class="FormFooter">                
+                    <asp:Button ID="btnCancelServerInfo" runat="server" CssClass="Button1" meta:resourcekey="btnServerInfoCancel" Text="Cancel" CausesValidation="false" />
+                </div>
+            </div>
+        </asp:Panel>
+
+        <asp:Button ID="btnViewInfoFake" runat="server" style="display:none;" />
+        <ajaxToolkit:ModalPopupExtender ID="ViewInfoModal" runat="server" TargetControlID="btnViewInfoFake" PopupControlID="ServerInfoPanel" 
+            BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelServerInfo"/>
+    </ContentTemplate>    
 </asp:UpdatePanel>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
index 73454dff..eb5d9697 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
@@ -31,6 +31,7 @@ using System.Data;
 using System.Configuration;
 using System.Collections;
 using System.Web;
+using System.Linq;
 using System.Web.Security;
 using System.Web.UI;
 using System.Web.UI.WebControls;
@@ -39,13 +40,14 @@ using System.Web.UI.HtmlControls;
 
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.Common;
+using AjaxControlToolkit;
 
 namespace WebsitePanel.Portal
 {
     public partial class RDSServers : WebsitePanelModuleBase
 	{
 		protected void Page_Load(object sender, EventArgs e)
-		{
+		{            
 			if (!IsPostBack)
 			{
                 gvRDSServers.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue);
@@ -99,6 +101,28 @@ namespace WebsitePanel.Portal
                     ShowErrorMessage("REMOTE_DESKTOP_SERVICES_REMOVE_RDSSERVER", ex);
                 }
             }
+            else if (e.CommandName == "ViewInfo")
+            {
+                try
+                {
+                    ShowInfo(e.CommandArgument.ToString());
+                }
+                catch (Exception)
+                {
+                }
+            }
+            else if (e.CommandName == "Restart")
+            {
+                Restart(e.CommandArgument.ToString());
+            }
+            else if (e.CommandName == "ShutDown")
+            {
+                ShutDown(e.CommandArgument.ToString());
+            }
+            else if (e.CommandName == "InstallCertificate")
+            {
+                InstallCertificate(e.CommandArgument.ToString());
+            }
         }
 
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
@@ -107,5 +131,60 @@ namespace WebsitePanel.Portal
 
             gvRDSServers.DataBind();
         }
+
+        private void ShowInfo(string serverId)
+        {
+            ViewInfoModal.Show();
+            var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
+            var serverInfo = ES.Services.RDS.GetRdsServerInfo(rdsServer.ItemId.Value, rdsServer.FqdName);
+            litProcessor.Text = string.Format("{0}x{1} MHz", serverInfo.NumberOfCores, serverInfo.MaxClockSpeed);
+            litLoadPercentage.Text = string.Format("{0}%", serverInfo.LoadPercentage);
+            litMemoryAllocated.Text = string.Format("{0} MB", serverInfo.MemoryAllocatedMb);
+            litFreeMemory.Text = string.Format("{0} MB", serverInfo.FreeMemoryMb);
+            rpServerDrives.DataSource = serverInfo.Drives;
+            rpServerDrives.DataBind();
+            ((ModalPopupExtender)asyncTasks.FindControl("ModalPopupProperties")).Hide();
+        }
+
+        private void Restart(string serverId)
+        {
+            var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
+            ES.Services.RDS.RestartRdsServer(rdsServer.ItemId.Value, rdsServer.FqdName);
+            Response.Redirect(Request.Url.ToString(), true);
+        }
+
+        private void ShutDown(string serverId)
+        {
+            var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
+            ES.Services.RDS.ShutDownRdsServer(rdsServer.ItemId.Value, rdsServer.FqdName);
+            Response.Redirect(Request.Url.ToString(), true);
+        }
+
+        private void RefreshServerInfo()
+        {
+            var servers = odsRDSServersPaged.Select();
+            gvRDSServers.DataSource = servers;
+            gvRDSServers.DataBind();
+            ((ModalPopupExtender)asyncTasks.FindControl("ModalPopupProperties")).Hide();
+        }
+
+        private void InstallCertificate(string serverId)
+        {
+            var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));            
+
+            try
+            {
+                ES.Services.RDS.InstallSessionHostsCertificate(rdsServer);
+                ((ModalPopupExtender)asyncTasks.FindControl("ModalPopupProperties")).Hide();
+                ShowSuccessMessage("RDSSESSIONHOST_CERTIFICATE_INSTALLED");
+            }
+            catch(Exception ex)
+            {
+                ShowErrorMessage("RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED", ex);
+            }
+
+            messageBoxPanel.Update();
+//            Response.Redirect(Request.Url.ToString(), true);
+        }
 	}
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
index 2c725f52..13bd074f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -41,13 +13,22 @@ namespace WebsitePanel.Portal {
     public partial class RDSServers {
         
         /// <summary>
-        /// updatePanelUsers control.
+        /// asyncTasks control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.UpdatePanel updatePanelUsers;
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// messageBoxPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel messageBoxPanel;
         
         /// <summary>
         /// messageBox control.
@@ -58,6 +39,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
+        /// <summary>
+        /// updatePanelUsers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel updatePanelUsers;
+        
         /// <summary>
         /// btnAddRDSServer control.
         /// </summary>
@@ -129,5 +119,176 @@ namespace WebsitePanel.Portal {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsRDSServersPaged;
+        
+        /// <summary>
+        /// ServerInfoPanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel ServerInfoPanel;
+        
+        /// <summary>
+        /// Localize1 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 Localize1;
+        
+        /// <summary>
+        /// serverInfoUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel serverInfoUpdatePanel;
+        
+        /// <summary>
+        /// secServerInfo control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secServerInfo;
+        
+        /// <summary>
+        /// panelHardwareInfo control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelHardwareInfo;
+        
+        /// <summary>
+        /// locProcessor 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 locProcessor;
+        
+        /// <summary>
+        /// litProcessor 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 litProcessor;
+        
+        /// <summary>
+        /// locLoadPercentage 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 locLoadPercentage;
+        
+        /// <summary>
+        /// litLoadPercentage 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 litLoadPercentage;
+        
+        /// <summary>
+        /// locMemoryAllocated 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 locMemoryAllocated;
+        
+        /// <summary>
+        /// litMemoryAllocated 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 litMemoryAllocated;
+        
+        /// <summary>
+        /// locFreeMemory 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 locFreeMemory;
+        
+        /// <summary>
+        /// litFreeMemory 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 litFreeMemory;
+        
+        /// <summary>
+        /// secRdsApplicationEdit control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secRdsApplicationEdit;
+        
+        /// <summary>
+        /// panelDiskDrives control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel panelDiskDrives;
+        
+        /// <summary>
+        /// rpServerDrives 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.Repeater rpServerDrives;
+        
+        /// <summary>
+        /// btnCancelServerInfo 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 btnCancelServerInfo;
+        
+        /// <summary>
+        /// btnViewInfoFake 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 btnViewInfoFake;
+        
+        /// <summary>
+        /// ViewInfoModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender ViewInfoModal;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index e5fa35b0..28b18295 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -5678,7 +5678,9 @@
     <Content Include="VPSForPC\App_LocalResources\VpsDetailsGeneral.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_LocalResources\WebsitesSSL.ascx.resx" />
+    <Content Include="App_LocalResources\WebsitesSSL.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="VPSForPC\App_LocalResources\VpsDetailsHelp.ascx.resx">
       <SubType>Designer</SubType>
     </Content>

From 6b1c1660fef53d9cde092afcd2dd5bc8e9598f42 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 3 Mar 2015 17:52:19 -0500
Subject: [PATCH 13/46] Added tag build-2.1.0.603 for changeset be1e25a47be0


From f8de8a70d10c99db59b9fc36847b649644a4d9fe Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 4 Mar 2015 06:47:05 -0800
Subject: [PATCH 14/46] RDS Certificate fixes

---
 .../RemoteDesktopServicesProxy.cs             | 72 ++++++++++++++
 .../RemoteDesktopServicesController.cs        | 22 ++++-
 .../esRemoteDesktopServices.asmx.cs           |  6 ++
 .../RemoteDesktopServices/RdsServer.cs        |  1 +
 .../Windows2012.cs                            | 94 +++----------------
 .../WebsitePanel/Code/Helpers/RDSHelper.cs    |  1 +
 .../App_LocalResources/RDS_Settings.ascx.resx | 15 +++
 .../ProviderControls/RDS_Settings.ascx        | 76 ++++++++++++---
 .../ProviderControls/RDS_Settings.ascx.cs     | 25 ++++-
 .../RDS_Settings.ascx.designer.cs             | 54 +++++++++++
 .../WebsitePanel/RDSServers.ascx              |  2 +-
 .../WebsitePanel.Portal.Modules.csproj        |  4 +-
 12 files changed, 270 insertions(+), 102 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
index c5fba734..1bcb1bff 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
@@ -122,6 +122,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback GetRdsCertificateByServiceIdOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetRdsCertificateByItemIdOperationCompleted;
+        
         private System.Threading.SendOrPostCallback AddRdsCertificateOperationCompleted;
         
         /// <remarks/>
@@ -267,6 +269,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event GetRdsCertificateByServiceIdCompletedEventHandler GetRdsCertificateByServiceIdCompleted;
         
+        /// <remarks/>
+        public event GetRdsCertificateByItemIdCompletedEventHandler GetRdsCertificateByItemIdCompleted;
+        
         /// <remarks/>
         public event AddRdsCertificateCompletedEventHandler AddRdsCertificateCompleted;
         
@@ -2335,6 +2340,47 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCertificateByItemId", 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 RdsCertificate GetRdsCertificateByItemId(int itemId) {
+            object[] results = this.Invoke("GetRdsCertificateByItemId", new object[] {
+                        itemId});
+            return ((RdsCertificate)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetRdsCertificateByItemId(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetRdsCertificateByItemId", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public RdsCertificate EndGetRdsCertificateByItemId(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((RdsCertificate)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetRdsCertificateByItemIdAsync(int itemId) {
+            this.GetRdsCertificateByItemIdAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetRdsCertificateByItemIdAsync(int itemId, object userState) {
+            if ((this.GetRdsCertificateByItemIdOperationCompleted == null)) {
+                this.GetRdsCertificateByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsCertificateByItemIdOperationCompleted);
+            }
+            this.InvokeAsync("GetRdsCertificateByItemId", new object[] {
+                        itemId}, this.GetRdsCertificateByItemIdOperationCompleted, userState);
+        }
+        
+        private void OnGetRdsCertificateByItemIdOperationCompleted(object arg) {
+            if ((this.GetRdsCertificateByItemIdCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetRdsCertificateByItemIdCompleted(this, new GetRdsCertificateByItemIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddRdsCertificate", 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 AddRdsCertificate(RdsCertificate certificate) {
@@ -3578,6 +3624,32 @@ namespace WebsitePanel.EnterpriseServer {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetRdsCertificateByItemIdCompletedEventHandler(object sender, GetRdsCertificateByItemIdCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetRdsCertificateByItemIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetRdsCertificateByItemIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public RdsCertificate Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((RdsCertificate)(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void AddRdsCertificateCompletedEventHandler(object sender, AddRdsCertificateCompletedEventArgs e);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index 763e96aa..afc2a442 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -288,6 +288,11 @@ namespace WebsitePanel.EnterpriseServer
             return GetRdsCertificateByServiceIdInternal(serviceId);
         }
 
+        public static RdsCertificate GetRdsCertificateByItemId(int itemId)
+        {
+            return GetRdsCertificateByItemIdInternal(itemId);
+        }
+
         public static ResultObject AddRdsCertificate(RdsCertificate certificate)
         {
             return AddRdsCertificateInternal(certificate);
@@ -346,6 +351,21 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
+        private static RdsCertificate GetRdsCertificateByItemIdInternal(int itemId)
+        {
+            Organization org = OrganizationController.GetOrganization(itemId);
+
+            if (org == null)
+            {
+                return null;
+            }
+
+            int serviceId = GetRemoteDesktopServiceID(org.PackageId);
+            var result = ObjectUtils.FillObjectFromDataReader<RdsCertificate>(DataProvider.GetRdsCertificateByServiceId(serviceId));
+
+            return result;
+        }
+
         private static ResultObject AddRdsCertificateInternal(RdsCertificate certificate)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_RDS_SERVER");
@@ -431,7 +451,7 @@ namespace WebsitePanel.EnterpriseServer
             var organizationUsers = OrganizationController.GetOrganizationUsersPaged(collection.ItemId, null, null, null, 0, Int32.MaxValue).PageUsers;
             var organizationAdmins = rds.GetRdsCollectionLocalAdmins(org.OrganizationId, collection.Name);
 
-            return organizationUsers.Where(o => organizationAdmins.Select(a => a.ToLower()).Contains(o.DomainUserName.ToLower())).ToList();
+            return organizationUsers.Where(o => organizationAdmins.Select(a => a.ToLower()).Contains(o.SamAccountName.ToLower())).ToList();
         }
 
         private static ResultObject SaveRdsCollectionLocalAdminsInternal(OrganizationUser[] users, int collectionId)
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
index f377ff8d..cd1567ff 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
@@ -338,6 +338,12 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.GetRdsCertificateByServiceId(serviceId);
         }
 
+        [WebMethod]
+        public RdsCertificate GetRdsCertificateByItemId(int itemId)
+        {
+            return RemoteDesktopServicesController.GetRdsCertificateByItemId(itemId);
+        }
+
         [WebMethod]
         public ResultObject AddRdsCertificate(RdsCertificate certificate)
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServer.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServer.cs
index aa181ba7..f1485912 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServer.cs
@@ -48,5 +48,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         public int? RdsCollectionId { get; set; }
         public bool ConnectionEnabled { get; set; }
         public string Status { get; set; }
+        public bool SslAvailable { get; set; }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index ca1b4c3b..d86af8ba 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -67,13 +67,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string Admins = "Admins";        
         private const string RdsGroupFormat = "rds-{0}-{1}";
         private const string RdsModuleName = "RemoteDesktopServices";
-        private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";
-        private const string WspAdministratorsGroupName = "WSP-Org-Administrators";
+        private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";        
         private const string WspAdministratorsGroupDescription = "WSP Org Administrators";
         private const string RdsServersOU = "RDSServers";
         private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";
         private const string RDSHelpDeskGroup = "WSP-HelpDeskAdministrators";
-        private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators";                                                
+        private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators";
+        private const string LocalAdministratorsGroupName = "Administrators";
 
         #endregion
 
@@ -343,13 +343,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 //add session servers to group
                 foreach (var rdsServer in collection.Servers)
-                {                    
-                    if (!CheckLocalAdminsGroupExists(rdsServer.FqdName, runSpace))
-                    {
-                        CreateLocalAdministratorsGroup(rdsServer.FqdName, runSpace);
-                    }
-
-                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);
+                {                                        
+                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);                    
                     AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
                 }
             }                   
@@ -575,20 +570,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 ExecuteShellCommand(runSpace, cmd, false);
 
                 CheckOrCreateHelpDeskComputerGroup();
-                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
-
-                if (!CheckLocalAdminsGroupExists(server.FqdName, runSpace))
-                {
-                    CreateLocalAdministratorsGroup(server.FqdName, runSpace);
-                }
+                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);                
 
                 AddAdGroupToLocalAdmins(runSpace, server.FqdName, helpDeskGroupSamAccountName);
                 AddComputerToCollectionAdComputerGroup(organizationId, collectionName, server);
-            }
-            catch (Exception e)
-            {
-
-            }
+            }            
             finally
             {
                 CloseRunspace(runSpace);
@@ -1001,18 +987,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 }
 
                 foreach (var hostName in hosts)
-                {
-                    if (!CheckLocalAdminsGroupExists(hostName, runspace))
-                    {
-                        var errors = CreateLocalAdministratorsGroup(hostName, runspace);
-                        
-                        if (errors.Any())
-                        {
-                            Log.WriteWarning(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
-                            throw new Exception(string.Join("\r\n", errors.Select(e => e.ToString()).ToArray()));
-                        }                        
-                    }                                       
-
+                {                                                     
                     AddAdGroupToLocalAdmins(runspace, hostName, helpDeskGroupSamAccountName);
                     AddAdGroupToLocalAdmins(runspace, hostName, localAdminsGroupSamAccountName);
 
@@ -1029,60 +1004,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         {
             string groupName = GetLocalAdminsGroupName(collectionName);
             return GetUsersToCollectionAdGroup(collectionName, groupName, organizationId);
-        }        
-
-        private bool CheckLocalAdminsGroupExists(string hostName, Runspace runspace)
-        {
-            var scripts = new List<string>
-            {
-                string.Format("net localgroup {0}", WspAdministratorsGroupName)
-            };
-
-            object[] errors = null;
-            var result = ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
-
-            if (!errors.Any())
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private object[] CreateLocalAdministratorsGroup(string hostName, Runspace runspace)
-        {
-            var scripts = new List<string>
-            {
-                string.Format("$cn = [ADSI]\"WinNT://{0}\"", hostName),
-                string.Format("$group = $cn.Create(\"Group\", \"{0}\")", WspAdministratorsGroupName),
-                "$group.setinfo()",
-                string.Format("$group.description = \"{0}\"", WspAdministratorsGroupDescription),
-                "$group.setinfo()"
-            };
-
-            object[] errors = null;
-            ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
-
-            if (!errors.Any())
-            {
-                scripts = new List<string>
-                {
-                    string.Format("$GroupObj = [ADSI]\"WinNT://{0}/Administrators\"", hostName),
-                    string.Format("$GroupObj.Add(\"WinNT://{0}/{1}\")", hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), ""), WspAdministratorsGroupName)
-                };
-            
-                errors = null;
-                ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
-            }
-
-            return errors;
-        }      
+        }                     
         
         private void RemoveGroupFromLocalAdmin(string fqdnName, string hostName, string groupName, Runspace runspace)
         {            
             var scripts = new List<string>
             {
-                string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, WspAdministratorsGroupName),
+                string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, LocalAdministratorsGroupName),
                 string.Format("$GroupObj.Remove(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, RDSHelpDeskGroup),
                 string.Format("$GroupObj.Remove(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, groupName)
             };
@@ -1149,7 +1077,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         {                                    
             var scripts = new List<string>
             {
-                string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, WspAdministratorsGroupName),
+                string.Format("$GroupObj = [ADSI]\"WinNT://{0}/{1}\"", hostName, LocalAdministratorsGroupName),
                 string.Format("$GroupObj.Add(\"WinNT://{0}/{1}\")", ServerSettings.ADRootDomain, samAccountName)
             };
             
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
index 9b7c00d2..625145e4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
@@ -57,6 +57,7 @@ namespace WebsitePanel.Portal
                 if (rdsServer.ItemId.HasValue)
                 {
                     rdsServer.Status = ES.Services.RDS.GetRdsServerStatus(rdsServer.ItemId.Value, rdsServer.FqdName);
+                    rdsServer.SslAvailable = ES.Services.RDS.GetRdsCertificateByItemId(rdsServer.ItemId.Value) != null;
                 }
             }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
index 1b443a76..d8e514f9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
@@ -129,4 +129,19 @@
   <data name="lblPFXInstallPassword.Text" xml:space="preserve">
     <value>Certificate Password:</value>
   </data>
+  <data name="secCertificateSettings.Text" xml:space="preserve">
+    <value>SSL Certificate</value>
+  </data>
+  <data name="lblSelectFile.Text" xml:space="preserve">
+    <value>Select Certificate:</value>
+  </data>
+  <data name="lblExpiryDate.Text" xml:space="preserve">
+    <value>Expiry Date:</value>
+  </data>
+  <data name="lblIssuedBy.Text" xml:space="preserve">
+    <value>Issued By:</value>
+  </data>
+  <data name="lblSanName.Text" xml:space="preserve">
+    <value>SAN Name:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
index 57dbeecb..d98a066e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
@@ -1,17 +1,63 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDS_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.RDS_Settings" %>
-<table>    
-    <tr>
-        <td colspan ="2" style="padding: 10px 0 10px 0;"><asp:FileUpload ID="upPFX" runat="server"/></td>
-    </tr>
-    <tr><td></td></tr>
-    <tr>
-        <td class="SubHead" style="width:200px" nowrap>
-            <asp:Localize runat="server" meta:resourcekey="lblPFXInstallPassword" />
-        </td>
-        <td>                        
-            <asp:TextBox ID="txtPFXInstallPassword" runat="server" TextMode="Password" Width="200px" />
-        </td>
-    </tr>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<fieldset>
+    <legend>
+        <asp:Label ID="secCertificateSettings" runat="server" meta:resourcekey="secServiceSettings" Text="SSL Certificate" CssClass="NormalBold"></asp:Label>&nbsp;
+    </legend>    
+    <table>  
+        <tr>
+            <td class="SubHead" style="width:200px" nowrap>
+                <asp:Localize runat="server" meta:resourcekey="lblSelectFile" />
+            </td>
+            <td style="padding: 10px 0 10px 0;"><asp:FileUpload ID="upPFX" onchange="this.form.submit();"  runat="server"/></td>            
+        </tr>        
+        <tr><td></td></tr>
+        <tr>
+            <td class="SubHead" style="width:200px" nowrap>
+                <asp:Localize runat="server" meta:resourcekey="lblPFXInstallPassword" />
+            </td>
+            <td>                        
+                <asp:TextBox ID="txtPFXInstallPassword" runat="server" TextMode="Password" Width="200px" />
+            </td>
+        </tr>
+    </table> 
+    </fieldset>
+<fieldset>   
+    <legend>
+        <asp:Label ID="currentCertificate" runat="server" meta:resourcekey="currentCertificate" Text="Current Certificate" CssClass="NormalBold"></asp:Label>&nbsp;
+    </legend>
+            <asp:Panel ID="plCertificateInfo" Visible="false" runat="server">
+            <table>
+                <tr>
+                    <td class="SubHead" style="width:200px" nowrap>
+                        <asp:Localize runat="server" meta:resourcekey="lblIssuedBy" />
+                    </td>
+                    <td class="SubHead">                        
+                        <asp:Label ID="lblIssuedBy" runat="server"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="SubHead" style="width:200px" nowrap>
+                        <asp:Localize runat="server" meta:resourcekey="lblSanName" />
+                    </td>
+                    <td class="SubHead">                        
+                        <asp:Label ID="lblSanName" runat="server"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="SubHead" style="width:200px" nowrap>
+                        <asp:Localize runat="server" meta:resourcekey="lblExpiryDate" />
+                    </td>
+                    <td class="SubHead">                        
+                        <asp:Label ID="lblExpiryDate" runat="server"/>
+                    </td>
+                </tr>                
+            </table>
+            </asp:Panel>        
+</fieldset>
+<fieldset>
+<table>       
     <tr>
         <td class="SubHead" width="200" nowrap>
             <asp:Label runat="server" ID="lblConnectionBroker" meta:resourcekey="lblConnectionBroker" Text="Connection Broker:"/>
@@ -84,4 +130,6 @@
             </asp:GridView>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>    
+</fieldset>
+<br />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
index d85a1c61..020cc80d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
@@ -26,8 +26,10 @@
 // (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 AjaxControlToolkit;
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
 using System.Web.UI.WebControls;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.Common;
@@ -39,7 +41,7 @@ namespace WebsitePanel.Portal.ProviderControls
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-
+            FillCertificateInfo();
         }
 
         public string GWServers
@@ -54,6 +56,25 @@ namespace WebsitePanel.Portal.ProviderControls
             }
         }
 
+        private void FillCertificateInfo()
+        {
+            var certificate = ES.Services.RDS.GetRdsCertificateByServiceId(PanelRequest.ServiceId);
+
+            if (certificate != null)
+            {
+                var array = Convert.FromBase64String(certificate.Hash);
+                char[] chars = new char[array.Length / sizeof(char)];
+                System.Buffer.BlockCopy(array, 0, chars, 0, array.Length);
+                string password = new string(chars);
+                plCertificateInfo.Visible = true;
+                byte[] content = Convert.FromBase64String(certificate.Content);
+                var x509 = new X509Certificate2(content, password);
+                lblIssuedBy.Text = x509.Issuer.Replace("CN =", "").Replace("OU =", "").Replace("O =", "").Replace("L =", "").Replace("S =", "").Replace("C =", "");
+                lblExpiryDate.Text = x509.NotAfter.ToLongDateString();
+                lblSanName.Text = x509.SubjectName.Name.Replace("CN =", "");
+            }
+        }
+
         public void BindSettings(System.Collections.Specialized.StringDictionary settings)
         {                
             txtConnectionBroker.Text = settings["ConnectionBroker"];
@@ -163,7 +184,7 @@ namespace WebsitePanel.Portal.ProviderControls
                 GWServers = str.TrimEnd(';');
                 UpdateLyncServersGrid();
             }
-        }
+        }       
     }
 
     public class GWServer
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
index 9e1ba55e..0a5bf54b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
@@ -12,6 +12,15 @@ namespace WebsitePanel.Portal.ProviderControls {
     
     public partial class RDS_Settings {
         
+        /// <summary>
+        /// secCertificateSettings 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 secCertificateSettings;
+        
         /// <summary>
         /// upPFX control.
         /// </summary>
@@ -30,6 +39,51 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtPFXInstallPassword;
         
+        /// <summary>
+        /// currentCertificate 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 currentCertificate;
+        
+        /// <summary>
+        /// plCertificateInfo control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel plCertificateInfo;
+        
+        /// <summary>
+        /// lblIssuedBy 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 lblIssuedBy;
+        
+        /// <summary>
+        /// lblSanName 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 lblSanName;
+        
+        /// <summary>
+        /// lblExpiryDate 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 lblExpiryDate;
+        
         /// <summary>
         /// lblConnectionBroker control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
index c38baf43..1a6ef547 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
@@ -84,7 +84,7 @@
                 </asp:TemplateField>
                 <asp:TemplateField>
 			        <ItemTemplate>
-				        <asp:LinkButton ID="lnkInstallCertificate" runat="server" Text="Certificate" Visible='<%# Eval("ItemId") != null && Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
+				        <asp:LinkButton ID="lnkInstallCertificate" runat="server" Text="Certificate" Visible='<%# Convert.ToBoolean(Eval("SslAvailable")) && Eval("ItemId") != null && Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
 					        CommandName="InstallCertificate" CommandArgument='<%# Eval("Id") %>' ToolTip="Repair Certificate"
                             OnClientClick="if(confirm('Are you sure you want to install certificate?')) ShowProgressDialog('Installing certificate...'); else return false;"></asp:LinkButton>                        
 			        </ItemTemplate>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index 28b18295..bcae2dea 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -5865,7 +5865,9 @@
     </Content>
     <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="RDS\UserControls\App_LocalResources\RDSCollectionApps.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="ProviderControls\App_LocalResources\RDS_Settings.ascx.resx" />
     <Content Include="UserControls\App_LocalResources\DomainControl.ascx.resx">
       <SubType>Designer</SubType>

From 165847909fa27a0cea96765465c84dce148e3556 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 4 Mar 2015 06:55:34 -0800
Subject: [PATCH 15/46] RDS Certificate fixes

---
 .../WebsitePanel/ProviderControls/RDS_Settings.ascx.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
index 020cc80d..19c684e7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
@@ -69,9 +69,9 @@ namespace WebsitePanel.Portal.ProviderControls
                 plCertificateInfo.Visible = true;
                 byte[] content = Convert.FromBase64String(certificate.Content);
                 var x509 = new X509Certificate2(content, password);
-                lblIssuedBy.Text = x509.Issuer.Replace("CN =", "").Replace("OU =", "").Replace("O =", "").Replace("L =", "").Replace("S =", "").Replace("C =", "");
+                lblIssuedBy.Text = x509.Issuer.Replace("CN=", "").Replace("OU=", "").Replace("O=", "").Replace("L=", "").Replace("S=", "").Replace("C=", "");
                 lblExpiryDate.Text = x509.NotAfter.ToLongDateString();
-                lblSanName.Text = x509.SubjectName.Name.Replace("CN =", "");
+                lblSanName.Text = x509.SubjectName.Name.Replace("CN=", "");
             }
         }
 

From f75f2073a39b27ba8ce0c74a77d800d21c617a1f Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 4 Mar 2015 10:42:47 -0500
Subject: [PATCH 16/46] Added tag build-2.1.0.604 for changeset 468033cf4db8


From 7bc697534bbf136a2c397bac3c244359a2f7c446 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 5 Mar 2015 07:07:48 -0800
Subject: [PATCH 17/46] RDS fixes

---
 .../RemoteDesktopServicesController.cs        | 50 +++++++++++--------
 .../RemoteDesktopServices/RdsServersPaged.cs  |  3 +-
 .../Windows2012.cs                            | 12 ++++-
 .../WebsitePanel_SharedResources.ascx.resx    |  3 ++
 .../ProviderControls/RDS_Settings.ascx        |  2 +-
 .../RDS/RDSCreateCollection.ascx.cs           |  2 +-
 .../RDS/RDSEditApplicationUsers.ascx.cs       |  9 ++++
 .../RDS/RDSEditCollectionUsers.ascx.cs        | 10 ++++
 .../WebsitePanel/RDS/RDSLocalAdmins.ascx.cs   |  2 +
 .../RDS/UserControls/RDSCollectionUsers.ascx  |  4 +-
 .../UserControls/RDSCollectionUsers.ascx.cs   | 12 ++++-
 .../WebsitePanel/RDSServers.ascx              | 25 +++++-----
 .../WebsitePanel/RDSServers.ascx.designer.cs  | 36 ++++++-------
 .../WebsitePanel/RDSServersAddserver.ascx     |  8 +--
 .../WebsitePanel/RDSServersAddserver.ascx.cs  |  6 +--
 .../RDSServersAddserver.ascx.designer.cs      | 28 -----------
 16 files changed, 121 insertions(+), 91 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index afc2a442..dad53cc7 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -532,9 +532,23 @@ namespace WebsitePanel.EnterpriseServer
         private static int AddRdsCollectionInternal(int itemId, RdsCollection collection)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_RDS_COLLECTION");
+            var domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
 
             try
             {
+                foreach(var server in collection.Servers)
+                {                    
+                    if (!server.FqdName.EndsWith(domainName, StringComparison.CurrentCultureIgnoreCase))
+                    {                       
+                        throw TaskManager.WriteError(new Exception("Fully Qualified Domain Name not valid."));
+                    }
+
+                    if (!CheckRDSServerAvaliable(server.FqdName))
+                    {
+                        throw TaskManager.WriteError(new Exception(string.Format("Unable to connect to {0} server.", server.FqdName)));
+                    }
+                }
+
                 // load organization
                 Organization org = OrganizationController.GetOrganization(itemId);
                 if (org == null)
@@ -822,7 +836,7 @@ namespace WebsitePanel.EnterpriseServer
                 FillRdsServerData(tmpServer);                
             }
 
-            result.Servers = tmpServers.ToArray();
+            result.Servers = tmpServers.ToArray();            
 
             return result;
         }
@@ -1016,25 +1030,22 @@ namespace WebsitePanel.EnterpriseServer
             {
                 if (CheckRDSServerAvaliable(rdsServer.FqdName))
                 {
-                    rdsServer.Id = DataProvider.AddRDSServer(rdsServer.Name, rdsServer.FqdName, rdsServer.Description);
+                    var domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
+
+                    if (rdsServer.FqdName.EndsWith(domainName, StringComparison.CurrentCultureIgnoreCase))
+                    {
+                        rdsServer.Id = DataProvider.AddRDSServer(rdsServer.Name, rdsServer.FqdName, rdsServer.Description);
+                    }
+                    else
+                    {
+                        throw TaskManager.WriteError(new Exception("Fully Qualified Domain Name not valid."));
+                    }
                 }
                 else
                 {
-                    result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_SERVER", new Exception("The server that you are adding, is not available"));
-                    return result;
+                    throw TaskManager.WriteError(new Exception(string.Format("Unable to connect to {0} server. Please double check Server Full Name setting and retry.", rdsServer.FqdName)));
                 }
-            }
-            catch (Exception ex)
-            {
-                if (ex.InnerException != null)
-                {
-                    result.AddError("Unable to add RDS Server", ex.InnerException);
-                }
-                else
-                {
-                    result.AddError("Unable to add RDS Server", ex);
-                }
-            }
+            }            
             finally
             {
                 if (!result.IsSuccess)
@@ -1753,7 +1764,7 @@ namespace WebsitePanel.EnterpriseServer
         {
             bool result = false;
             var ping = new Ping();
-            var reply = ping.Send(hostname, 1000);
+            var reply = ping.Send(hostname, 1000);            
 
             if (reply.Status == IPStatus.Success)
             {
@@ -1761,8 +1772,7 @@ namespace WebsitePanel.EnterpriseServer
             }
 
             return result;
-        }
-
+        }        
 
         private static ResultObject DeleteRemoteDesktopServiceInternal(int itemId)
         {
@@ -1811,7 +1821,7 @@ namespace WebsitePanel.EnterpriseServer
         private static RemoteDesktopServices GetRemoteDesktopServices(int serviceId)
         {
             var rds = new RemoteDesktopServices();
-            ServiceProviderProxy.Init(rds, serviceId);
+            ServiceProviderProxy.Init(rds, serviceId);            
 
             return rds;
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServersPaged.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServersPaged.cs
index db523c2d..199ab34f 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServersPaged.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServersPaged.cs
@@ -26,11 +26,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 namespace WebsitePanel.Providers.RemoteDesktopServices
 {
     public class RdsServersPaged
     {
         public int RecordsCount { get; set; }
-        public RdsServer[] Servers { get; set; }
+        public RdsServer[] Servers { get; set; }        
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index d86af8ba..930584d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -1343,7 +1343,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             {
                 runSpace = OpenRunspace();
                 var feature = AddFeature(runSpace, hostName, "RDS-RD-Server", true, true);
-                installationResult = (bool)GetPSObjectProperty(feature, "Success");               
+                installationResult = (bool)GetPSObjectProperty(feature, "Success");
+
+                if (!IsFeatureInstalled(hostName, "Desktop-Experience", runSpace))
+                {
+                    feature = AddFeature(runSpace, hostName, "Desktop-Experience", true, false);
+                }
+
+                if (!IsFeatureInstalled(hostName, "NET-Framework-Core", runSpace))
+                {
+                    feature = AddFeature(runSpace, hostName, "NET-Framework-Core", true, false);
+                }
             }            
             finally
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 27590807..5269c27d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -5656,6 +5656,9 @@
   <data name="ERROR.RDSSESSIONHOST_CERTIFICATE_NOT_INSTALLED" xml:space="preserve">
     <value>Session host certificate not installed</value>
   </data>
+  <data name="ERROR.RDSSERVER_NOT_ADDED" xml:space="preserve">
+    <value>RDS Server not added</value>
+  </data>
   <data name="Success.RDSSESSIONHOST_CERTIFICATE_INSTALLED" xml:space="preserve">
     <value>Session host certificate has been installed</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
index d98a066e..62f67170 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
@@ -10,7 +10,7 @@
             <td class="SubHead" style="width:200px" nowrap>
                 <asp:Localize runat="server" meta:resourcekey="lblSelectFile" />
             </td>
-            <td style="padding: 10px 0 10px 0;"><asp:FileUpload ID="upPFX" onchange="this.form.submit();"  runat="server"/></td>            
+            <td style="padding: 10px 0 10px 0;"><asp:FileUpload ID="upPFX" runat="server"/></td>            
         </tr>        
         <tr><td></td></tr>
         <tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
index 2d21ad7e..5f09adc8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSCreateCollection.ascx.cs
@@ -69,7 +69,7 @@ namespace WebsitePanel.Portal.RDS
             }
             catch (Exception ex)
             {
-                messageBox.ShowErrorMessage("RDSCOLLECTION_NOT_CREATED", ex);
+                ShowErrorMessage("RDSCOLLECTION_NOT_CREATED", ex);
             }
         }
     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
index 2a9be753..4b4d828b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
@@ -52,6 +52,15 @@ namespace WebsitePanel.Portal.RDS
                 txtApplicationName.Text = remoteApp.DisplayName;
                 //var remoteAppUsers = organizationUsers.Where(x => applicationUsers.Contains(x.AccountName));
                 var remoteAppUsers = organizationUsers.Where(x => applicationUsers.Select(a => a.Split('\\').Last().ToLower()).Contains(x.SamAccountName.Split('\\').Last().ToLower()));
+                var localAdmins = ES.Services.RDS.GetRdsCollectionLocalAdmins(PanelRequest.CollectionID);
+
+                foreach(var user in remoteAppUsers)
+                {
+                    if (localAdmins.Select(l => l.AccountName).Contains(user.AccountName))
+                    {
+                        user.IsVIP = true;
+                    }
+                }
 
                 users.SetUsers(remoteAppUsers.ToArray());
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
index 767eab4f..f18e7ad0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
@@ -27,6 +27,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
+using System.Linq;
 using System.Web.UI.WebControls;
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.Common;
@@ -45,6 +46,15 @@ namespace WebsitePanel.Portal.RDS
                 BindQuota();
                 var collectionUsers = ES.Services.RDS.GetRdsCollectionUsers(PanelRequest.CollectionID);
                 var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
+                var localAdmins = ES.Services.RDS.GetRdsCollectionLocalAdmins(PanelRequest.CollectionID);
+
+                foreach (var user in collectionUsers)
+                {
+                    if (localAdmins.Select(l => l.AccountName).Contains(user.AccountName))
+                    {
+                        user.IsVIP = true;
+                    }
+                }
                 
                 litCollectionName.Text = collection.DisplayName;
                 users.SetUsers(collectionUsers);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
index 1ea540d9..d65093ef 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.RemoteDesktopServices;
 
 namespace WebsitePanel.Portal.RDS
 {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx
index 4ba1e5c0..93432cd3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx
@@ -23,8 +23,9 @@
 			<asp:TemplateField meta:resourcekey="gvUsersAccount" HeaderText="gvUsersAccount">
 				<ItemStyle Width="96%" Wrap="false" HorizontalAlign="Left">
 				</ItemStyle>
-				<ItemTemplate>
+				<ItemTemplate>                    
                     <asp:Literal ID="litAccount" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
+                    <asp:Image ID="Image1" runat="server" ImageUrl='<%# GetThemedImage("Exchange/admin_16.png") %>' Visible='<%# Convert.ToBoolean(Eval("IsVIP")) %>' ImageAlign="AbsMiddle" />
                     <asp:HiddenField ID="hdnSamAccountName" runat="server" Value='<%# Eval("SamAccountName") %>' />
 				</ItemTemplate>
 			</asp:TemplateField>
@@ -81,6 +82,7 @@
 									<asp:Image ID="imgAccount" runat="server" ImageUrl='<%# GetAccountImage((int)Eval("AccountType")) %>' ImageAlign="AbsMiddle" />
 									<asp:Literal ID="litDisplayName" runat="server" Text='<%# Eval("DisplayName") %>'></asp:Literal>
                                     <asp:HiddenField ID="hdnSamName" runat="server" Value='<%# Eval("SamAccountName") %>' />
+                                    <asp:HiddenField ID="hdnLocalAdmin" runat="server" Value='<%# Eval("IsVIP").ToString() %>' />
 								</ItemTemplate>
 							</asp:TemplateField>
 							<asp:TemplateField meta:resourcekey="gvAccountsEmail">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
index fdd2e6ce..f4fbbd8f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
@@ -132,6 +132,15 @@ namespace WebsitePanel.Portal.RDS.UserControls
 		protected void BindPopupAccounts()
 		{
             OrganizationUser[] accounts = ES.Services.Organizations.GetOrganizationUsersPaged(PanelRequest.ItemID, null, null, null, 0, Int32.MaxValue).PageUsers;
+            var localAdmins = ES.Services.RDS.GetRdsCollectionLocalAdmins(PanelRequest.CollectionID);
+
+            foreach (var user in accounts)
+            {
+                if (localAdmins.Select(l => l.AccountName).Contains(user.AccountName))
+                {
+                    user.IsVIP = true;
+                }
+            }
 
             accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();
             Array.Sort(accounts, CompareAccount);
@@ -221,7 +230,8 @@ namespace WebsitePanel.Portal.RDS.UserControls
                     {
                         AccountName = (string)gvPopupAccounts.DataKeys[i][0],
                         DisplayName = ((Literal)row.FindControl("litDisplayName")).Text,
-                        SamAccountName = ((HiddenField)row.FindControl("hdnSamName")).Value
+                        SamAccountName = ((HiddenField)row.FindControl("hdnSamName")).Value,
+                        IsVIP = Convert.ToBoolean(((HiddenField)row.FindControl("hdnLocalAdmin")).Value)
                     });
                 }
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
index 1a6ef547..61130777 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
@@ -15,10 +15,8 @@
         <wsp:SimpleMessageBox id="messageBox" runat="server" />
     </ContentTemplate>    
 </asp:UpdatePanel>
-<asp:UpdatePanel runat="server" ID="updatePanelUsers">
-    <ContentTemplate>         
 
-        <div class="FormButtonsBar">
+<div class="FormButtonsBar">
             <div class="Left">
                 <asp:Button ID="btnAddRDSServer" runat="server"
                     meta:resourcekey="btnAddRDSServer" Text="Add RDS Server" CssClass="Button3"
@@ -35,11 +33,20 @@
                             <asp:ListItem>100</asp:ListItem>   
                     </asp:DropDownList>  
 
-                    <asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100">
-                    </asp:TextBox><asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton" CausesValidation="false"/>
+                    <asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox" Width="100"/>
+                    <asp:ImageButton ID="cmdSearch" Runat="server" meta:resourcekey="cmdSearch" SkinID="SearchButton" CausesValidation="false"/>                    
                 </asp:Panel>
             </div>
         </div>
+<asp:ObjectDataSource ID="odsRDSServersPaged" runat="server" EnablePaging="True" SelectCountMethod="GetRDSServersPagedCount"
+            SelectMethod="GetRDSServersPaged" SortParameterName="sortColumn" TypeName="WebsitePanel.Portal.RDSHelper" OnSelected="odsRDSServersPaged_Selected">
+            <SelectParameters>
+                <asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />                                
+            </SelectParameters>
+        </asp:ObjectDataSource>
+
+<asp:UpdatePanel runat="server" ID="updatePanelUsers" UpdateMode="Conditional">
+    <ContentTemplate>                 
 
         <asp:GridView id="gvRDSServers" runat="server" AutoGenerateColumns="False"
 	        AllowPaging="True" AllowSorting="True"
@@ -97,13 +104,7 @@
 			        </ItemTemplate>
 		        </asp:TemplateField>
 	        </Columns>
-        </asp:GridView>
-        <asp:ObjectDataSource ID="odsRDSServersPaged" runat="server" EnablePaging="True" SelectCountMethod="GetRDSServersPagedCount"
-            SelectMethod="GetRDSServersPaged" SortParameterName="sortColumn" TypeName="WebsitePanel.Portal.RDSHelper" OnSelected="odsRDSServersPaged_Selected">
-            <SelectParameters>
-                <asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />                
-            </SelectParameters>
-        </asp:ObjectDataSource>
+        </asp:GridView>        
 
         <asp:Panel ID="ServerInfoPanel" runat="server" CssClass="Popup" style="display:none">
             <table class="Popup-Header" cellpadding="0" cellspacing="0">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
index 13bd074f..4dbf154c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.designer.cs
@@ -39,15 +39,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
-        /// <summary>
-        /// updatePanelUsers control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdatePanel updatePanelUsers;
-        
         /// <summary>
         /// btnAddRDSServer control.
         /// </summary>
@@ -102,15 +93,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ImageButton cmdSearch;
         
-        /// <summary>
-        /// gvRDSServers control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.GridView gvRDSServers;
-        
         /// <summary>
         /// odsRDSServersPaged control.
         /// </summary>
@@ -120,6 +102,24 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsRDSServersPaged;
         
+        /// <summary>
+        /// updatePanelUsers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel updatePanelUsers;
+        
+        /// <summary>
+        /// gvRDSServers control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvRDSServers;
+        
         /// <summary>
         /// ServerInfoPanel control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx
index e7f20993..cd8f8054 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx
@@ -11,16 +11,16 @@
     <div class="FormContentRDSConf">           
 	    <table>
             <tr>
-                <td class="FormLabel150"><asp:Localize ID="locServerName" runat="server" meta:resourcekey="locServerName" Text="Server Full Name:"></asp:Localize></td>
+                <td class="FormLabel260"><asp:Localize ID="locServerName" runat="server" meta:resourcekey="locServerName" Text="Server  Fully Qualified Domain Name:"></asp:Localize></td>
 			    <td>
-				    <asp:TextBox ID="txtServerName" runat="server" CssClass="NormalTextBox" Width="145px"></asp:TextBox>    
+				    <asp:TextBox ID="txtServerName" runat="server" CssClass="NormalTextBox" Width="300px"></asp:TextBox>    
                     <asp:RequiredFieldValidator ID="valServerName" runat="server" ErrorMessage="*" ControlToValidate="txtServerName"></asp:RequiredFieldValidator>                          
 			    </td>
 		    </tr>
             <tr>
-                <td class="FormLabel150"><asp:Localize ID="locServerComments" runat="server" meta:resourcekey="locServerComments" Text="Server Comments:"></asp:Localize></td>
+                <td class="FormLabel260"><asp:Localize ID="locServerComments" runat="server" meta:resourcekey="locServerComments" Text="Server Comments:"></asp:Localize></td>
 			    <td>
-				    <asp:TextBox ID="txtServerComments" runat="server" CssClass="NormalTextBox" Width="145px"></asp:TextBox>                     
+				    <asp:TextBox ID="txtServerComments" runat="server" CssClass="NormalTextBox" Width="300px"></asp:TextBox>                     
 			    </td>
 		    </tr>
 	    </table>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.cs
index 56878a9e..a9758e28 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.cs
@@ -62,8 +62,8 @@ namespace WebsitePanel.Portal
                 ResultObject result = ES.Services.RDS.AddRdsServer(rdsServer);
 
                 if (!result.IsSuccess && result.ErrorCodes.Count > 0)
-                {
-                    messageBox.ShowMessage(result, "", "");
+                {                    
+                    messageBox.ShowMessage(result, "RDSSERVER_NOT_ADDED", "");
                     return;
                 }
 
@@ -71,7 +71,7 @@ namespace WebsitePanel.Portal
             }
             catch (Exception ex)
             {
-                messageBox.ShowErrorMessage("", ex);
+                ShowErrorMessage("RDSSERVER_NOT_ADDED", ex);
             }
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.designer.cs
index f9e8f578..7bf05979 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

From 84c3b88bead2514dfd18eb8b4921b098b048dab7 Mon Sep 17 00:00:00 2001
From: Olov Karlsson <olov@vildmarksdata.se>
Date: Thu, 5 Mar 2015 20:28:41 +0100
Subject: [PATCH 18/46] Fixes in IIS80 SSL. Consistent storage of private keys
 and support for wildcard cert

---
 .../SSL/SSLModuleService80.cs                 | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/SSL/SSLModuleService80.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/SSL/SSLModuleService80.cs
index 58b731a6..01b8ab73 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/SSL/SSLModuleService80.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs80/SSL/SSLModuleService80.cs
@@ -84,7 +84,7 @@ namespace WebsitePanel.Providers.Web.Iis
                 X509CertificateCollection existCerts2 = storeMy.Certificates.Find(X509FindType.FindBySerialNumber, servercert.SerialNumber, false);
                 var certData = existCerts2[0].Export(X509ContentType.Pfx);
                 storeMy.Close();
-                var x509Cert = new X509Certificate2(certData);
+                var x509Cert = new X509Certificate2(certData, string.Empty, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                 if (UseCCS)
                 {
@@ -176,10 +176,10 @@ namespace WebsitePanel.Providers.Web.Iis
 		    if (UseCCS)
 		    {
 		        // We need to use this constructor or we won't be able to export this certificate
-		        x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);
+		        x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
 		        var certData = x509Cert.Export(X509ContentType.Pfx);
-		        var convertedCert = new X509Certificate2(certData, string.Empty, X509KeyStorageFlags.Exportable);
+		        var convertedCert = new X509Certificate2(certData, string.Empty, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
 		        // Attempts to move certificate to CCS UNC path
 		        try
@@ -205,7 +205,7 @@ namespace WebsitePanel.Providers.Web.Iis
 		    }
 		    else
 		    {
-		        x509Cert = new X509Certificate2(certificate, password);
+		        x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
 		        // Step 1: Register X.509 certificate in the store
 		        // Trying to keep X.509 store open as less as possible
@@ -278,7 +278,7 @@ namespace WebsitePanel.Providers.Web.Iis
 		            // Read certificate data from file
 		            var certData = new byte[fileStream.Length];
 		            fileStream.Read(certData, 0, (int) fileStream.Length);
-		            var convertedCert = new X509Certificate2(certData, CCSCommonPassword, X509KeyStorageFlags.Exportable);
+		            var convertedCert = new X509Certificate2(certData, CCSCommonPassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                     fileStream.Close();
 
@@ -311,7 +311,7 @@ namespace WebsitePanel.Providers.Web.Iis
                 {
                     hostNames.AddRange(certificate.Extensions.Cast<X509Extension>()
                         .Where(e => e.Oid.Value == "2.5.29.17") // Subject Alternative Names
-                        .SelectMany(e => e.Format(true).Split(new[] {"\r\n", "\n", "\n"}, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Split('=')[1])));
+                        .SelectMany(e => e.Format(true).Split(new[] {"\r\n", "\n", "\n"}, StringSplitOptions.RemoveEmptyEntries).Where(s => s.Contains("=")).Select(s => s.Split('=')[1])).Where(s => !s.Contains(" ")));
                 }
 
                 var simpleName = certificate.GetNameInfo(X509NameType.SimpleName, false);
@@ -320,7 +320,20 @@ namespace WebsitePanel.Providers.Web.Iis
                     hostNames.Add(simpleName);
                 }
 
-                // For every hostname (only one if using old school dedicated IP binding)
+                var wildcardHostName = hostNames.SingleOrDefault(h => h.StartsWith("*."));
+
+                // If a wildcard certificate is used
+                if (wildcardHostName != null)
+                {
+                    if (!dedicatedIp)
+                    {
+                        // If using a wildcard ssl and not a dedicated IP, we take all the matching bindings on the site and use it to bind to SSL also.
+                        hostNames.Remove(wildcardHostName);
+                        hostNames.AddRange(website.Bindings.Where(b => !string.IsNullOrEmpty(b.Host) && b.Host.EndsWith(wildcardHostName.Substring(2))).Select(b => b.Host));
+                    }
+                }
+
+                // For every hostname
                 foreach (var hostName in hostNames)
                 {
                     var bindingInformation = string.Format("{0}:443:{1}", website.SiteIPAddress ?? "*", dedicatedIp ? "" : hostName);

From e80a3ed713e3f9c82e7b69c2bd8dc7405f9a0c8a Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 5 Mar 2015 19:00:58 -0500
Subject: [PATCH 19/46] Added tag build-2.1.0.605 for changeset e2a6f9dc0605


From c62368596ce85dedd5d7ff2c2f8ca78848ebfadd Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 5 Mar 2015 23:30:34 -0800
Subject: [PATCH 20/46] RDSCollectionSettings table fix

---
 WebsitePanel/Database/update_db.sql | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index cbe31226..169faaa0 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -5508,6 +5508,29 @@ CREATE TABLE [dbo].[RDSCollectionSettings](
 
 GO
 
+IF NOT EXISTS(SELECT * FROM sys.columns 
+        WHERE [name] = N'SecurityLayer' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
+BEGIN
+	ALTER TABLE [dbo].[RDSCollectionSettings] ADD SecurityLayer NAVRCHAR(20) null;
+END
+GO
+
+IF NOT EXISTS(SELECT * FROM sys.columns 
+        WHERE [name] = N'EncryptionLevel' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
+BEGIN
+	ALTER TABLE [dbo].[RDSCollectionSettings] ADD EncryptionLevel NAVRCHAR(20) null;
+END
+GO
+
+IF NOT EXISTS(SELECT * FROM sys.columns 
+        WHERE [name] = N'AuthenticateUsingNLA' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
+BEGIN
+	ALTER TABLE [dbo].[RDSCollectionSettings] ADD AuthenticateUsingNLA BIT null;
+END
+GO
+
+
+
 IF NOT EXISTS(SELECT * FROM SYS.TABLES WHERE name = 'RDSCertificates')
 CREATE TABLE [dbo].[RDSCertificates](
 	[ID] [int] IDENTITY(1,1) NOT NULL,

From 909e9422484109e7dd42139f53e6ee0f8adfd65f Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Fri, 6 Mar 2015 03:12:01 -0800
Subject: [PATCH 21/46] RDSCollectionSettings table fix

---
 WebsitePanel/Database/update_db.sql           |  4 ++--
 .../RemoteDesktopServicesController.cs        | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 169faaa0..9d52ba3e 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -5511,14 +5511,14 @@ GO
 IF NOT EXISTS(SELECT * FROM sys.columns 
         WHERE [name] = N'SecurityLayer' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
 BEGIN
-	ALTER TABLE [dbo].[RDSCollectionSettings] ADD SecurityLayer NAVRCHAR(20) null;
+	ALTER TABLE [dbo].[RDSCollectionSettings] ADD SecurityLayer NVARCHAR(20) null;
 END
 GO
 
 IF NOT EXISTS(SELECT * FROM sys.columns 
         WHERE [name] = N'EncryptionLevel' AND [object_id] = OBJECT_ID(N'RDSCollectionSettings'))
 BEGIN
-	ALTER TABLE [dbo].[RDSCollectionSettings] ADD EncryptionLevel NAVRCHAR(20) null;
+	ALTER TABLE [dbo].[RDSCollectionSettings] ADD EncryptionLevel NVARCHAR(20) null;
 END
 GO
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index dad53cc7..2b0e1ab3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -499,19 +499,22 @@ namespace WebsitePanel.EnterpriseServer
             var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(collectionId));            
             var settings = ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId));
 
-            if (settings.SecurityLayer == null)
+            if (settings != null)
             {
-                settings.SecurityLayer = SecurityLayerValues.Negotiate.ToString();
-            }
+                if (settings.SecurityLayer == null)
+                {
+                    settings.SecurityLayer = SecurityLayerValues.Negotiate.ToString();
+                }
 
-            if (settings.EncryptionLevel == null)
-            {
-                settings.EncryptionLevel = EncryptionLevel.ClientCompatible.ToString();
-            }
+                if (settings.EncryptionLevel == null)
+                {
+                    settings.EncryptionLevel = EncryptionLevel.ClientCompatible.ToString();
+                }
 
-            if (settings.AuthenticateUsingNLA == null)
-            {
-                settings.AuthenticateUsingNLA = true;
+                if (settings.AuthenticateUsingNLA == null)
+                {
+                    settings.AuthenticateUsingNLA = true;
+                }
             }
 
             return settings;

From f9ab14dd955d7deb9aa7048c44e3302e4323552f Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Fri, 6 Mar 2015 04:20:49 -0800
Subject: [PATCH 22/46] Full Desktop Icon fix

---
 .../WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs     | 4 ++++
 .../WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs      | 4 ++++
 .../WebsitePanel/RDS/RDSLocalAdmins.ascx.cs              | 6 ++++++
 .../WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx | 1 +
 .../RDS/UserControls/RDSCollectionApps.ascx.cs           | 9 ++++++++-
 .../RDS/UserControls/RDSCollectionUsers.ascx.cs          | 4 ++++
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
index 4b4d828b..a5731696 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditApplicationUsers.ascx.cs
@@ -60,6 +60,10 @@ namespace WebsitePanel.Portal.RDS
                     {
                         user.IsVIP = true;
                     }
+                    else
+                    {
+                        user.IsVIP = false;
+                    }
                 }
 
                 users.SetUsers(remoteAppUsers.ToArray());
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
index f18e7ad0..5bcd026b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
@@ -54,6 +54,10 @@ namespace WebsitePanel.Portal.RDS
                     {
                         user.IsVIP = true;
                     }
+                    else
+                    {
+                        user.IsVIP = false;
+                    }
                 }
                 
                 litCollectionName.Text = collection.DisplayName;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
index d65093ef..7ce5ca79 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSLocalAdmins.ascx.cs
@@ -19,6 +19,12 @@ namespace WebsitePanel.Portal.RDS
                 var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
 
                 litCollectionName.Text = collection.DisplayName;
+
+                foreach(var user in collectionLocalAdmins)
+                {
+                    user.IsVIP = false;
+                }
+
                 users.SetUsers(collectionLocalAdmins);
             }
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx
index bbc141f1..36c6fb36 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx
@@ -28,6 +28,7 @@
                     <asp:LinkButton id="lnkDisplayName" meta:resourcekey="lnkDisplayName" runat="server" Text='<%# Eval("DisplayName")%>' CommandName="EditApplication" CommandArgument='<%# Eval("Alias") %>' OnClientClick="ShowProgressDialog('Loading ...');return true;"/>
                     <asp:HiddenField ID="hfFilePath" runat="server"  Value='<%# Eval("FilePath") %>'/>
                     <asp:HiddenField ID="hfRequiredCommandLine" runat="server"  Value='<%# Eval("RequiredCommandLine") %>'/>
+                    <asp:HiddenField ID="hfUsers" runat="server"  Value='<%# Eval("Users") != null ? "New" : null %>'/>
 				</ItemTemplate>
 			</asp:TemplateField>  
             <asp:TemplateField>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
index 0474d715..c293ea26 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
@@ -136,7 +136,7 @@ namespace WebsitePanel.Portal.RDS.UserControls
                     var fullRemote = new StartMenuApp
                     {
                         DisplayName = string.Format("Full Desktop - {0}", host.ToLower()),
-                        FilePath = "%SystemRoot%\\system32\\mstsc.exe",
+                        FilePath = "c:\\windows\\system32\\mstsc.exe",                        
                         RequiredCommandLine = string.Format("/v:{0}", host.ToLower())
                     };
 
@@ -213,6 +213,13 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 app.DisplayName = ((LinkButton)row.FindControl("lnkDisplayName")).Text;
                 app.FilePath = ((HiddenField)row.FindControl("hfFilePath")).Value;
                 app.RequiredCommandLine = ((HiddenField)row.FindControl("hfRequiredCommandLine")).Value;
+                var users = ((HiddenField)row.FindControl("hfUsers")).Value;
+
+                if (users != null)
+                {
+                    app.Users = new string[]{"New"};
+                }
+
 
                 if (state == SelectedState.All ||
                     (state == SelectedState.Selected && chkSelect.Checked) ||
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
index f4fbbd8f..40c4311a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
@@ -140,6 +140,10 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 {
                     user.IsVIP = true;
                 }
+                else
+                {
+                    user.IsVIP = false;
+                }                
             }
 
             accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();

From 9e930a732c76ec160a3de4d2d9bae5846bd28ba9 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 6 Mar 2015 08:19:10 -0500
Subject: [PATCH 23/46] Added tag build-2.1.0.606 for changeset d09701596b74


From 742b6ddf9e172065099e52ceeb1954d2b7fe35c3 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 6 Mar 2015 08:25:25 -0500
Subject: [PATCH 24/46] Added tag build-2.1.0.607 for changeset d09701596b74


From 0a64381dacdd1f1fcdb2168135c9fe41940a4dac Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 9 Mar 2015 03:16:45 -0700
Subject: [PATCH 25/46] webdav portal fixes

---
 .../Windows2012.cs                            | 32 +++++++++-
 .../Extensions/UriExtensions.cs               |  8 +++
 .../WebsitePanel.WebDav.Core/IResource.cs     |  2 +-
 .../Managers/WebDavManager.cs                 |  2 +-
 .../Controllers/FileSystemController.cs       |  3 +-
 .../Helpers/ViewDataHelper.cs                 | 31 +++++++++
 .../Resources/UI.Designer.cs                  | 63 +++++++++++++++++++
 .../Resources/UI.resx                         | 21 +++++++
 .../Views/FileSystem/_ResoursePartial.cshtml  |  3 +-
 .../WebsitePanel.WebDavPortal.csproj          |  1 +
 10 files changed, 161 insertions(+), 5 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Helpers/ViewDataHelper.cs

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
index b2eed0b3..f0a8caf3 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
@@ -342,7 +342,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
                                 }
                             }
 
-                            file.Summary = reader[6] as string;
+                            file.Summary = SanitizeXmlString(reader[6] as string);
 
                             result.Add(file);
                         }
@@ -354,6 +354,36 @@ namespace WebsitePanel.Providers.EnterpriseStorage
         }
 
 
+        public string SanitizeXmlString(string xml)
+        {
+            if (xml == null)
+            {
+                return null;
+            }
+
+            var buffer = new StringBuilder(xml.Length);
+
+            foreach (char c in xml.Where(c => IsLegalXmlChar(c)))
+            {
+                buffer.Append(c);
+            }
+
+            return buffer.ToString();
+        }
+
+        public bool IsLegalXmlChar(int character)
+        {
+            return
+            (
+                 character == 0x9 /* == '\t' == 9   */          ||
+                 character == 0xA /* == '\n' == 10  */          ||
+                 character == 0xD /* == '\r' == 13  */          ||
+                (character >= 0x20 && character <= 0xD7FF) ||
+                (character >= 0xE000 && character <= 0xFFFD) ||
+                (character >= 0x10000 && character <= 0x10FFFF)
+            );
+        }
+
         #region HostingServiceProvider methods
         
         public override string[] Install()
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
index 8ba4aeeb..0311ecce 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Extensions/UriExtensions.cs
@@ -9,5 +9,13 @@ namespace WebsitePanel.WebDav.Core.Extensions
         {
             return new Uri(paths.Aggregate(uri.AbsoluteUri, (current, path) => string.Format("{0}/{1}", current.TrimEnd('/'), path.TrimStart('/'))));
         }
+
+        public static string ToStringPath(this Uri uri)
+        {
+            var hostStart = uri.ToString().IndexOf(uri.Host, System.StringComparison.Ordinal);
+            var hostLength = uri.Host.Length;
+
+            return uri.ToString().Substring(hostStart + hostLength, uri.ToString().Length - hostStart - hostLength);
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
index 1a099ebf..2f706746 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
@@ -483,7 +483,7 @@ namespace WebsitePanel.WebDav.Core
             {
                 _href = href;
 
-                var baseUrl = href.AbsoluteUri.Remove(href.AbsoluteUri.Length - href.Segments.Last().Length);
+                var baseUrl = href.ToString().Remove(href.ToString().Length - href.ToString().Trim('/').Split('/').Last().Length);
 
                 _baseUri = new Uri(baseUrl);
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
index d3f837a7..5853f525 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
@@ -52,7 +52,7 @@ namespace WebsitePanel.WebDav.Core.Managers
                     Href = new Uri(x.Url), 
                     ItemType = ItemType.Folder,
                     ContentLength = x.Size * 1024 * 1024,
-                    AllocatedSpace = x.FRSMQuotaMB * 1024 * 1024, 
+                    AllocatedSpace = (long)x.FRSMQuotaMB * 1024 * 1024, 
                     IsRootItem = true
                 }).ToArray();
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 9d4016e1..c66cb750 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -352,7 +352,8 @@ namespace WebsitePanel.WebDavPortal.Controllers
             foreach (var item in items)
             {
                 var opener = _openerManager[Path.GetExtension(item.DisplayName)];
-                var pathPart = item.Href.AbsolutePath.Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
+                //var pathPart = item.Href.ToString().Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
+                var pathPart = item.Href.ToStringPath().Replace("/" + WspContext.User.OrganizationId, "").TrimStart('/');
 
                 switch (opener)
                 {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Helpers/ViewDataHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Helpers/ViewDataHelper.cs
new file mode 100644
index 00000000..6bcbccc6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Helpers/ViewDataHelper.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace WebsitePanel.WebDavPortal.Helpers
+{
+    public class ViewDataHelper
+    {
+        public static string BytesToSize(long bytes)
+        {
+            if (bytes == 0)
+            {
+                return string.Format("0 {0}", Resources.UI.Byte);
+            }
+
+            var k = 1024;
+
+            var sizes = new[]
+            {
+                Resources.UI.Bytes,
+                Resources.UI.KilobyteShort,
+                Resources.UI.MegabyteShort,
+                Resources.UI.GigabyteShort,
+                Resources.UI.TerabyteShort,
+                Resources.UI.PetabyteShort,
+                Resources.UI.ExabyteShort
+            };
+
+            var i = (int) Math.Floor(Math.Log(bytes)/Math.Log(k));
+            return string.Format("{0} {1}", Math.Round(bytes/Math.Pow(k, i), 3), sizes[i]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
index 0aa9d823..4a5a4578 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
@@ -69,6 +69,24 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Byte.
+        /// </summary>
+        public static string Byte {
+            get {
+                return ResourceManager.GetString("Byte", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bytes.
+        /// </summary>
+        public static string Bytes {
+            get {
+                return ResourceManager.GetString("Bytes", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -150,6 +168,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to EB.
+        /// </summary>
+        public static string ExabyteShort {
+            get {
+                return ResourceManager.GetString("ExabyteShort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -195,6 +222,24 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to KB.
+        /// </summary>
+        public static string KilobyteShort {
+            get {
+                return ResourceManager.GetString("KilobyteShort", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MB.
+        /// </summary>
+        public static string MegabyteShort {
+            get {
+                return ResourceManager.GetString("MegabyteShort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Modified.
         /// </summary>
@@ -240,6 +285,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to PB.
+        /// </summary>
+        public static string PetabyteShort {
+            get {
+                return ResourceManager.GetString("PetabyteShort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Please wait....
         /// </summary>
@@ -321,6 +375,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to TB.
+        /// </summary>
+        public static string TerabyteShort {
+            get {
+                return ResourceManager.GetString("TerabyteShort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Type.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
index 7d3fbf56..2ffe1406 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
@@ -120,6 +120,12 @@
   <data name="Actions" xml:space="preserve">
     <value>Actions</value>
   </data>
+  <data name="Byte" xml:space="preserve">
+    <value>Byte</value>
+  </data>
+  <data name="Bytes" xml:space="preserve">
+    <value>Bytes</value>
+  </data>
   <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
@@ -147,6 +153,9 @@
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="ExabyteShort" xml:space="preserve">
+    <value>EB</value>
+  </data>
   <data name="File" xml:space="preserve">
     <value>File</value>
   </data>
@@ -162,6 +171,12 @@
   <data name="ItemsWasRemovedFormat" xml:space="preserve">
     <value>{0} items was removed.</value>
   </data>
+  <data name="KilobyteShort" xml:space="preserve">
+    <value>KB</value>
+  </data>
+  <data name="MegabyteShort" xml:space="preserve">
+    <value>MB</value>
+  </data>
   <data name="Modified" xml:space="preserve">
     <value>Modified</value>
   </data>
@@ -177,6 +192,9 @@
   <data name="OrDragAndDropFilesHere" xml:space="preserve">
     <value>or drag and drop files here.</value>
   </data>
+  <data name="PetabyteShort" xml:space="preserve">
+    <value>PB</value>
+  </data>
   <data name="PleaseWaitWithDots" xml:space="preserve">
     <value>Please wait...</value>
   </data>
@@ -204,6 +222,9 @@
   <data name="Table" xml:space="preserve">
     <value>Table</value>
   </data>
+  <data name="TerabyteShort" xml:space="preserve">
+    <value>TB</value>
+  </data>
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
index 274f677b..9285872a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
@@ -4,6 +4,7 @@
 @using WebsitePanel.WebDav.Core.Config
 @using WebsitePanel.WebDavPortal.FileOperations
 @using Ninject;
+@using WebsitePanel.WebDavPortal.Helpers
 @using WebsitePanel.WebDavPortal.Resources
 @using WebsitePanel.WebDavPortal.UI
 @using WebsitePanel.WebDavPortal.UI.Routes
@@ -63,7 +64,7 @@
                     <p class="progress-text">@percent%</p>
                 </div>
             </div>
-            <p>@Math.Round(Convert.ToDecimal(resource.ContentLength) / 1024, 2) / @Math.Round(Convert.ToDecimal(resource.AllocatedSpace) / 1024, 2) @UI.GigabyteShort</p>
+            <p>@ViewDataHelper.BytesToSize(resource.ContentLength) / @ViewDataHelper.BytesToSize(resource.AllocatedSpace)</p>
         }
 
         <div class="selected-element-overlay">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
index 6ccbc782..a2c21f6c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
@@ -183,6 +183,7 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Helpers\DataTableHelper.cs" />
+    <Compile Include="Helpers\ViewDataHelper.cs" />
     <Compile Include="HttpHandlers\AccessTokenHandler.cs" />
     <Compile Include="HttpHandlers\FileTransferRequestHandler.cs" />
     <Compile Include="Mapping\AutoMapperPortalConfiguration.cs" />

From 2ce49650d4ab2a348762cf3d8db52588ebaed4f3 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 9 Mar 2015 03:55:14 -0700
Subject: [PATCH 26/46] webdav portal fixes

---
 WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
index 2f706746..8a46fff6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IResource.cs
@@ -260,7 +260,7 @@ namespace WebsitePanel.WebDav.Core
             {
                 get
                 {
-                    string displayName = _href.AbsoluteUri.Trim('/').Replace(_baseUri.AbsoluteUri.Trim('/'), "");
+                    string displayName = _href.ToString().Trim('/').Replace(_baseUri.ToString().Trim('/'), "");
                     displayName = Regex.Replace(displayName, "\\/$", "");
                     Match displayNameMatch = Regex.Match(displayName, "([\\/]+)$");
                     if (displayNameMatch.Success)

From d24cad7ac7f271d702f47e56bd088fa04163f9fb Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Mon, 9 Mar 2015 06:53:35 -0700
Subject: [PATCH 27/46] RDS Fixes

---
 .../Windows2012.cs                            | 116 +++++++++++++++++-
 .../App_LocalResources/RDS_Settings.ascx.resx |   3 +
 .../ProviderControls/RDS_Settings.ascx        |   9 ++
 .../ProviderControls/RDS_Settings.ascx.cs     |   2 +
 .../RDS_Settings.ascx.designer.cs             |  27 ++++
 .../UserControls/RDSCollectionApps.ascx.cs    |   2 +-
 6 files changed, 154 insertions(+), 5 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index 930584d2..39cac14c 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -70,7 +70,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";        
         private const string WspAdministratorsGroupDescription = "WSP Org Administrators";
         private const string RdsServersOU = "RDSServers";
-        private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";
+        private const string RdsServersRootOU = "RDSRootServers";
+        private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";        
         private const string RDSHelpDeskGroup = "WSP-HelpDeskAdministrators";
         private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators";
         private const string LocalAdministratorsGroupName = "Administrators";
@@ -95,6 +96,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }
 
+        private string ComputersRootOU
+        {
+            get
+            {
+                return ProviderSettings["ComputersRootOU"];
+            }
+        }
+
         private string CentralNpsHost
         {
             get
@@ -313,6 +322,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 CheckOrCreateHelpDeskComputerGroup();
                 string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
+                string groupName = GetLocalAdminsGroupName(collection.Name);
+                string groupPath = GetGroupPath(organizationId, collection.Name, groupName);
+                string localAdminsGroupSamAccountName = CheckOrCreateAdGroup(groupPath, GetOrganizationPath(organizationId), groupName, WspAdministratorsGroupDescription);
 
                 if (!ActiveDirectoryUtils.AdObjectExists(GetUsersGroupPath(organizationId, collection.Name)))
                 {
@@ -344,7 +356,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 //add session servers to group
                 foreach (var rdsServer in collection.Servers)
                 {                                        
-                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);                    
+                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);
+                    AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, localAdminsGroupSamAccountName);
                     AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
                 }
             }                   
@@ -570,8 +583,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 ExecuteShellCommand(runSpace, cmd, false);
 
                 CheckOrCreateHelpDeskComputerGroup();
-                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);                
+                string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
+                string groupName = GetLocalAdminsGroupName(collectionName);
+                string groupPath = GetGroupPath(organizationId, collectionName, groupName);
+                string localAdminsGroupSamAccountName = CheckOrCreateAdGroup(groupPath, GetOrganizationPath(organizationId), groupName, WspAdministratorsGroupDescription);
 
+                AddAdGroupToLocalAdmins(runSpace, server.FqdName, LocalAdministratorsGroupName);
                 AddAdGroupToLocalAdmins(runSpace, server.FqdName, helpDeskGroupSamAccountName);
                 AddComputerToCollectionAdComputerGroup(organizationId, collectionName, server);
             }            
@@ -1363,6 +1380,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return installationResult;
         }
 
+        private void CheckOrCreateComputersRoot(string computersRootPath)
+        {
+            if (ActiveDirectoryUtils.AdObjectExists(computersRootPath) && !ActiveDirectoryUtils.AdObjectExists(GetRdsServersGroupPath()))
+            {                
+                ActiveDirectoryUtils.CreateGroup(computersRootPath, RdsServersRootOU);
+            }
+        }
+
         public void MoveRdsServerToTenantOU(string hostName, string organizationId)
         {
             var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId);
@@ -1373,7 +1398,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
 
             hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
-            var computerPath = GetComputerPath(hostName, true);                                
+            var computerPath = GetComputerPath(hostName, true);
+            var rootComputerPath = GetRdsServerPath(hostName);
+            var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);            
+
+            if (!string.IsNullOrEmpty(ComputersRootOU))
+            {                
+                CheckOrCreateComputersRoot(GetComputersRootPath());
+            }
 
             if(!ActiveDirectoryUtils.AdObjectExists(computerPath))
             {
@@ -1385,6 +1417,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
 
+                if (!string.IsNullOrEmpty(ComputersRootOU))
+                {
+                    if (ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
+                    {
+                        ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetRdsServersGroupPath());
+                    }
+                }
+
                 if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU))
                 {                    
                     DirectoryEntry group = new DirectoryEntry(tenantComputerGroupPath);
@@ -1400,6 +1440,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId);
             hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
             var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);
+            var rootComputerPath = GetRdsServerPath(hostName);            
+
+            if (!string.IsNullOrEmpty(ComputersRootOU))
+            {
+                CheckOrCreateComputersRoot(GetComputersRootPath());
+            }
 
             var computerPath = GetComputerPath(hostName, true);
 
@@ -1417,6 +1463,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 {
                     ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, tenantComputerGroupPath);
                 }
+
+                if (ActiveDirectoryUtils.AdObjectExists(GetComputersRootPath()) && !string.IsNullOrEmpty(ComputersRootOU) && !ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
+                {
+                    DirectoryEntry group = new DirectoryEntry(GetRdsServersGroupPath());
+                    group.Invoke("Add", computerObject.Path);
+
+                    group.CommitChanges();
+                }
             }
         }
 
@@ -1543,6 +1597,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             {
                 remoteApp.Users = users;
             }
+            else
+            {
+                remoteApp.Users = null;
+            }
             
             return remoteApp;
         }
@@ -1734,6 +1792,56 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return sb.ToString();
         }
 
+        private string GetComputersRootPath()
+        {
+            StringBuilder sb = new StringBuilder();
+            
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendOUPath(sb, ComputersRootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        }
+
+        private string GetRdsServersGroupPath()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendCNPath(sb, RdsServersRootOU);
+            AppendOUPath(sb, ComputersRootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        }
+
+        private string GetRdsServerPath(string name)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendCNPath(sb, name);
+            AppendCNPath(sb, RdsServersRootOU);
+            AppendOUPath(sb, ComputersRootOU);
+            AppendDomainPath(sb, RootDomain);
+
+            return sb.ToString();
+        }
+
+        private string GetRootPath()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            AppendProtocol(sb);
+            AppendDomainController(sb);
+            AppendDomainPath(sb, RootDomain);        
+
+            return sb.ToString();
+        }
+
         internal string GetTenantComputerGroupPath(string organizationId)
         {
             StringBuilder sb = new StringBuilder();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
index d8e514f9..dd9c465d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/RDS_Settings.ascx.resx
@@ -144,4 +144,7 @@
   <data name="lblSanName.Text" xml:space="preserve">
     <value>SAN Name:</value>
   </data>
+  <data name="lblComputersRootOU.Text" xml:space="preserve">
+    <value>Computers Root OU:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
index 62f67170..415fd085 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx
@@ -76,6 +76,15 @@
             <asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtRootOU" ErrorMessage="*" Display="Dynamic" />
         </td>
     </tr>
+    <tr>
+        <td class="SubHead" width="200" nowrap>
+            <asp:Label runat="server" ID="lblComputersRootOU" meta:resourcekey="lblComputersRootOU" Text="Computers Root OU:"/>
+        </td>
+        <td class="Normal">
+            <asp:TextBox runat="server" ID="txtComputersRootOu" MaxLength="1000" Width="200px" />
+            <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtComputersRootOu" ErrorMessage="*" Display="Dynamic" />
+        </td>
+    </tr>
     <tr>
         <td class="SubHead" width="200" nowrap>
             <asp:Label runat="server" ID="lblPrimaryDomainController" meta:resourcekey="lblPrimaryDomainController" Text="Primary Domain Controller:"/>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
index 19c684e7..8806b61d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.cs
@@ -83,6 +83,7 @@ namespace WebsitePanel.Portal.ProviderControls
             UpdateLyncServersGrid();
 
             txtRootOU.Text = settings["RootOU"];
+            txtComputersRootOu.Text = settings["ComputersRootOU"];
             txtPrimaryDomainController.Text = settings["PrimaryDomainController"];
 
             if (!string.IsNullOrEmpty(settings["UseCentralNPS"]) && bool.TrueString == settings["UseCentralNPS"])
@@ -103,6 +104,7 @@ namespace WebsitePanel.Portal.ProviderControls
         {
             settings["ConnectionBroker"] = txtConnectionBroker.Text;
             settings["RootOU"] = txtRootOU.Text;
+            settings["ComputersRootOU"] = txtComputersRootOu.Text;
             settings["PrimaryDomainController"] = txtPrimaryDomainController.Text;
             settings["UseCentralNPS"] = chkUseCentralNPS.Checked.ToString();
             settings["CentralNPS"] = chkUseCentralNPS.Checked ? txtCentralNPS.Text : string.Empty;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
index 0a5bf54b..81ceb1a6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/RDS_Settings.ascx.designer.cs
@@ -138,6 +138,33 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator4;
         
+        /// <summary>
+        /// lblComputersRootOU 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 lblComputersRootOU;
+        
+        /// <summary>
+        /// txtComputersRootOu 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 txtComputersRootOu;
+        
+        /// <summary>
+        /// RequiredFieldValidator1 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 RequiredFieldValidator1;
+        
         /// <summary>
         /// lblPrimaryDomainController control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
index c293ea26..47e39a3d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionApps.ascx.cs
@@ -215,7 +215,7 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 app.RequiredCommandLine = ((HiddenField)row.FindControl("hfRequiredCommandLine")).Value;
                 var users = ((HiddenField)row.FindControl("hfUsers")).Value;
 
-                if (users != null)
+                if (!string.IsNullOrEmpty(users))
                 {
                     app.Users = new string[]{"New"};
                 }

From 9c991c861183861f21a3fec333d46aaa4fedf3b2 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 9 Mar 2015 10:22:42 -0400
Subject: [PATCH 28/46] Added tag build-2.1.0.608 for changeset 4ba072d0a9b2


From 4efc1b045697c4f6e5386fafd5054160636a82be Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 9 Mar 2015 11:23:41 -0400
Subject: [PATCH 29/46] Added tag build-2.1.0.609 for changeset 4b919035dcca


From a7672a30123e510b9f0a60572bcff1958a759d83 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 9 Mar 2015 12:05:24 -0400
Subject: [PATCH 30/46] Added tag build-2.1.0.610 for changeset 3056ccfd4d17


From fd8ca11f383d14f38bdfcb3911a8a1a059bce7d2 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 10 Mar 2015 06:31:40 -0700
Subject: [PATCH 31/46] Help desk groups descriptions added

---
 .../Windows2012.cs                            | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index 39cac14c..56a70d39 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -67,8 +67,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string Admins = "Admins";        
         private const string RdsGroupFormat = "rds-{0}-{1}";
         private const string RdsModuleName = "RemoteDesktopServices";
-        private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";        
-        private const string WspAdministratorsGroupDescription = "WSP Org Administrators";
+        private const string AddNpsString = "netsh nps add np name=\"\"{0}\"\" policysource=\"1\" processingorder=\"{1}\" conditionid=\"0x3d\" conditiondata=\"^5$\" conditionid=\"0x1fb5\" conditiondata=\"{2}\" conditionid=\"0x1e\" conditiondata=\"UserAuthType:(PW|CA)\" profileid=\"0x1005\" profiledata=\"TRUE\" profileid=\"0x100f\" profiledata=\"TRUE\" profileid=\"0x1009\" profiledata=\"0x7\" profileid=\"0x1fe6\" profiledata=\"0x40000000\"";
+        private const string WspAdministratorsGroupDescription = "WSP RDS Collection Adminstrators";
+        private const string RdsCollectionUsersGroupDescription = "WSP RDS Collection Users";
+        private const string RdsCollectionComputersGroupDescription = "WSP RDS Collection Computers";
         private const string RdsServersOU = "RDSServers";
         private const string RdsServersRootOU = "RDSRootServers";
         private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";        
@@ -310,27 +312,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 EditRdsCollectionSettingsInternal(collection, runSpace);
                 var orgPath = GetOrganizationPath(organizationId);
-
-                if (!ActiveDirectoryUtils.AdObjectExists(GetComputerGroupPath(organizationId, collection.Name)))
-                {
-                    //Create computer group
-                    ActiveDirectoryUtils.CreateGroup(orgPath, GetComputersGroupName(collection.Name));
-
-                    //todo Connection broker server must be added by default ???
-                    //ActiveDirectoryUtils.AddObjectToGroup(GetComputerPath(ConnectionBroker), GetComputerGroupPath(organizationId, collection.Name));
-                }
-
+                CheckOrCreateAdGroup(GetComputerGroupPath(organizationId, collection.Name), orgPath, GetComputersGroupName(collection.Name), RdsCollectionComputersGroupDescription);
                 CheckOrCreateHelpDeskComputerGroup();
                 string helpDeskGroupSamAccountName = CheckOrCreateAdGroup(GetHelpDeskGroupPath(RDSHelpDeskGroup), GetRootOUPath(), RDSHelpDeskGroup, RDSHelpDeskGroupDescription);
                 string groupName = GetLocalAdminsGroupName(collection.Name);
                 string groupPath = GetGroupPath(organizationId, collection.Name, groupName);
                 string localAdminsGroupSamAccountName = CheckOrCreateAdGroup(groupPath, GetOrganizationPath(organizationId), groupName, WspAdministratorsGroupDescription);
-
-                if (!ActiveDirectoryUtils.AdObjectExists(GetUsersGroupPath(organizationId, collection.Name)))
-                {
-                    //Create user group
-                    ActiveDirectoryUtils.CreateGroup(orgPath, GetUsersGroupName(collection.Name));
-                }
+                CheckOrCreateAdGroup(GetUsersGroupPath(organizationId, collection.Name), orgPath, GetUsersGroupName(collection.Name), RdsCollectionUsersGroupDescription);                
 
                 var capPolicyName = GetPolicyName(organizationId, collection.Name, RdsPolicyTypes.RdCap);
                 var rapPolicyName = GetPolicyName(organizationId, collection.Name, RdsPolicyTypes.RdRap);

From 743563baa20b8db0ea4e8a214b2a248254f6cfd5 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 01:09:08 -0700
Subject: [PATCH 32/46] RDS fixes

---
 .../Windows2012.cs                            | 148 ++++++------------
 .../RDS/RDSEditCollectionUsers.ascx.cs        |   6 +
 .../UserControls/RDSCollectionUsers.ascx.cs   |  21 ++-
 3 files changed, 71 insertions(+), 104 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index 56a70d39..41c6e520 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -71,8 +71,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string WspAdministratorsGroupDescription = "WSP RDS Collection Adminstrators";
         private const string RdsCollectionUsersGroupDescription = "WSP RDS Collection Users";
         private const string RdsCollectionComputersGroupDescription = "WSP RDS Collection Computers";
-        private const string RdsServersOU = "RDSServers";
-        private const string RdsServersRootOU = "RDSRootServers";
+        private const string RdsServersOU = "RDSServersOU";
+        private const string RdsServersRootOU = "RDSRootServersOU";
         private const string RDSHelpDeskComputerGroup = "Websitepanel-RDSHelpDesk-Computer";        
         private const string RDSHelpDeskGroup = "WSP-HelpDeskAdministrators";
         private const string RDSHelpDeskGroupDescription = "WSP Help Desk Administrators";
@@ -339,11 +339,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                 }
 
                 //add user group to collection
-                AddUserGroupsToCollection(runSpace, collection.Name, new List<string> { GetUsersGroupName(collection.Name) });
+                AddUserGroupsToCollection(runSpace, collection.Name, new List<string> { GetUsersGroupName(collection.Name) });                
 
                 //add session servers to group
                 foreach (var rdsServer in collection.Servers)
-                {                                        
+                {
+                    MoveRdsServerToTenantOU(rdsServer.Name, organizationId);
                     AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, helpDeskGroupSamAccountName);
                     AddAdGroupToLocalAdmins(runSpace, rdsServer.FqdName, localAdminsGroupSamAccountName);
                     AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
@@ -1281,28 +1282,22 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         }
 
         private void AddComputerToCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server)
-        {
-            var computerPath = GetComputerPath(server.Name, false);
-            var computerGroupName = GetComputersGroupName( collectionName);            
+        {            
+            var computerGroupName = GetComputersGroupName( collectionName);
+            var computerObject = GetComputerObject(server.Name);
 
-            if (!ActiveDirectoryUtils.AdObjectExists(computerPath))
-            {
-                computerPath = GetComputerPath(server.Name, true);
-            }
-
-            if (ActiveDirectoryUtils.AdObjectExists(computerPath))
-            {
-                var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
+            if (computerObject != null)
+            {                
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
 
                 if (!ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName))
                 {
-                    ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetComputerGroupPath(organizationId, collectionName));
+                    ActiveDirectoryUtils.AddObjectToGroup(computerObject.Path, GetComputerGroupPath(organizationId, collectionName));
                 }
 
                 if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
                 {
-                    ActiveDirectoryUtils.AddObjectToGroup(computerPath, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
+                    ActiveDirectoryUtils.AddObjectToGroup(computerObject.Path, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
                 }
             }
 
@@ -1310,30 +1305,24 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         }
 
         private void RemoveComputerFromCollectionAdComputerGroup(string organizationId, string collectionName, RdsServer server)
-        {
-            var computerPath = GetComputerPath(server.Name, false);
+        {            
             var computerGroupName = GetComputersGroupName(collectionName);
+            var computerObject = GetComputerObject(server.Name);
 
-            if (!ActiveDirectoryUtils.AdObjectExists(computerPath))
-            {
-                computerPath = GetComputerPath(server.Name, true);
-            }
-
-            if (ActiveDirectoryUtils.AdObjectExists(computerPath))
-            {
-                var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
+            if (computerObject != null)
+            {                
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
 
                 if (ActiveDirectoryUtils.IsComputerInGroup(samName, computerGroupName))
                 {
-                    ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetComputerGroupPath(organizationId, collectionName));
+                    ActiveDirectoryUtils.RemoveObjectFromGroup(computerObject.Path, GetComputerGroupPath(organizationId, collectionName));
                 }
 
                 if (ActiveDirectoryUtils.AdObjectExists(GetHelpDeskGroupPath(RDSHelpDeskComputerGroup)))
                 {
                     if (ActiveDirectoryUtils.IsComputerInGroup(samName, RDSHelpDeskComputerGroup))
                     {
-                        ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
+                        ActiveDirectoryUtils.RemoveObjectFromGroup(computerObject.Path, GetHelpDeskGroupPath(RDSHelpDeskComputerGroup));
                     }
                 }
             }
@@ -1372,7 +1361,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         {
             if (ActiveDirectoryUtils.AdObjectExists(computersRootPath) && !ActiveDirectoryUtils.AdObjectExists(GetRdsServersGroupPath()))
             {                
-                ActiveDirectoryUtils.CreateGroup(computersRootPath, RdsServersRootOU);
+                //ActiveDirectoryUtils.CreateGroup(computersRootPath, RdsServersRootOU);
+                ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersRootOU, computersRootPath);
             }
         }
 
@@ -1382,82 +1372,57 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             if (!ActiveDirectoryUtils.AdObjectExists(tenantComputerGroupPath))
             {
-                ActiveDirectoryUtils.CreateGroup(GetOrganizationPath(organizationId), RdsServersOU);
+                ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersOU, GetOrganizationPath(organizationId));
             }
 
-            hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
-            var computerPath = GetComputerPath(hostName, true);
+            hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");            
             var rootComputerPath = GetRdsServerPath(hostName);
             var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);            
 
             if (!string.IsNullOrEmpty(ComputersRootOU))
             {                
                 CheckOrCreateComputersRoot(GetComputersRootPath());
-            }
+            }            
+            
+            var computerObject = GetComputerObject(hostName);
 
-            if(!ActiveDirectoryUtils.AdObjectExists(computerPath))
+            if (computerObject != null)
             {
-                computerPath = GetComputerPath(hostName, false);
-            }
-
-            if (ActiveDirectoryUtils.AdObjectExists(computerPath))
-            {
-                var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
 
-                if (!string.IsNullOrEmpty(ComputersRootOU))
-                {
-                    if (ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
-                    {
-                        ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, GetRdsServersGroupPath());
-                    }
-                }
-
                 if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU))
-                {                    
+                {
                     DirectoryEntry group = new DirectoryEntry(tenantComputerGroupPath);
-                    group.Invoke("Add", computerObject.Path);
-
-                    group.CommitChanges();                    
+                    computerObject.MoveTo(group);
                 }
-            }            
+            } 
         }
 
         public void RemoveRdsServerFromTenantOU(string hostName, string organizationId)
         {
             var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId);
-            hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");
-            var tenantComputerPath = GetTenantComputerPath(hostName, organizationId);
-            var rootComputerPath = GetRdsServerPath(hostName);            
+            hostName = hostName.ToLower().Replace(string.Format(".{0}", ServerSettings.ADRootDomain.ToLower()), "");                                    
 
             if (!string.IsNullOrEmpty(ComputersRootOU))
             {
                 CheckOrCreateComputersRoot(GetComputersRootPath());
-            }
+            }            
 
-            var computerPath = GetComputerPath(hostName, true);
-
-            if (!ActiveDirectoryUtils.AdObjectExists(computerPath))
+            if (!ActiveDirectoryUtils.AdObjectExists(tenantComputerGroupPath))
             {
-                computerPath = GetComputerPath(hostName, false);
+                ActiveDirectoryUtils.CreateOrganizationalUnit(RdsServersOU, GetOrganizationPath(organizationId));
             }
-
-            if (ActiveDirectoryUtils.AdObjectExists(computerPath))
+            
+            var computerObject = GetComputerObject(hostName);
+            
+            if (computerObject != null)
             {
-                var computerObject = ActiveDirectoryUtils.GetADObject(computerPath);
                 var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
-
-                if (ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersOU))
-                {
-                    ActiveDirectoryUtils.RemoveObjectFromGroup(computerPath, tenantComputerGroupPath);
-                }
-
+                
                 if (ActiveDirectoryUtils.AdObjectExists(GetComputersRootPath()) && !string.IsNullOrEmpty(ComputersRootOU) && !ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
                 {
                     DirectoryEntry group = new DirectoryEntry(GetRdsServersGroupPath());
-                    group.Invoke("Add", computerObject.Path);
-
-                    group.CommitChanges();
+                    computerObject.MoveTo(group);                    
                 }
             }
         }
@@ -1744,26 +1709,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return sb.ToString();
         }
 
-        private string GetComputerPath(string objName, bool domainController)
+        private DirectoryEntry GetComputerObject(string computerName)
         {
-            StringBuilder sb = new StringBuilder();
-            // append provider
-            AppendProtocol(sb);
-            AppendDomainController(sb);            
-            AppendCNPath(sb, objName);
-            if (domainController)
+            DirectorySearcher deSearch = new DirectorySearcher
             {
-                AppendOUPath(sb, AdDcComputers);
-            }
-            else
-            {
-                AppendCNPath(sb, Computers);
-                
-            }
-            AppendDomainPath(sb, RootDomain);
-
-            return sb.ToString();
-        }
+                Filter = string.Format("(&(objectCategory=computer)(name={0}))", computerName)
+            };
+            
+            SearchResult results = deSearch.FindOne();
+            
+            return results.GetDirectoryEntry();
+        }        
 
         private string GetTenantComputerPath(string objName, string organizationId)
         {
@@ -1772,7 +1728,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             AppendProtocol(sb);
             AppendDomainController(sb);
             AppendCNPath(sb, objName);
-            AppendCNPath(sb, RdsServersOU);
+            AppendOUPath(sb, RdsServersOU);
             AppendOUPath(sb, organizationId);
             AppendOUPath(sb, RootOU);
             AppendDomainPath(sb, RootDomain);
@@ -1798,7 +1754,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             AppendProtocol(sb);
             AppendDomainController(sb);
-            AppendCNPath(sb, RdsServersRootOU);
+            AppendOUPath(sb, RdsServersRootOU);
             AppendOUPath(sb, ComputersRootOU);
             AppendDomainPath(sb, RootDomain);
 
@@ -1812,7 +1768,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             AppendProtocol(sb);
             AppendDomainController(sb);
             AppendCNPath(sb, name);
-            AppendCNPath(sb, RdsServersRootOU);
+            AppendOUPath(sb, RdsServersRootOU);
             AppendOUPath(sb, ComputersRootOU);
             AppendDomainPath(sb, RootDomain);
 
@@ -1836,7 +1792,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             
             AppendProtocol(sb);
             AppendDomainController(sb);
-            AppendCNPath(sb, RdsServersOU);
+            AppendOUPath(sb, RdsServersOU);
             AppendOUPath(sb, organizationId);
             AppendOUPath(sb, RootOU);
             AppendDomainPath(sb, RootDomain);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
index 5bcd026b..8af9191a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionUsers.ascx.cs
@@ -77,6 +77,12 @@ namespace WebsitePanel.Portal.RDS
             {
                 usersQuota.QuotaAvailable = tenantStats.AllocatedRdsUsers - tenantStats.CreatedRdsUsers;
             }
+            
+            if (cntx.Quotas.ContainsKey(Quotas.RDS_USERS))
+            {
+                int rdsUsersCount = ES.Services.RDS.GetOrganizationRdsUsersCount(PanelRequest.ItemID);
+                users.ButtonAddEnabled = (!(cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue <= rdsUsersCount) || (cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue == -1));
+            }
         }
 
         private bool SaveRdsUsers()
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
index 40c4311a..76837a86 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionUsers.ascx.cs
@@ -42,6 +42,18 @@ namespace WebsitePanel.Portal.RDS.UserControls
 	{
         public const string DirectionString = "DirectionString";
 
+        public bool ButtonAddEnabled
+        {
+            get
+            {
+                return btnAdd.Enabled;
+            }
+            set
+            {
+                btnAdd.Enabled = value;
+            }
+        }
+
 		protected enum SelectedState
 		{
 			All,
@@ -74,14 +86,7 @@ namespace WebsitePanel.Portal.RDS.UserControls
                 }";
                 Page.ClientScript.RegisterClientScriptBlock(typeof(RDSCollectionUsers), "SelectAllCheckboxes",
 					script, true);
-			}
-
-            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
-            if (cntx.Quotas.ContainsKey(Quotas.RDS_USERS))
-            {
-                int rdsUsersCount = ES.Services.RDS.GetOrganizationRdsUsersCount(PanelRequest.ItemID);
-                btnAdd.Enabled = (!(cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue <= rdsUsersCount) || (cntx.Quotas[Quotas.RDS_USERS].QuotaAllocatedValue == -1));
-            }
+			}            
 		}
 
 		protected void btnAdd_Click(object sender, EventArgs e)

From 50e902b94d17a98d4d0fc1eb9e7322fb55656abc Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 05:34:35 -0700
Subject: [PATCH 33/46] webdav portal create new ability added

---
 .../Config/Entities/OfficeOnlineCollection.cs |   2 +
 .../WebConfigSections/OfficeOnlineElement.cs  |   8 ++
 .../OfficeOnlineElementCollection.cs          |   8 ++
 .../Entities/Owa/CheckFileInfo.cs             |   7 +-
 .../Interfaces/Owa/IWopiServer.cs             |   6 +-
 .../Managers/WebDavManager.cs                 |   4 +-
 .../Owa/CobaltSessionManager.cs               |  17 ++-
 .../Owa/WopiServer.cs                         |  42 ++++--
 .../App_Start/RouteConfig.cs                  |  14 ++
 .../App_Start/Routes/FileSystemRouteNames.cs  |   3 +
 .../Content/OwaFiles/New.docx                 | Bin 0 -> 12551 bytes
 .../Content/OwaFiles/New.pptx                 | Bin 0 -> 31787 bytes
 .../Content/OwaFiles/New.xlsx                 | Bin 0 -> 7344 bytes
 .../Content/Site.css                          |  10 ++
 .../Controllers/Api/OwaController.cs          |  14 +-
 .../Controllers/FileSystemController.cs       |  31 +++++
 .../Resources/UI.Designer.cs                  |  72 ++++++++++
 .../Resources/UI.resx                         |  24 ++++
 .../Scripts/appScripts/dialogs.js             |  16 ++-
 .../Scripts/appScripts/fileBrowsing.js        |  41 +++++-
 .../Scripts/appScripts/wsp-webdav.js          |   1 +
 .../Scripts/appScripts/wsp.js                 | 126 ++++++++++++++++++
 .../Views/FileSystem/ShowContent.cshtml       |  35 ++++-
 .../FileSystem/_ShowContentTopMenu.cshtml     |  13 +-
 .../WebsitePanel.WebDavPortal/Web.config      |  14 +-
 .../WebsitePanel.WebDavPortal.csproj          |   3 +
 26 files changed, 473 insertions(+), 38 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.docx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.pptx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.xlsx
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs
index 47e614ed..c7f2d45d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/Entities/OfficeOnlineCollection.cs
@@ -13,12 +13,14 @@ namespace WebsitePanel.WebDav.Core.Config.Entities
         {
             IsEnabled = ConfigSection.OfficeOnline.IsEnabled;
             Url = ConfigSection.OfficeOnline.Url;
+            NewFilePath = ConfigSection.OfficeOnline.CobaltNewFilePath;
             CobaltFileTtl = ConfigSection.OfficeOnline.CobaltFileTtl;
             _officeExtensions = ConfigSection.OfficeOnline.Cast<OfficeOnlineElement>().ToList();
         }
 
         public bool IsEnabled { get; private set; }
         public string Url { get; private set; }
+        public string NewFilePath { get; private set; }
         public int CobaltFileTtl { get; private set; }
 
         public IEnumerator<OfficeOnlineElement> GetEnumerator()
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs
index 560b6964..823fc98a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElement.cs
@@ -8,6 +8,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
         private const string OwaViewKey = "OwaView";
         private const string OwaEditorKey = "OwaEditor";
         private const string OwaMobileViewKey = "OwaMobileView";
+        private const string OwaNewFileViewKey = "OwaNewFileView";
 
         [ConfigurationProperty(ExtensionKey, IsKey = true, IsRequired = true)]
         public string Extension
@@ -37,5 +38,12 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
             get { return this[OwaMobileViewKey].ToString(); }
             set { this[OwaMobileViewKey] = value; }
         }
+
+        [ConfigurationProperty(OwaNewFileViewKey, IsKey = true, IsRequired = true)]
+        public string OwaNewFileView
+        {
+            get { return this[OwaNewFileViewKey].ToString(); }
+            set { this[OwaNewFileViewKey] = value; }
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs
index 03f570c5..51603c99 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/OfficeOnlineElementCollection.cs
@@ -9,6 +9,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
         private const string UrlKey = "url";
         private const string IsEnabledKey = "isEnabled";
         private const string CobaltFileTtlKey = "cobaltFileTtl";
+        private const string CobaltNewFilePathKey = "cobaltNewFilePath";
 
         [ConfigurationProperty(UrlKey, IsKey = true, IsRequired = true)]
         public string Url
@@ -24,6 +25,13 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
             set { this[IsEnabledKey] = value; }
         }
 
+        [ConfigurationProperty(CobaltNewFilePathKey, IsKey = true, IsRequired = true)]
+        public string CobaltNewFilePath
+        {
+            get { return this[CobaltNewFilePathKey].ToString(); }
+            set { this[CobaltNewFilePathKey] = value; }
+        }
+
         [ConfigurationProperty(CobaltFileTtlKey, IsKey = true, IsRequired = true)]
         public int CobaltFileTtl
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs
index 076cb1e3..e5e72685 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Entities/Owa/CheckFileInfo.cs
@@ -37,6 +37,10 @@ namespace WebsitePanel.WebDav.Core.Entities.Owa
         public bool RestrictedWebViewOnly { get; set; }
         [DataMember]
         public string ClientUrl { get; set; }
+        [DataMember]
+        public bool CloseButtonClosesWindow { get; set; }
+        //[DataMember]
+        //public string CloseUrl { get; set; }
         //[DataMember]
         //public bool UserCanNotWriteRelative { get; set; }
         
@@ -59,8 +63,7 @@ namespace WebsitePanel.WebDav.Core.Entities.Owa
         //public string BreadcrumbFolderUrl { get; set; }
         //[DataMember]
         //public string ClientUrl { get; set; }
-        //[DataMember]
-        //public bool CloseButtonClosesWindow { get; set; }
+    
         //[DataMember]
         //public string CloseUrl { get; set; }
         //[DataMember]
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Owa/IWopiServer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Owa/IWopiServer.cs
index 6f35d7ff..058ad936 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Owa/IWopiServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Owa/IWopiServer.cs
@@ -1,4 +1,4 @@
-using System.Web.Mvc;
+using WebsitePanel.EnterpriseServer.Base.HostedSolution;
 using WebsitePanel.WebDav.Core.Client;
 using WebsitePanel.WebDav.Core.Entities.Owa;
 
@@ -6,7 +6,7 @@ namespace WebsitePanel.WebDav.Core.Interfaces.Owa
 {
     public interface IWopiServer
     {
-        CheckFileInfo GetCheckFileInfo(string path);
-        FileResult GetFile(string path);
+        CheckFileInfo GetCheckFileInfo(WebDavAccessToken token);
+        byte[] GetFileBytes(int accessTokenId);
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
index d3f837a7..7b59436e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/WebDavManager.cs
@@ -240,9 +240,9 @@ namespace WebsitePanel.WebDav.Core.Managers
 
                 return _currentFolder.GetResource(resourceName);
             }
-            catch (InvalidOperationException exception)
+            catch (Exception)
             {
-                throw new ResourceNotFoundException("Resource not found", exception);
+                return null;
             }
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/CobaltSessionManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/CobaltSessionManager.cs
index 2684bf83..e9f16955 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/CobaltSessionManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/CobaltSessionManager.cs
@@ -2,8 +2,10 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Runtime.Caching;
+using System.Web;
 using Cobalt;
 using WebsitePanel.WebDav.Core.Client;
 using WebsitePanel.WebDav.Core.Config;
@@ -72,9 +74,20 @@ namespace WebsitePanel.WebDav.Core.Owa
 
             var token = _tokenManager.GetToken(accessTokenId);
 
-            var fileBytes = _webDavManager.GetFileBytes(token.FilePath);
+            Atom atom;
 
-            var atom = new AtomFromByteArray(fileBytes);
+            if (_webDavManager.FileExist(token.FilePath))
+            {
+                var fileBytes = _webDavManager.GetFileBytes(token.FilePath);
+
+                atom = new AtomFromByteArray(fileBytes);
+            }
+            else
+            {
+                var filePath = HttpContext.Current.Server.MapPath(WebDavAppConfigManager.Instance.OfficeOnline.NewFilePath + Path.GetExtension(token.FilePath));
+
+                atom = new AtomFromByteArray(File.ReadAllBytes(filePath));
+            }
 
             Cobalt.Metrics o1;
             cobaltFile.GetCobaltFilePartition(FilePartitionId.Content).SetStream(RootId.Default.Value, atom, out o1);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
index dada9bab..860d3528 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Owa/WopiServer.cs
@@ -6,6 +6,8 @@ using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Web;
 using System.Web.Mvc;
+using Cobalt;
+using WebsitePanel.EnterpriseServer.Base.HostedSolution;
 using WebsitePanel.WebDav.Core.Client;
 using WebsitePanel.WebDav.Core.Config;
 using WebsitePanel.WebDav.Core.Entities.Owa;
@@ -22,27 +24,30 @@ namespace WebsitePanel.WebDav.Core.Owa
         private readonly IWebDavManager _webDavManager;
         private readonly IAccessTokenManager _tokenManager;
         private readonly IWebDavAuthorizationService _webDavAuthorizationService;
+        private readonly IWopiFileManager _fileManager;
 
-        public WopiServer(IWebDavManager webDavManager, IAccessTokenManager tokenManager, IWebDavAuthorizationService webDavAuthorizationService)
+
+        public WopiServer(IWebDavManager webDavManager, IAccessTokenManager tokenManager, IWebDavAuthorizationService webDavAuthorizationService, IWopiFileManager fileManager)
         {
             _webDavManager = webDavManager;
             _tokenManager = tokenManager;
             _webDavAuthorizationService = webDavAuthorizationService;
+            _fileManager = fileManager;
         }
 
-        public CheckFileInfo GetCheckFileInfo(string path)
+        public CheckFileInfo GetCheckFileInfo(WebDavAccessToken token)
         {
-            var resource = _webDavManager.GetResource(path);
+            var resource = _webDavManager.GetResource(token.FilePath);
 
-            var permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, path);
+            var permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, token.FilePath);
 
             var readOnly = permissions.HasFlag(WebDavPermissions.Write) == false || permissions.HasFlag(WebDavPermissions.OwaEdit) == false;
 
             var cFileInfo = new CheckFileInfo
             {
-                BaseFileName = resource.DisplayName.Split(new []{'/'},StringSplitOptions.RemoveEmptyEntries).LastOrDefault(),
+                BaseFileName = resource == null ? token.FilePath.Split('/').Last() : resource.DisplayName.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault(),
                 OwnerId = WspContext.User.Login,
-                Size = resource.ContentLength,
+                Size = resource == null ? 0 : resource.ContentLength,
                 Version = DateTime.Now.ToString("s"),
                 SupportsCoauth = true,
                 SupportsCobalt = true,
@@ -53,17 +58,34 @@ namespace WebsitePanel.WebDav.Core.Owa
                 SupportsUpdate = true,
                 UserCanWrite = !readOnly,
                 ReadOnly = readOnly,
-                RestrictedWebViewOnly = false
+                RestrictedWebViewOnly = false,
+                CloseButtonClosesWindow = true
             };
 
+            if (resource != null)
+            {
+                cFileInfo.ClientUrl = _webDavManager.GetFileUrl(token.FilePath);
+            }
+
             return cFileInfo;
         }
 
-        public FileResult GetFile(string path)
+        public byte[] GetFileBytes(int accessTokenId)
         {
-            var fileBytes = _webDavManager.GetFileBytes(path);
+            var token = _tokenManager.GetToken(accessTokenId);
 
-            return new FileContentResult(fileBytes, MediaTypeNames.Application.Octet);
+            if (_webDavManager.FileExist(token.FilePath))
+            {
+                return _webDavManager.GetFileBytes(token.FilePath);
+            }
+
+            var cobaltFile = _fileManager.Get(token.FilePath) ?? _fileManager.Create(accessTokenId);
+
+            var stream = new MemoryStream();
+
+            new GenericFda(cobaltFile.CobaltEndpoint, null).GetContentStream().CopyTo(stream);
+
+            return stream.ToArray();
         }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
index a5dc75e8..bf48c585 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/RouteConfig.cs
@@ -46,6 +46,20 @@ namespace WebsitePanel.WebDavPortal
 
             #region Enterprise storage 
 
+            routes.MapRoute(
+                name: FileSystemRouteNames.ItemExist,
+                url: "storage/item-exist/{org}/{*pathPart}",
+                defaults:
+                    new { controller = "FileSystem", action = "ItemExist", pathPart = UrlParameter.Optional }
+                );
+
+            routes.MapRoute(
+                name: FileSystemRouteNames.NewWebDavItem,
+                url: "storage/new/{org}/{*pathPart}",
+                defaults:
+                    new { controller = "FileSystem", action = "NewWebDavItem", pathPart = UrlParameter.Optional }
+                );
+
             routes.MapRoute(
                     name: FileSystemRouteNames.SearchFiles,
                     url: "storage/search/{org}/{*pathPart}",
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
index 9a6832b2..acb38f0c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/Routes/FileSystemRouteNames.cs
@@ -12,6 +12,9 @@ namespace WebsitePanel.WebDavPortal.UI.Routes
         public const string ShowContentDetails = "ShowContentDetailsRoute";
         public const string ShowOfficeOnlinePath_ = "ShowOfficeOnlineRoute";
         public const string ViewOfficeOnline = "ViewOfficeOnlineRoute";
+        public const string NewFileOfficeOnline = "NewFileOfficeOnlineRoute";
+        public const string NewWebDavItem = "NewWebDavItemRoute";
+        public const string ItemExist = "ItemExistRoute";
         public const string EditOfficeOnline = "EditOfficeOnlineRoute";
 
         public const string ShowAdditionalContent = "ShowAdditionalContentRoute";
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.docx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.docx
new file mode 100644
index 0000000000000000000000000000000000000000..b5ca5258e0054cc72c44f556f116ff31994d5fd7
GIT binary patch
literal 12551
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

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.pptx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.pptx
new file mode 100644
index 0000000000000000000000000000000000000000..cc17054824adfca46442ef0878da94aca44c60d5
GIT binary patch
literal 31787
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

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.xlsx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/OwaFiles/New.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..31991b64fe90d2177676a400e9e66bc400ac61de
GIT binary patch
literal 7344
zcmeHMg;!MD+a4ICyJhGO=>cg;9b%MJLIj5Hlm-D|07qgF0Rcfu6eJa-5r+_vZjc;8
z8l?LhZ+zbC_4gOtyJxMl*Q|4%cb&7}=h<&;ZA~B!H2@cY4*&qz0J(ZCJ-4s`0DK$(
zfC_+*ZKC4p;$`jPWv1`vX6<Pz<m>FjnvH|a`vQQCdH%ogFJ6H+PoS>YY~=7w=rIfa
zh>cQ!U25x)%C*=cyc6J8u~kYVR$}9`gXb-A562uH-(&so`J_$+WmoPZXriQwHf@iD
zeYjlJ;fP-3y2uEk?n$@My(zHDlo$y7#DhMm?Q^06T(*|I;`c<?7fD%&YaH<r&&^Bs
zWVArFQz}`>fJg%GNQz#ry`vUKi01Xc47v|A=wMG3U^cKntd4_7uXh2;-flO*AJ*qb
z>Q#FjN9nHNhlzO-OLETu$7aftd!L_@jV=WB4XEaXLJhPs3%EcY&I=`R2$oH{xp$B_
zO|y}g*z1MXn!>Cis@e>okU?XlZ67~+zv0%Fr$~n!iK|m?tr@KXnnR~vX>r@1$Y_z6
ze4rJ3>afzJPtU4g1biGaSWO|6ziINeQwW<tNeh>>YwXTE5Lt8XF{6{LbWj5R%3S&R
z!uJ#p0JyjS0<{08!wLftjy(*yv@kLw!syV<!`jJHSm^upKmGlSMfaCaf1J>B6D302
zx(TUMnLk-^f#7H5)oMX%+4Pw|aBi?v#N==)9_)t$!!#@>`u3N4u9-}2EZXa{Fv5gy
zqH1`R%EVy-BM!brnYYPaz}Ri=soNN087=NiPC1$R<|d}WMowOpBM=NViKiSeFw-q+
zqU|-0Jfw(DhlO3=lgqEHza%cm!yB2k1?7gC9Psf1@Cp=;<&MhVgQ2dz!izz$<eQHb
zGpJ-cy%$t$h+g+hyh>H>RDVdblRiMve!^}E%-|lsdu#WiQp%lOGrAWtvm-bC$Ww83
zHB>0m?)71Px7=KQ_$<`w(4wh@Oy3Oi;r~=gOys!R4Cam?MkNdYd@Nrl;opVg<LcoE
zb9Ht69<Tls4HhP7VIteVd%Qt*I-o?z)ea)gAEpG!dlTj*ei}<uu5392u*I=7CxzQ2
z3_mcN4VzSiNRHtb<4$^VI{REhzqm<VeQ;9+x$xqXk=a4<(3U}vTzwc!v{>??Pp$<!
z-1O+M^endtBGYWjVwgwU#vp^-f`6*a>2q5IR)g&W8DnzkO^92WwKS{Rcjz8p$i9$U
z)ju&-`7+Y;qJWR{+q%m%xIWLvHI75NIz%za9zv)6G+Hnk-k8pH<3s0Rm;81@M#Sx7
zM)!LNN75E~riLInw;P;=ZRIUew`ecRoy>ou`xQS@2ATWSF+Qip@PiEFcnm-O%8bW4
z&|4S<)pKmKuumIZ+s|?~mLb4`(S<jUc4xVd*xBoH@lBq~yA*zNM_XN+@Y@cUauR-O
zllir-9Ihf39h%i%q`%la8+76I9%u2Ph_0PuJc>r%>Fq=s)N%3%H7?G9jh0Si8(ii6
z<`?~Ri^?P?>!yV%7q*hmqri1-h#5Ov<Ayz>aJB|75QrK-i$u{zbZj>*LL<0|IY}$<
z-!%vutg}r}YoIN(n^jF4qaN)y*qIw2Zt)r@wp-lntvt-1Nj+}RNv$cgmy6&%p*>nj
zX;ucytf^0Zx*44J7HsPE<T(vqMA3!cppv&VKZkRtMJ1<W35PL--AT7jyS4`e&6)Ka
zJ}zFMcUkJnfZrG7jmFV{i?7KFVgrbPRXONaZPPD(=ZUoy+0E-#{o;>%JhD7>2O@&q
zB+YVB&Az>BM88_~&EhkZ-uLwI5&%H*`>K0-`8ip8eph2|A`~$pg2@^p&hfHpIohC=
z>ZSGZRzRW&T?k=)N99`7P$Y65?6Uk|^OJXaxcs|PI!7>ryuU5j<J30^`*}*)-9nsO
zJZ#ss7HVb+G`0><LWbs6Oa_-|jLUG|f1YdGMMsX-+%7#sibevmoWkO|hXj<Jf~^w9
zql=$~J=F!NGigE9oSf+e-%N8}ivGA23hAKPAP{(VL8hv^Gd`$PYz<}VshTNXH>7V5
z+`G%?Y{#v*;wO`H6fp^%n&Ik+sjTs$`aoftBxmbtAk>}!;ET~LN>{6PNqlIGHJ(}O
zZ*ZJHe#Eu8meW6auFS*#LA-@C##8W}5-C6MqfA_O!X5>P-`A#!OyKo=_WGpG`%Oqp
z1f|a_-gG~+J2Ms~^YO(#lqJseS3;`DbNW9aux~J^v@nW0;8B4`BP(&$35DLbdAVOi
z6%#w>_nq1Rmr1qIT4~s+%f>kfftX7IO!yLYGRJ+(3=Pk`N%=EdFXcbItskQ9|H)2K
zMw$w?3EH^f*QSsRk?`P|^hBE5nVN+o2%?E?dRBQd9%!zPZMJ56`t{(=#jMHpp|?LB
zD26p2)3Luu!^P=f5MsP@@IffZoOa2PK=}c%+b5vWpHEgl+nmceT=p@7pkdt1unBZI
zMrZm^y_OU?Q+PJ#>To>MV{Ur@%c?h5jhQ7lKYMpx_eEhn+nl19u4#=b4X^XaAN1Ka
zZO^;b1g=wc<hgS=wY^(orpkb_G%>;=8zgQg<=ZG}z?s(aKQfIAbE?|cq->6DEZ!By
zaO<Bj;RKfFoQMkm<b%FfFu!Tu%g)-_TKKoC=ywjT8QpT7kfd%T8}(uJa&_jZ1mWF(
zG+LHc1O+v_L^9hyOET2UR_s>~0*#|XuuwG?$yl}PB2EIm*tK4n+$NDlz+;+yh(<Ym
zr)EDcXm}`6mHk2B#Wb4Z{@(b*s4NwB&IR|0LepaZsAdJ00V%rxANZLjh&h3<&GNIa
z*7#I9WOID@WYe@Ijh~Z3sZ=2;t!h0&gDdUnqg@O7&Q3Wt(a+GTsM4@I6#A{$ELf9K
z2EzqIHe4UU``V8=SOWsYvJ{k5p#2jaQ3v#Otr{y>nbD!#&~zGH*^FVZa<_Fdfmf8#
z1W>^;7|cnQ7)hT*$US~<=(Mh5c!+RHi%zrx=4@d)ecFG2Ic(djYm2&x*VcG-#N>{*
z$1(1QL9ybI)%yVz=^0q&(|FLLD{85G=hus#^j!&ALyN7uROl4d9%7&EaXmA6elx#M
z!@5kB<ded1@)l^wCMck*2^8OQHEC<F+xz{5*A}kTb{ALRg+`%~&o(Z#7{jgP-tnxn
zU=8_5EvX5?2v<O0PU=TG-YB?S4H!WXH&kGV*a{Ll2J|YzX=0G6JXT>rQFB7E*TZ04
z09VSpDP<}RcNzNY;&(4W^(Rh5n&K&l{7W((T&x`F?XDa>K}Yt)vYdOJe(l>vu?Py<
z&I-joocowO9lXCZ!jf|>BY5ZAHr;}+QS-$yil_1P)K8jR%#N)OA)I--zt)Z@Q8+uR
zZR6T<4!xmv7=K+g+hiV}X$#*=9PZA=!{OdQgCf_ny+j)7O|YCn$TU+VZDU<U>K@~B
zM{%1McrSC($BHQ&_R@}E31l%3IFPbs64D@XQ`zA+^p!$9^jL)5Ze}tMG;FO!ShiKv
z8(|xW6KS;VPsU5ZHpCeP7~@lTbC(Vi<0;oSbXG?1#~p`hD(HM=R%6oAgo@>I@Wj(1
zyzOy<pCvC77kfLs^`W~jB{1M0$yft{;D6Q#XQ5n7*_O%RV|<EaoQt9%38pG6)%w(Q
z_fYNbE&eSpMfw}{qR4WmE@!M`+Vo(cN<IJm6XvuVLb|*%f;oOvp7&HYw(PGq>*&In
zdZn(wuEp!&>pb4C=6|^9epO{x_7JO0U@|C~vTZV-E=(5erfQ56mGLZ^((E43m+0xH
zbf}1^0j@@k-fIqq3)3+h>XpictzxJ5_0FTs9SODvs%7^gPRNqJGRYwh2&`JZ(e4#1
zHx~9znV4nWS@_m6vY^HX=Pv?LPB^A@%NmdQ-r}_cO4!c71lPY0C$akysZ`(1D5D-s
zuBq%h_>7pC@h)qr(L<a&EIKr#%IS*J_jbTY#h1CjXiA~kIy<<gy`$Xjc}IpM=$H{E
z5ZUYy7q`Au!`vMUlD^DgVBY=ia?X9|%$v`{CAq3f??)_d4=6u>X3`a9^C%l7c*iJh
zG`+KFzS=<~#e_-*gmXr2SWVCt+{Mr>n}RH>tliUDq(w&{ypY7(DY**${=z4(Y|;~3
zIuh88$w0)%Yrc<$2)`Jou7TWS5l<eitq6=-PX$m3TT|3+QEJORi@hSm&4cLEnQ)XC
zW?=s2-oMZ7rVnr9#VXO9)Pm7|2zpWyPI996WX$U5V_K1x=v4v-w-bx?hTKv;JW949
z(xfaB67i>S078OC;KCUA*<Xh+Q9tLcdRYTj(^iQ(mbaIwCO6ewVfI@hj&bjO3BkO;
zmr?ZLXbvz;+&!e}Oh#WRQ}n4D+JZkUICNFo*;#ynb_u-vC>e%p+a{{1oStOzJllxd
zq>2wxO}tpd%KY^<f342OX+cV2Bdft9i_>d*YMVT6m&z1|nYU)W4b5}K^VZ$7lt~SE
z30_ar^-86TWA$O*sS_bly5uvs*vJ}r+}I_piOQ8o=N!T!iGNYb@>-j`oXomib(*i)
zVR_10y*x2K`c+t!SQ#wt6PtyKDKO37^*|dx%cVfw7?*g%>a=>(9ybPia-Mpp>$TO<
zl%wZN=0>2C*h5_xCP@;g&Bfj3I(fsj0`GdGjP-gowcY0It^!*ltj~ldN&?W65$f4=
zlcFL+O@<N)vDpuZP6m|u6gih0GJKb1^y1alv$L73tAlLULdGA>oJ4TrS^#x|+9jDG
zbP!pou-10car6G%H}(U=>L!8{Z-lD`x{fkLDwEc(oGav)?JRz_UYeg%W00*VwRDuN
z>>r#Nd%{Pk@??$GlF_muk>;Asc3+U&E@_}-iYOOUq$!_2G%J!hMJ{CiJ!4mYQR6Rz
z*rLHJv>hgK4acNW^uGtO?}@9Yowc=>r|@snZ;|YA!jE*mS0U+%0@Yl&GJaRK_VIY<
zw^3Ro_<Ab1YuaZmUiTBXYz)}5>L7NplV!8{YO|FnwMY7buA+$HSTFUr9ZPxtM0O<U
zQ*Zhg@purA>Z*p+O;Hy;BE>KQHkxv-6&nq%fv^!i6e)J&AbmZzkY$c8ozfjtypKb|
z(m{tKXdWqoNERtAE()bdeIBWJ1A>zuy_Y}iy{x*kNSQw3Ub}i7H>fSDUq&+$i$CJ(
zTPT&tN`KjA=5~=J&%Sp0Y`p{p)o`NdO{R#9fQ*9IuzuJ*Bk$feA@;$DKnBf<6tdYs
zqtW~awn{aDczEy^b4==ewr1=uC#@uA3umun(oD(58n5dp75T(Yxm^%f+DEhbtmVB2
z7m^A<;BT$8B&$!T%KCGkjW6Tg^Kx>6d{mP6l7~>lrO2VhEk=42M9Nj!ck>GtoPn+q
zJubPgD3<ki9WKs$=6+dLgfIIWeJ?BSW4uFwDLbuPEww#d-8_XYT|KP-Xp#O`ZDMHq
zIKj*j#Y){Wjdw!Yw8Z656U(OFao(FxgS$RDn)cOM01AF(GVXfq$vdO#C#5&!m(Jyu
zV3HGetanL<`Eoo}slwQMKSJ`ZO8c91p#!L;dn)Gh`r>ndQec7N5-}Zdiz{`;dJp#q
z?@~j?MRk_!R)e}kykSH%KI(2?S&L(es>p8CHc8OQHejVwdPE9r-Sy~kCwjaZ8WjuS
z!?ilI?j&Ws1gGThow7*PK3&~27w~a^p?AGo<4A=`h6x=zrn@^gGbJlQpY~EcRh^Dw
zKL5~iyL_#nRpWgvWym8fLhdVWu1;lNE*F9uqnR~Et4lT0W|3ct%jdg=KMs!&&ZB4N
znyUrs`V3ZBurEi%zbWz3o#MIGQz*@^tDG<TtU0mRt^?n~>Ua!(C_W9}5H7Gxyr9za
z4!Fvm0Z@bYC}?a0f0g3OVT+uHV)%EC;UD>5`Dfwg_8<K)y!&IMCn&j2h!96?0*_gU
zC#j^JMTkS+WZN0<_QJ3dylo9$TCzQ|ih6@w8;Pq#wv73&#LNfy9;>QPGVd!mvSlH%
z$luxviQ!8o2{{pM*Z8HMl3z|B$lDfGWQz@%yKNSvS4a(l%mc(@@eQL=Ul~E7E8+D`
ze4U|B`CrzvxeVNHE%2aC>I+_Di?8e6*`y@J$qM)AKP917naj>AfhYBO2Od^ROA@~s
zG9B=>CD|6-L%ijKz2OazGThRLRcrBbEM;l$(^=ApHL0j<Mako>cKG6O^#J#9UYd+|
zRD~N?yt8Z4)w*0WU03OdtOtdY=93qxcjLg`bW4JR)<L<s4_e-#7(%qwC5cfDi~(&G
zX{$!AGjsi;mxx)f++}xR^!t!G)WLZi?kmZ?aT#|C%XV^`#5VTmSYSu}!s=RWDQd)q
zDj7cWuC_DFc!XQ2eN|z3Db#<if@?bB%LunqmYm-?T}^T@sNro!SN;*SJ5DN<&+okI
z_<OJA_sR?lTM+QSPM7|4)1UJ%&YH9}|8C&#ZSg;W-{&ZdQvT8;{~7rAPT^mH#h6<0
zfA<Z4w)1mG>4&9m%mLa@{iUD5KQ~5xfK>^91OI4~{0#lMs{H}|Nc_th_h$n?XB0mS
zL}IGsKVJMF`Nhvx{vP>$*Z=^yXaInJ#KE88f8V(N3eUp?+W&|Dv5jeKUc&eW03g8p
N6fj%eU54-f{ts5#g#G{k

literal 0
HcmV?d00001

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index 988dabfa..4f95621b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -251,12 +251,17 @@ tr.selected-file {
 
 .file-actions-menu .file-deletion {
     display: none;
+    margin-right: 10px;
 }
 
 .file-actions-menu .file-upload {
     display: inline-block;
 }
 
+.create-new-item {
+    margin-top: -2px;
+}
+
 #message-area {
     margin-top: 15px;
 }
@@ -336,6 +341,11 @@ tr.selected-file {
     top: 20%;
 }
 
+
+.small-processing {
+    display: none;
+}
+
 /* Theme Mods */
 
 input,div{border-radius:0px!important;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs
index 4b0e2a87..761214ef 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/Api/OwaController.cs
@@ -54,22 +54,24 @@ namespace WebsitePanel.WebDavPortal.Controllers.Api
         {
             var token = _tokenManager.GetToken(accessTokenId);
 
-            var fileInfo = _wopiServer.GetCheckFileInfo(token.FilePath);
+            var fileInfo = _wopiServer.GetCheckFileInfo(token);
 
-            var urlPart = Url.Route(FileSystemRouteNames.ShowContentPath, new { org = WspContext.User.OrganizationId, pathPart = token.FilePath });
+            if (fileInfo.Size <= 1)
+            {
+                return fileInfo;
+            }
+
+            var urlPart = Url.Route(FileSystemRouteNames.ShowContentPath, new {org = WspContext.User.OrganizationId, pathPart = token.FilePath});
             var url = new Uri(Request.RequestUri, urlPart).ToString();
 
             fileInfo.DownloadUrl = url;
-            fileInfo.ClientUrl = _webDavManager.GetFileUrl(token.FilePath);
 
             return fileInfo;
         }
 
         public HttpResponseMessage GetFile(int accessTokenId)
         {
-            var token = _tokenManager.GetToken(accessTokenId);
-
-            var bytes = _webDavManager.GetFileBytes(token.FilePath);
+            var bytes = _wopiServer.GetFileBytes(accessTokenId);
 
             var result = new HttpResponseMessage(HttpStatusCode.OK);
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 9d4016e1..0940d23a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -303,6 +303,36 @@ namespace WebsitePanel.WebDavPortal.Controllers
             return Json(model);
         }
 
+        public ActionResult NewWebDavItem(string org, string pathPart)
+        {
+            var permissions = _webDavAuthorizationService.GetPermissions(WspContext.User, pathPart);
+
+            var owaOpener = WebDavAppConfigManager.Instance.OfficeOnline.FirstOrDefault(x => x.Extension == Path.GetExtension(pathPart));
+
+            if (permissions.HasFlag(WebDavPermissions.Write) == false || (owaOpener != null && permissions.HasFlag(WebDavPermissions.OwaEdit) == false))
+            {
+                return new RedirectToRouteResult(FileSystemRouteNames.ShowContentPath, null);
+            }
+
+            if (owaOpener != null)
+            {
+                return ShowOfficeDocument(org, pathPart, owaOpener.OwaNewFileView);
+            }
+
+            return new RedirectToRouteResult(FileSystemRouteNames.ShowContentPath, null);
+        }
+
+        [HttpPost]
+        public JsonResult ItemExist(string org, string pathPart, string newItemName)
+        {
+            var exist = _webdavManager.FileExist(string.Format("{0}/{1}", pathPart, newItemName));
+
+            return new JsonResult()
+            {
+                Data = !exist
+            };
+        }
+
         #region Owa Actions
 
         public ActionResult ShowOfficeDocument(string org, string pathPart, string owaOpenerUri)
@@ -345,6 +375,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
 
             return ShowOfficeDocument(org, pathPart, owaOpener.OwaEditor);
         }
+
         #endregion
 
         private void FillContentModel(IEnumerable<ResourceTableItemModel> items, string organizationId)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
index 0aa9d823..f7a90c29 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
@@ -105,6 +105,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        public static string Create {
+            get {
+                return ResourceManager.GetString("Create", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Delete.
         /// </summary>
@@ -141,6 +150,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enter file name.
+        /// </summary>
+        public static string EnterFileName {
+            get {
+                return ResourceManager.GetString("EnterFileName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error.
         /// </summary>
@@ -150,6 +168,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Excel workbook.
+        /// </summary>
+        public static string ExcelWorkbook {
+            get {
+                return ResourceManager.GetString("ExcelWorkbook", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -159,6 +186,24 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File name.
+        /// </summary>
+        public static string FileName {
+            get {
+                return ResourceManager.GetString("FileName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to File extension will be added automatically.
+        /// </summary>
+        public static string FileNameExtensionHint {
+            get {
+                return ResourceManager.GetString("FileNameExtensionHint", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File Upload.
         /// </summary>
@@ -186,6 +231,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File already exist.
+        /// </summary>
+        public static string ItemExist {
+            get {
+                return ResourceManager.GetString("ItemExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} items was removed..
         /// </summary>
@@ -249,6 +303,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Powerpoint presentation.
+        /// </summary>
+        public static string PowerPointPresentation {
+            get {
+                return ResourceManager.GetString("PowerPointPresentation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Processing.
         /// </summary>
@@ -339,6 +402,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Word document.
+        /// </summary>
+        public static string WordDocument {
+            get {
+                return ResourceManager.GetString("WordDocument", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Yes.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
index 7d3fbf56..624df9ea 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
@@ -132,6 +132,9 @@
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
   </data>
+  <data name="Create" xml:space="preserve">
+    <value>Create</value>
+  </data>
   <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
@@ -144,12 +147,24 @@
   <data name="DialogsContentConfrimFileDeletion" xml:space="preserve">
     <value>Are you sure you want to delete {0} item(s)?</value>
   </data>
+  <data name="EnterFileName" xml:space="preserve">
+    <value>Enter file name</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
+  <data name="ExcelWorkbook" xml:space="preserve">
+    <value>Excel workbook</value>
+  </data>
   <data name="File" xml:space="preserve">
     <value>File</value>
   </data>
+  <data name="FileName" xml:space="preserve">
+    <value>File name</value>
+  </data>
+  <data name="FileNameExtensionHint" xml:space="preserve">
+    <value>File extension will be added automatically</value>
+  </data>
   <data name="FileUpload" xml:space="preserve">
     <value>File Upload</value>
   </data>
@@ -159,6 +174,9 @@
   <data name="Info" xml:space="preserve">
     <value>Info</value>
   </data>
+  <data name="ItemExist" xml:space="preserve">
+    <value>File already exist</value>
+  </data>
   <data name="ItemsWasRemovedFormat" xml:space="preserve">
     <value>{0} items was removed.</value>
   </data>
@@ -180,6 +198,9 @@
   <data name="PleaseWaitWithDots" xml:space="preserve">
     <value>Please wait...</value>
   </data>
+  <data name="PowerPointPresentation" xml:space="preserve">
+    <value>Powerpoint presentation</value>
+  </data>
   <data name="Processing" xml:space="preserve">
     <value>Processing</value>
   </data>
@@ -210,6 +231,9 @@
   <data name="Upload" xml:space="preserve">
     <value>Upload</value>
   </data>
+  <data name="WordDocument" xml:space="preserve">
+    <value>Word document</value>
+  </data>
   <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/dialogs.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/dialogs.js
index 25693b41..64823404 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/dialogs.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/dialogs.js
@@ -1,5 +1,9 @@
 function WspDialogs() {
-    this.settings = { dialogId: "#confirm-dialog", processDialogId: "#processDialog" };
+    this.settings = {
+        dialogId: "#confirm-dialog",
+        processDialogId: "#processDialog",
+        inlineProcessDialog: '.glyphicon-refresh'
+    };
 }
 
 WspDialogs.prototype =
@@ -36,6 +40,14 @@ WspDialogs.prototype =
 
     hideProcessDialog: function() {
         $(this.settings.processDialogId).modal('hide');
-}
+    },
+
+    showInlineProcessing: function(itemId) {
+        $(itemId).parent().find(this.settings.inlineProcessDialog).show();
+    },
+
+    hideInlineProcessing: function (itemId) {
+        $(itemId).parent().find(this.settings.inlineProcessDialog).hide();
+    }
 };
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
index f14edab4..114e103d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
@@ -2,8 +2,15 @@
     this.settings = {
         deletionBlockSelector: ".file-actions-menu .file-deletion",
         deletionUrl: "storage/files-group-action/delete",
+        fileExistUrl: "storage/fileExist",
         textDateModified: "Date modified",
-        textSize: "Size"
+        textSize: "Size",
+        textItemExist: "File already exists",
+        textItemExistFunc: function() {
+            return textItemExist;
+        } ,
+        createNewItemDialogId: "#createNewItemDialog",
+        createNewItemButtonId: "#create-button"
     };
     this.itemsTable = null;
     this.searchTable = null;
@@ -272,6 +279,38 @@ WspFileBrowser.prototype = {
         var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
         var i = Math.floor(Math.log(bytes) / Math.log(k));
         return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
+    },
+
+    showCreateNewItemDialog: function (extension, target) {
+        $(this.settings.createNewItemButtonId).data('extension', extension);
+        $(this.settings.createNewItemButtonId).data('target', target);
+
+        $(this.settings.createNewItemDialogId + " input").val("");
+
+        $(this.settings.createNewItemDialogId).modal();
+    },
+
+    hideCreateNewItemDialog: function () {
+        $(this.settings.createNewItemDialogId).modal('hide');
+    },
+
+    uniqueFileNameFieldRule: function(fieldId) {
+
+        return {
+            url: this.settings.fileExistUrl,
+            type: "post",
+            data: {
+                newItemName: function() {
+                    return $(fieldId).val() + $(wsp.fileBrowser.settings.createNewItemButtonId).data('extension');
+                } 
+            },
+            beforeSend: function(response) {
+                wsp.dialogs.showInlineProcessing(fieldId);
+            },
+            complete: function() {
+                wsp.dialogs.hideInlineProcessing(fieldId);
+            }
+        };
     }
 };
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
index 41f36ed8..ce9fb0a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
@@ -78,6 +78,132 @@ $('#drag-and-drop-area #file-input').click(function (e) {
 });
 
 
+
+$("#create-button").click(function (e) {
+
+    if ($('#filenameForm').valid()) {
+
+        var fileName = $('#createNewItemDialog #filename').val() + $(this).data('extension');
+
+        $(this).attr('href', $(this).data('href') + '/' + fileName);
+
+        $(this).attr('target', $(this).data('target'));
+
+        wsp.fileBrowser.hideCreateNewItemDialog();
+        //;
+    } else {
+        e.preventDefault();
+    }
+});
+
+$.fn.clearValidation = function () { var v = $(this).validate(); $('[name]', this).each(function () { v.successList.push(this); v.showErrors(); }); v.resetForm(); v.reset(); $(this).find('.form-group').removeClass('has-error'); };
+
+$(document).ready(function() {
+    //bootstrap jquery validate styles fix
+    $.validator.setDefaults({
+        highlight: function(element) {
+            $(element).closest('.form-group').addClass('has-error');
+        },
+        unhighlight: function(element) {
+            $(element).closest('.form-group').removeClass('has-error');
+        },
+        errorElement: 'span',
+        errorClass: 'help-block',
+        errorPlacement: function(error, element) {
+            if (element.parent('.input-group').length) {
+                error.insertAfter(element.parent());
+            } else {
+                error.insertAfter(element);
+            }
+        }
+    });
+
+    $.validator.addMethod("synchronousRemote", function (value, element, param) {
+        if (this.optional(element)) {
+            return "dependency-mismatch";
+        }
+
+        var previous = this.previousValue(element);
+        if (!this.settings.messages[element.name]) {
+            this.settings.messages[element.name] = {};
+        }
+        previous.originalMessage = this.settings.messages[element.name].remote;
+        this.settings.messages[element.name].remote = previous.message;
+
+        param = typeof param === "string" && { url: param } || param;
+
+        if (previous.old === value) {
+            return previous.valid;
+        }
+
+        previous.old = value;
+        var validator = this;
+        this.startRequest(element);
+        var data = {};
+        data[element.name] = value;
+        var valid = "pending";
+        $.ajax($.extend(true, {
+            url: param,
+            async: false,
+            mode: "abort",
+            port: "validate" + element.name,
+            dataType: "json",
+            data: data,
+            success: function (response) {
+                validator.settings.messages[element.name].remote = previous.originalMessage;
+                valid = response === true || response === "true";
+                if (valid) {
+                    var submitted = validator.formSubmitted;
+                    validator.prepareElement(element);
+                    validator.formSubmitted = submitted;
+                    validator.successList.push(element);
+                    delete validator.invalid[element.name];
+                    validator.showErrors();
+                } else {
+                    var errors = {};
+                    var message = response || validator.defaultMessage(element, "remote");
+                    errors[element.name] = previous.message = $.isFunction(message) ? message(value) : message;
+                    validator.invalid[element.name] = true;
+                    validator.showErrors(errors);
+                }
+                previous.valid = valid;
+                validator.stopRequest(element, valid);
+            }
+        }, param));
+        return valid;
+    }, "Please fix this field.");
+
+
+    $('#filenameForm').validate({
+        onkeyup: false,
+        onclick: false,
+        async: false,
+        rules: {
+            filename: {
+                required: true,
+                synchronousRemote: wsp.fileBrowser.uniqueFileNameFieldRule("#filename")
+            }
+        },
+        messages: {
+            filename: {
+                synchronousRemote: wsp.fileBrowser.settings.textItemExist
+            }
+        }
+    });
+
+});
+
+
+$(".create-new-item li a").click(function () {
+
+    $("#filenameForm").clearValidation();
+
+    wsp.fileBrowser.showCreateNewItemDialog($(this).data('extension'), $(this).data('target'));
+
+    $("#filename").focus();
+});
+
+
 function isMobileDevice() {
     return (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
index af490ffc..e62225b2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
@@ -26,7 +26,10 @@ else
 
 @section scripts{
     <script>
-        wsp.fileBrowser.setSettings({ deletionUrl: "@Url.RouteUrl(FileSystemRouteNames.DeleteFiles)" });
+        wsp.fileBrowser.setSettings({ 
+            deletionUrl: "@Url.RouteUrl(FileSystemRouteNames.DeleteFiles)", 
+            fileExistUrl: "@Url.RouteUrl(FileSystemRouteNames.ItemExist)",
+            textItemExist: "@UI.ItemExist." });
     </script>
     
     @if (Model.UserSettings.WebDavViewType == FolderViewTypes.BigIcons)
@@ -47,9 +50,37 @@ else
     {
         <script>
             $(document).ready(function () {
-                wsp.fileBrowser.setSettings({ deletionUrl: "@Url.RouteUrl(FileSystemRouteNames.DeleteFiles)" });
                 wsp.fileBrowser.initDataTable('#webdav-items-table', '@Url.RouteUrl(FileSystemRouteNames.ShowContentDetails)');
             });
         </script>
     }
 }
+
+@section popups{
+    <div id="createNewItemDialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal-process-dialog-title" data-backdrop="static" data-keyboard="false" aria-hidden="true" style="display: none;">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h4 class="modal-title" id="confirm-dalog-label">@UI.Create</h4>
+                </div>
+
+                <div class="modal-body">
+                    <form id="filenameForm">
+                        <div class="form-group has-feedback">
+                            <label for="filename">@UI.FileName</label>
+                            <input type="text" class="form-control" id="filename" name="filename" autofocus required placeholder="@UI.EnterFileName">
+                            <span class="glyphicon glyphicon-refresh glyphicon-spin form-control-feedback small-processing" aria-hidden="true"></span>
+                            <span id="inputProcessingStatus" class="sr-only">(processing)</span>
+                        </div>
+                    </form>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">@UI.Cancel</button>
+                    <a href="@Url.RouteUrl(FileSystemRouteNames.NewWebDavItem)" data-href="@Url.RouteUrl(FileSystemRouteNames.NewWebDavItem)" id="create-button" class="btn btn-success danger">@UI.Create</a>
+                </div>
+            </div>
+        </div>
+    </div>
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
index 496ac682..fdba3215 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
@@ -56,6 +56,17 @@
                    data-target-title-text="@UI.DeleteFileQuestion"
                    data-target-content="@UI.DialogsContentConfrimFileDeletion">@UI.Delete</a>
             </div>
+            <div class="dropdown create-new-item navbar-left">
+                <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
+                    @UI.Create
+                    <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" data-extension=".docx" data-target="_blank">@UI.WordDocument</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" data-extension=".xlsx" data-target="_blank">@UI.ExcelWorkbook</a></li>
+                    <li role="presentation"><a role="menuitem" tabindex="-1" href="#" data-extension=".pptx" data-target="_blank">@UI.PowerPointPresentation</a></li>
+                </ul>
+            </div>
         }
 
         <div class="file-upload navbar-right">
@@ -75,4 +86,4 @@
             }
         </div>
     </div>
-}
\ No newline at end of file
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
index 3f07e5e5..b33b3e60 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
@@ -85,13 +85,13 @@
       <add browser="InternetExplorer;IE" version="8" />
       <add browser="Safari" version="4" />
     </owaSupportedBrowsers>
-    <officeOnline isEnabled="True" url="https://vir-owa.virtuworks.net" cobaltFileTtl="1">
-      <add extension=".doc" OwaView="wv/wordviewerframe.aspx?" OwaEditor="wv/wordviewerframe.aspx?" OwaMobileView="wv/mWord.aspx?wdMobileHost=3&amp;"/>
-      <add extension=".docx" OwaView="wv/wordviewerframe.aspx?" OwaEditor="we/wordeditorframe.aspx?" OwaMobileView="wv/mWord.aspx?wdMobileHost=3&amp;"/>
-      <add extension=".xls" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" OwaMobileView="x/_layouts/mobile/mXL.aspx?wdMobileHost=3&amp;"/>
-      <add extension=".xlsx" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" OwaMobileView="x/_layouts/mobile/mXL.aspx?wdMobileHost=3&amp;" />
-      <add extension=".ppt" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;"/>
-      <add extension=".pptx" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?PowerPointView=EditView&amp;" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;"/>
+    <officeOnline isEnabled="True" url="https://vir-owa.virtuworks.net" cobaltFileTtl="1" cobaltNewFilePath="~/Content/OwaFiles/New">
+      <add extension=".doc" OwaView="wv/wordviewerframe.aspx?" OwaEditor="wv/wordviewerframe.aspx?" OwaMobileView="wv/mWord.aspx?wdMobileHost=3&amp;" OwaNewFileView="we/wordeditorframe.aspx?new=1&amp;"/>
+      <add extension=".docx" OwaView="wv/wordviewerframe.aspx?" OwaEditor="we/wordeditorframe.aspx?" OwaMobileView="wv/mWord.aspx?wdMobileHost=3&amp;" OwaNewFileView="we/wordeditorframe.aspx?new=1&amp;"/>
+      <add extension=".xls" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" OwaMobileView="x/_layouts/mobile/mXL.aspx?wdMobileHost=3&amp;" OwaNewFileView="x/_layouts/xlviewerinternal.aspx?new=1&amp;"/>
+      <add extension=".xlsx" OwaView="x/_layouts/xlviewerinternal.aspx?" OwaEditor="x/_layouts/xlviewerinternal.aspx?edit=1&amp;" OwaMobileView="x/_layouts/mobile/mXL.aspx?wdMobileHost=3&amp;" OwaNewFileView="x/_layouts/xlviewerinternal.aspx?edit=1&amp;"/>
+      <add extension=".ppt" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;" OwaNewFileView="p/PowerPointFrame.aspx?PowerPointView=EditView&amp;New=1&amp;"/>
+      <add extension=".pptx" OwaView="p/PowerPointFrame.aspx?" OwaEditor="p/PowerPointFrame.aspx?PowerPointView=EditView&amp;" OwaMobileView="p/mPPT.aspx?wdMobileHost=3&amp;" OwaNewFileView="p/PowerPointFrame.aspx?PowerPointView=EditView&amp;New=1&amp;"/>
     </officeOnline>
     <typeOpener>
       <add extension=".jpg" mimeType="image/jpeg" isTargetBlank="true" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
index 6ccbc782..8c5bfd40 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
@@ -369,6 +369,8 @@
     <Content Include="Content\bootstrap.css.map" />
     <Content Include="Content\DataTables-1.10.4\css\dataTables.responsive.scss" />
     <Content Include="Content\DataTables-1.10.4\css\dataTables.jqueryui.scss" />
+    <Content Include="Content\OwaFiles\Empty.docx" />
+    <Content Include="Content\OwaFiles\Empty.pptx" />
     <None Include="Scripts\jquery-2.1.1.intellisense.js" />
     <Content Include="Scripts\appScripts\authentication.js" />
     <Content Include="Scripts\appScripts\dialogs.js" />
@@ -376,6 +378,7 @@
     <Content Include="Scripts\appScripts\messages.js" />
     <Content Include="Scripts\appScripts\recalculateResourseHeight.js" />
     <Content Include="Scripts\appScripts\uploadingData2.js" />
+    <Content Include="Scripts\appScripts\wsp-webdav.js" />
     <Content Include="Scripts\appScripts\wsp.js" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />

From ca66183c2977e754a0d4f207ce7fd16e6edca590 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 11 Mar 2015 08:36:39 -0400
Subject: [PATCH 34/46] Added tag build-2.1.0.611 for changeset 5404111417ed


From 227f0c99cc641275259fb51d479a3c0d16c523af Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 06:05:14 -0700
Subject: [PATCH 35/46] webdav portal merge fix

---
 .../Resources/UI.Designer.cs                  | 63 +++++++++++++++++++
 .../Resources/UI.resx                         | 21 +++++++
 2 files changed, 84 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
index 4a5a4578..f9a6db66 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.Designer.cs
@@ -123,6 +123,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Create.
+        /// </summary>
+        public static string Create {
+            get {
+                return ResourceManager.GetString("Create", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Delete.
         /// </summary>
@@ -159,6 +168,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter file name.
+        /// </summary>
+        public static string EnterFileName {
+            get {
+                return ResourceManager.GetString("EnterFileName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error.
         /// </summary>
@@ -177,6 +195,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Excel workbook.
+        /// </summary>
+        public static string ExcelWorkbook {
+            get {
+                return ResourceManager.GetString("ExcelWorkbook", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File.
         /// </summary>
@@ -186,6 +213,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File name.
+        /// </summary>
+        public static string FileName {
+            get {
+                return ResourceManager.GetString("FileName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File Upload.
         /// </summary>
@@ -213,6 +249,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File already exist.
+        /// </summary>
+        public static string ItemExist {
+            get {
+                return ResourceManager.GetString("ItemExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0} items was removed..
         /// </summary>
@@ -303,6 +348,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Powerpoint presentation.
+        /// </summary>
+        public static string PowerPointPresentation {
+            get {
+                return ResourceManager.GetString("PowerPointPresentation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Processing.
         /// </summary>
@@ -402,6 +456,15 @@ namespace WebsitePanel.WebDavPortal.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Word document.
+        /// </summary>
+        public static string WordDocument {
+            get {
+                return ResourceManager.GetString("WordDocument", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Yes.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
index 2ffe1406..56929bcc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Resources/UI.resx
@@ -138,6 +138,9 @@
   <data name="Confirm" xml:space="preserve">
     <value>Confirm</value>
   </data>
+  <data name="Create" xml:space="preserve">
+    <value>Create</value>
+  </data>
   <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
@@ -150,15 +153,24 @@
   <data name="DialogsContentConfrimFileDeletion" xml:space="preserve">
     <value>Are you sure you want to delete {0} item(s)?</value>
   </data>
+  <data name="EnterFileName" xml:space="preserve">
+    <value>Please enter file name</value>
+  </data>
   <data name="Error" xml:space="preserve">
     <value>Error</value>
   </data>
   <data name="ExabyteShort" xml:space="preserve">
     <value>EB</value>
   </data>
+  <data name="ExcelWorkbook" xml:space="preserve">
+    <value>Excel workbook</value>
+  </data>
   <data name="File" xml:space="preserve">
     <value>File</value>
   </data>
+  <data name="FileName" xml:space="preserve">
+    <value>File name</value>
+  </data>
   <data name="FileUpload" xml:space="preserve">
     <value>File Upload</value>
   </data>
@@ -168,6 +180,9 @@
   <data name="Info" xml:space="preserve">
     <value>Info</value>
   </data>
+  <data name="ItemExist" xml:space="preserve">
+    <value>File already exist</value>
+  </data>
   <data name="ItemsWasRemovedFormat" xml:space="preserve">
     <value>{0} items was removed.</value>
   </data>
@@ -198,6 +213,9 @@
   <data name="PleaseWaitWithDots" xml:space="preserve">
     <value>Please wait...</value>
   </data>
+  <data name="PowerPointPresentation" xml:space="preserve">
+    <value>Powerpoint presentation</value>
+  </data>
   <data name="Processing" xml:space="preserve">
     <value>Processing</value>
   </data>
@@ -231,6 +249,9 @@
   <data name="Upload" xml:space="preserve">
     <value>Upload</value>
   </data>
+  <data name="WordDocument" xml:space="preserve">
+    <value>Word document</value>
+  </data>
   <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>

From 7e76b087b40ed313761647e8c3e41758a0712585 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 07:00:40 -0700
Subject: [PATCH 36/46] webdav portal css fixes

---
 .../App_Start/BundleConfig.cs                 |   4 +
 .../Content/Site.css                          |   4 +
 .../Scripts/appScripts/fileBrowsing.js        |   7 +-
 .../Scripts/appScripts/wsp-webdav.js          | 125 +++++++++++++++++-
 .../Scripts/appScripts/wsp.js                 | 120 +----------------
 .../Views/FileSystem/ShowContent.cshtml       |   5 +-
 .../ShowContentSearchResultTable.cshtml       |   1 +
 7 files changed, 145 insertions(+), 121 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/BundleConfig.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/BundleConfig.cs
index 8b6dd2c9..d3be4e58 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/BundleConfig.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Start/BundleConfig.cs
@@ -35,6 +35,10 @@ namespace WebsitePanel.WebDavPortal
                 "~/Scripts/appScripts/wsp.js"
                ));
 
+            bundles.Add(new ScriptBundle("~/bundles/appScripts-webdav").Include(
+                "~/Scripts/appScripts/wsp-webdav.js"
+               ));
+
             bundles.Add(new ScriptBundle("~/bundles/bigIconsScripts").Include(
                 "~/Scripts/appScripts/recalculateResourseHeight.js"
                ));
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index 4f95621b..65108355 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -346,6 +346,10 @@ tr.selected-file {
     display: none;
 }
 
+#filenameForm input {
+    max-width: 100%;
+}
+
 /* Theme Mods */
 
 input,div{border-radius:0px!important;}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
index 114e103d..d7a33633 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
@@ -10,7 +10,8 @@
             return textItemExist;
         } ,
         createNewItemDialogId: "#createNewItemDialog",
-        createNewItemButtonId: "#create-button"
+        createNewItemButtonId: "#create-button",
+        createNewItemTitleId:  '#create-dalog-label'
     };
     this.itemsTable = null;
     this.searchTable = null;
@@ -281,12 +282,14 @@ WspFileBrowser.prototype = {
         return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
     },
 
-    showCreateNewItemDialog: function (extension, target) {
+    showCreateNewItemDialog: function (extension, target, title) {
         $(this.settings.createNewItemButtonId).data('extension', extension);
         $(this.settings.createNewItemButtonId).data('target', target);
 
         $(this.settings.createNewItemDialogId + " input").val("");
 
+        $(this.settings.createNewItemTitleId).text($(this.settings.createNewItemTitleId).data('title') + " " + title);
+
         $(this.settings.createNewItemDialogId).modal();
     },
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js
index 5f282702..90c6f7d8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp-webdav.js
@@ -1 +1,124 @@
-
\ No newline at end of file
+//Toggle file select + Ctrl multiselect
+$(document).on('click', '.element-container', function (e) {
+    if (e.ctrlKey) {
+        $(this).toggleClass("selected-file");
+    } else {
+
+        wsp.fileBrowser.clearAllSelectedItems();
+
+        wsp.fileBrowser.selectItem(this);
+    }
+
+    wsp.fileBrowser.refreshDeletionBlock();
+});
+
+$(document).on('touchstart', '.element-container', function (e) {
+    var now = new Date().getTime();
+    var lastTouch = $(this).data('lastTouch') || now + 1;
+    var delta = now - lastTouch;
+
+    if (delta < 300 && delta > 0) {
+        wsp.fileBrowser.openItem(this);
+        $(this).data('lastTouch', 0);
+    }
+
+    $(this).data('lastTouch', now);
+});
+
+//Double click file open
+$(document).on('dblclick', '.element-container', function (e) {
+    wsp.fileBrowser.openItem(this);
+
+    var links = $(this).find('.file-link');
+
+    if (links.length != 0 && $(links[0]).hasClass('processing-dialog')) {
+        wsp.dialogs.showProcessDialog();
+    }
+});
+
+
+//Delete button click
+$(document).on('click', '.file-deletion #delete-button', function (e) {
+    var dialogId = $(this).data('target');
+    var buttonText = $(this).data('target-positive-button-text');
+    var content = $(this).data('target-content');
+    var title = $(this).data('target-title-text');
+
+    content = jQuery.validator.format(content, wsp.fileBrowser.getSelectedItemsCount());
+
+    wsp.dialogs.showConfirmDialog(title, content, buttonText, wsp.fileBrowser.deleteSelectedItems, dialogId);
+});
+
+
+$(document).click(function (event) {
+    if (!$(event.target).closest('.element-container, .prevent-deselect').length) {
+        wsp.fileBrowser.clearAllSelectedItems();
+        wsp.fileBrowser.refreshDeletionBlock();
+    }
+});
+
+$('#drag-and-drop-area').click(function (e) {
+    $('#file-input').click();
+});
+
+$('#drag-and-drop-area #file-input').click(function (e) {
+    e.stopPropagation();
+});
+
+
+
+$("#create-button").click(function (e) {
+
+    if ($('#filenameForm').valid()) {
+
+        var fileName = $('#createNewItemDialog #filename').val() + $(this).data('extension');
+
+        $(this).attr('href', $(this).data('href') + '/' + fileName);
+
+        $(this).attr('target', $(this).data('target'));
+
+        wsp.fileBrowser.hideCreateNewItemDialog();
+        //;
+    } else {
+        e.preventDefault();
+    }
+});
+
+$(document).ready(function () {
+
+    $('#filenameForm').validate({
+        onkeyup: false,
+        onclick: false,
+        async: false,
+        rules: {
+            filename: {
+                required: true,
+                synchronousRemote: wsp.fileBrowser.uniqueFileNameFieldRule("#filename")
+            }
+        },
+        messages: {
+            filename: {
+                synchronousRemote: wsp.fileBrowser.settings.textItemExist
+            }
+        }
+    });
+
+});
+
+$('#filename').keydown(function (event) {
+    if (event.keyCode == 13) {
+        event.preventDefault();
+        return false;
+    }
+    return true;
+});
+
+
+$(".create-new-item li a").click(function () {
+
+    $("#filenameForm").clearValidation();
+
+    wsp.fileBrowser.showCreateNewItemDialog($(this).data('extension'), $(this).data('target'),  $(this).text());
+
+    $("#filename").focus();
+});
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
index ce9fb0a4..a45da0f1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/wsp.js
@@ -10,94 +10,6 @@ $(document).on('click', '.processing-dialog', function (e) {
 });
 
 
-//Toggle file select + Ctrl multiselect
-$(document).on('click', '.element-container', function (e) {
-    if (e.ctrlKey) {
-        $(this).toggleClass("selected-file");
-    } else {
-
-        wsp.fileBrowser.clearAllSelectedItems();
-
-        wsp.fileBrowser.selectItem(this);
-    }
-
-    wsp.fileBrowser.refreshDeletionBlock();
-});
-
-$(document).on('touchstart', '.element-container', function(e) {
-    var now = new Date().getTime();
-    var lastTouch = $(this).data('lastTouch') || now + 1;
-    var delta = now - lastTouch;
-
-    if (delta < 300 && delta > 0) {
-        wsp.fileBrowser.openItem(this);
-        $(this).data('lastTouch', 0);
-    }
-
-    $(this).data('lastTouch', now);
-});
-
-//Double click file open
-$(document).on('dblclick', '.element-container', function (e) {
-    wsp.fileBrowser.openItem(this);
-
-    var links = $(this).find('.file-link');
-
-    if (links.length != 0 && $(links[0]).hasClass('processing-dialog')) {
-        wsp.dialogs.showProcessDialog();
-    }
-});
-
-
-//Delete button click
-$(document).on('click', '.file-deletion #delete-button', function (e) {
-    var dialogId = $(this).data('target');
-    var buttonText = $(this).data('target-positive-button-text');
-    var content = $(this).data('target-content');
-    var title = $(this).data('target-title-text');
-
-    content = jQuery.validator.format(content, wsp.fileBrowser.getSelectedItemsCount());
-
-    wsp.dialogs.showConfirmDialog(title, content, buttonText, wsp.fileBrowser.deleteSelectedItems, dialogId);
-});
-
-
-$(document).click(function(event) {
-    if (!$(event.target).closest('.element-container, .prevent-deselect').length) {
-        wsp.fileBrowser.clearAllSelectedItems();
-        wsp.fileBrowser.refreshDeletionBlock();
-    }
-});
-
-$('#drag-and-drop-area').click(function (e) {
-    $('#file-input').click();
-});
-
-$('#drag-and-drop-area #file-input').click(function (e) {
-    e.stopPropagation();
-});
-
-
-
-$("#create-button").click(function (e) {
-
-    if ($('#filenameForm').valid()) {
-
-        var fileName = $('#createNewItemDialog #filename').val() + $(this).data('extension');
-
-        $(this).attr('href', $(this).data('href') + '/' + fileName);
-
-        $(this).attr('target', $(this).data('target'));
-
-        wsp.fileBrowser.hideCreateNewItemDialog();
-        //;
-    } else {
-        e.preventDefault();
-    }
-});
-
-$.fn.clearValidation = function () { var v = $(this).validate(); $('[name]', this).each(function () { v.successList.push(this); v.showErrors(); }); v.resetForm(); v.reset(); $(this).find('.form-group').removeClass('has-error'); };
-
 $(document).ready(function() {
     //bootstrap jquery validate styles fix
     $.validator.setDefaults({
@@ -118,7 +30,7 @@ $(document).ready(function() {
         }
     });
 
-    $.validator.addMethod("synchronousRemote", function (value, element, param) {
+    $.validator.addMethod("synchronousRemote", function(value, element, param) {
         if (this.optional(element)) {
             return "dependency-mismatch";
         }
@@ -149,7 +61,7 @@ $(document).ready(function() {
             port: "validate" + element.name,
             dataType: "json",
             data: data,
-            success: function (response) {
+            success: function(response) {
                 validator.settings.messages[element.name].remote = previous.originalMessage;
                 valid = response === true || response === "true";
                 if (valid) {
@@ -172,36 +84,10 @@ $(document).ready(function() {
         }, param));
         return valid;
     }, "Please fix this field.");
-
-
-    $('#filenameForm').validate({
-        onkeyup: false,
-        onclick: false,
-        async: false,
-        rules: {
-            filename: {
-                required: true,
-                synchronousRemote: wsp.fileBrowser.uniqueFileNameFieldRule("#filename")
-            }
-        },
-        messages: {
-            filename: {
-                synchronousRemote: wsp.fileBrowser.settings.textItemExist
-            }
-        }
-    });
-
 });
 
 
-$(".create-new-item li a").click(function () {
-
-    $("#filenameForm").clearValidation();
-
-    wsp.fileBrowser.showCreateNewItemDialog($(this).data('extension'), $(this).data('target'));
-
-    $("#filename").focus();
-});
+$.fn.clearValidation = function () { var v = $(this).validate(); $('[name]', this).each(function () { v.successList.push(this); v.showErrors(); }); v.resetForm(); v.reset(); $(this).find('.form-group').removeClass('has-error'); };
 
 
 function isMobileDevice() {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
index e62225b2..db3e1da3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
@@ -25,12 +25,15 @@ else
 
 
 @section scripts{
+    
     <script>
         wsp.fileBrowser.setSettings({ 
             deletionUrl: "@Url.RouteUrl(FileSystemRouteNames.DeleteFiles)", 
             fileExistUrl: "@Url.RouteUrl(FileSystemRouteNames.ItemExist)",
             textItemExist: "@UI.ItemExist." });
     </script>
+
+    @Scripts.Render("~/bundles/appScripts-webdav")
     
     @if (Model.UserSettings.WebDavViewType == FolderViewTypes.BigIcons)
     {
@@ -62,7 +65,7 @@ else
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
-                    <h4 class="modal-title" id="confirm-dalog-label">@UI.Create</h4>
+                    <h4 class="modal-title" id="create-dalog-label" data-title="@UI.Create">@UI.Create</h4>
                 </div>
 
                 <div class="modal-body">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml
index f75107fc..d4044452 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContentSearchResultTable.cshtml
@@ -24,5 +24,6 @@
             wsp.fileBrowser.initSearchDataTable('#search-items-table', '@Url.RouteUrl(FileSystemRouteNames.ShowContentDetails)', '@Model.SearchValue');
         });
     </script>
+    @Scripts.Render("~/bundles/appScripts-webdav")
 }
 

From af64837b99225ba7fdb50a35d72c25237db7a963 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 11 Mar 2015 07:50:40 -0700
Subject: [PATCH 37/46] webdav portal fixes

---
 WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
index 52b32743..8e3e2163 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/IFolder.cs
@@ -148,7 +148,7 @@ namespace WebsitePanel.WebDav.Core
             public IResource GetResource(string name)
             {
                 IHierarchyItem item =
-                    _children.Single(i => i.DisplayName.Trim('/') == name.Trim('/'));
+                    _children.Single(i => i.DisplayName.ToLowerInvariant().Trim('/') == name.ToLowerInvariant().Trim('/'));
                 var resource = new WebDavResource();
                 resource.SetCredentials(_credentials);
                 resource.SetHierarchyItem(item);

From 5e2587ba5e17ab6909a6649f26b0abe25b548c10 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Wed, 11 Mar 2015 13:23:18 -0400
Subject: [PATCH 38/46] Added tag build-2.1.0.612 for changeset b8c48fc4f4a2


From fa588c8559ae0abdff6c644ae401913889382208 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 12 Mar 2015 01:32:40 -0700
Subject: [PATCH 39/46] webdav portal fixes

---
 .../Sources/WebsitePanel.WebDavPortal/Constants/Formtas.cs | 7 +++++++
 .../Mapping/Profiles/Webdav/ResourceTableItemProfile.cs    | 3 ++-
 .../WebsitePanel.WebDavPortal.csproj                       | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constants/Formtas.cs

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constants/Formtas.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constants/Formtas.cs
new file mode 100644
index 00000000..9c4127ab
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Constants/Formtas.cs
@@ -0,0 +1,7 @@
+namespace WebsitePanel.WebDavPortal.Constants
+{
+    public class Formtas
+    {
+        public const string DateFormatWithTime = "MM/dd/yyyy hh:mm tt";
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
index 17d1b07e..92987801 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Mapping/Profiles/Webdav/ResourceTableItemProfile.cs
@@ -7,6 +7,7 @@ using AutoMapper;
 using WebsitePanel.WebDav.Core.Client;
 using WebsitePanel.WebDav.Core.Config;
 using WebsitePanel.WebDav.Core.Extensions;
+using WebsitePanel.WebDavPortal.Constants;
 using WebsitePanel.WebDavPortal.FileOperations;
 using WebsitePanel.WebDavPortal.Models.FileSystem;
 
@@ -43,7 +44,7 @@ namespace WebsitePanel.WebDavPortal.Mapping.Profiles.Webdav
                 .ForMember(ti => ti.IconHref, x => x.MapFrom(hi => hi.ItemType == ItemType.Folder ? WebDavAppConfigManager.Instance.FileIcons.FolderPath.Trim('~') : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(hi.DisplayName.Trim('/'))].Trim('~')))
                 .ForMember(ti => ti.IsTargetBlank, x => x.MapFrom(hi => openerManager.GetIsTargetBlank(hi)))
                 .ForMember(ti => ti.LastModified, x => x.MapFrom(hi => hi.LastModified))
-                .ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString("dd/MM/yyyy hh:mm tt")))
+                .ForMember(ti => ti.LastModifiedFormated, x => x.MapFrom(hi => hi.LastModified == DateTime.MinValue ? "--" : (new WebDavResource(null, hi)).LastModified.ToString(Formtas.DateFormatWithTime)))
 
                 .ForMember(ti => ti.Summary, x => x.MapFrom(hi => hi.Summary))
                 .ForMember(ti => ti.IsRoot, x => x.MapFrom(hi => hi.IsRootItem))
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
index 5e8b2a86..21db106b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
@@ -165,6 +165,7 @@
     <Compile Include="Configurations\ActionSelectors\OwaActionSelector.cs" />
     <Compile Include="Configurations\Constraints\OrganizationRouteConstraint.cs" />
     <Compile Include="Configurations\ControllerConfigurations\OwaControllerConfiguration.cs" />
+    <Compile Include="Constants\Formtas.cs" />
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\ErrorController.cs" />
     <Compile Include="Controllers\FileSystemController.cs" />

From 0f61d148ffa0c06b2fc8c237ce73e4dfdb3592ef Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 12 Mar 2015 04:44:39 -0700
Subject: [PATCH 40/46] webdav portal fixes

---
 .../Content/Site.css                          | 12 ++++++++-
 .../Controllers/FileSystemController.cs       |  2 +-
 .../Scripts/appScripts/fileBrowsing.js        | 27 ++++++-------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index 65108355..ae360b0b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -102,6 +102,7 @@ tr.selected-file {
 #summary.summary {
     font-size: 11px;
     color: rgb(152, 152, 152);
+    word-wrap: break-word;
 }
 
 .drag-and-drop-area input {
@@ -266,7 +267,7 @@ tr.selected-file {
     margin-top: 15px;
 }
 
-#processDialog .dialog-text {
+#processDialog .dialog-text, .container  .dialog-text{
     display: inline-block;
     margin-left: 10px;
 }
@@ -275,6 +276,15 @@ tr.selected-file {
     width: 200px;
 }
 
+.dataTables_processing {
+    width: 165px !important;
+    margin: 0 !important;;
+    padding: 0 !important;;
+    left: 43% !important;;
+    background: initial !important;;
+    background-color: #FFFFFF !important;;
+}
+
 .breadcrumb-wsp {
     display: inline-block;
     padding-top: 5px;    
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 4f709e53..bf79329a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -325,7 +325,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
         [HttpPost]
         public JsonResult ItemExist(string org, string pathPart, string newItemName)
         {
-            var exist = _webdavManager.FileExist(string.Format("{0}/{1}", pathPart, newItemName));
+            var exist = _webdavManager.FileExist(string.Format("{0}/{1}", pathPart.TrimEnd('/'), newItemName.Trim('/')));
 
             return new JsonResult()
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
index d7a33633..5849d557 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/fileBrowsing.js
@@ -11,7 +11,8 @@
         } ,
         createNewItemDialogId: "#createNewItemDialog",
         createNewItemButtonId: "#create-button",
-        createNewItemTitleId:  '#create-dalog-label'
+        createNewItemTitleId: '#create-dalog-label',
+        processingDialogDom: '<div><img src="/Content/Images/indicator_medium.gif"><h4 class="dialog-text">Please wait...</h4></div>'
     };
     this.itemsTable = null;
     this.searchTable = null;
@@ -96,7 +97,7 @@ WspFileBrowser.prototype = {
     initDataTable: function (tableId, ajaxUrl) {
         this.itemsTable = $(tableId).dataTable({
             "ajax": ajaxUrl,
-            "processing": false,
+            "processing": true,
             "serverSide": true,
             "dom": 'rtlp',
             "columnDefs": [
@@ -131,14 +132,8 @@ WspFileBrowser.prototype = {
             "createdRow": function(row, data, index) {
                 $(row).addClass('element-container');
             },
-            "fnPreDrawCallback": function () {
-                // gather info to compose a message
-                wsp.dialogs.showProcessDialog();
-                return true;
-            },
-            "fnDrawCallback": function () {
-                // in case your overlay needs to be put away automatically you can put it here
-                wsp.dialogs.hideProcessDialog();
+            "oLanguage": {
+                "sProcessing": this.settings.processingDialogDom
             }
         });
 
@@ -170,7 +165,7 @@ WspFileBrowser.prototype = {
 
         this.searchTable = $(tableId).dataTable({
             "ajax": ajaxUrl,
-            "processing": false,
+            "processing": true,
             "serverSide": true,
             "oSearch": { "sSearch": initSearch },
             "dom": 'rtlp',
@@ -207,14 +202,8 @@ WspFileBrowser.prototype = {
             "createdRow": function (row, data, index) {
                 $(row).addClass('element-container');
             },
-            "fnPreDrawCallback": function () {
-                // gather info to compose a message
-                wsp.dialogs.showProcessDialog();
-                return true;
-            },
-            "fnDrawCallback": function () {
-                // in case your overlay needs to be put away automatically you can put it here
-                wsp.dialogs.hideProcessDialog();
+            "oLanguage": {
+                "sProcessing": this.settings.processingDialogDom
             }
         });
 

From 4503df4578058e43e6b2c02c0a8f72e14f0b0f96 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 12 Mar 2015 06:40:31 -0700
Subject: [PATCH 41/46] webdav portal fixes

---
 .../WebsitePanel.WebDavPortal/Content/Site.css     | 14 ++++++++------
 .../Views/FileSystem/_ShowContentTopMenu.cshtml    |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index ae360b0b..bf5d19b0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -277,12 +277,14 @@ tr.selected-file {
 }
 
 .dataTables_processing {
-    width: 165px !important;
-    margin: 0 !important;;
-    padding: 0 !important;;
-    left: 43% !important;;
-    background: initial !important;;
-    background-color: #FFFFFF !important;;
+    width: 185px !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    left: 43% !important;
+    background: initial !important;
+    background-color: #FFFFFF !important;
+    border: 1px solid #CDCDCD;
+    height: 44px !important;
 }
 
 .breadcrumb-wsp {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
index fdba3215..b749eee1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ShowContentTopMenu.cshtml
@@ -25,7 +25,9 @@
             }
             else
             {
-                <a href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath)" class="processing-dialog">@UI.SearchResults</a>
+                <a href="@Url.RouteUrl(FileSystemRouteNames.ShowContentPath)" class="processing-dialog">@(elements.Any() ?elements.Last():WspContext.User.OrganizationId)</a>
+                <span style="top: 2px;"> / </span>
+                <span>@UI.SearchResults</span>
             }
         </div>
 

From 8de9e61623c1071fa9212cc60d07cebd6aab3a76 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 12 Mar 2015 06:46:04 -0700
Subject: [PATCH 42/46] webdav portal fixes

---
 WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
index bf5d19b0..609ab5d0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
@@ -285,6 +285,7 @@ tr.selected-file {
     background-color: #FFFFFF !important;
     border: 1px solid #CDCDCD;
     height: 44px !important;
+    z-index: 30;
 }
 
 .breadcrumb-wsp {

From d8393577d3e8a084d88376e2b44e6debeecedc81 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 12 Mar 2015 07:16:17 -0700
Subject: [PATCH 43/46] Main RDS Service added to System Settings

---
 .../System/SystemSettings.cs                  |   1 +
 .../RemoteDesktopServicesProxy.cs             | 111 ++++++++--
 .../RemoteDesktopServicesController.cs        | 201 +++++++++---------
 .../esRemoteDesktopServices.asmx.cs           |  16 +-
 .../IRemoteDesktopServices.cs                 |   1 +
 .../Windows2012.cs                            |  40 +++-
 .../RemoteDesktopServicesProxy.cs             |  49 +++++
 .../RemoteDesktopServices.asmx.cs             |  16 ++
 .../SystemSettings.ascx.resx                  |   6 +
 .../WebsitePanel/Code/Helpers/RDSHelper.cs    |   7 +-
 .../RDS/RDSEditCollectionSettings.ascx        |   2 +-
 .../WebsitePanel/RDSServers.ascx              |   4 +-
 .../WebsitePanel/RDSServers.ascx.cs           |   8 +-
 .../WebsitePanel/SystemSettings.ascx          |  12 ++
 .../WebsitePanel/SystemSettings.ascx.cs       |  30 +++
 .../SystemSettings.ascx.designer.cs           |  64 +++---
 16 files changed, 403 insertions(+), 165 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/System/SystemSettings.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/System/SystemSettings.cs
index 90b12d96..542a611c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/System/SystemSettings.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/System/SystemSettings.cs
@@ -44,6 +44,7 @@ namespace WebsitePanel.EnterpriseServer
         public const string WPI_SETTINGS = "WpiSettings";
         public const string FILEMANAGER_SETTINGS = "FileManagerSettings";
         public const string PACKAGE_DISPLAY_SETTINGS = "PackageDisplaySettings";
+        public const string RDS_SETTINGS = "RdsSettings";
 
         // key to access to wpi main & custom feed in wpi settings
         public const string WPI_MAIN_FEED_KEY = "WpiMainFeedUrl";
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
index 1bcb1bff..057bbe31 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
@@ -18,9 +18,9 @@ namespace WebsitePanel.EnterpriseServer {
     using System.Web.Services.Protocols;
     using System;
     using System.Diagnostics;
+    using WebsitePanel.Providers.HostedSolution;
     using WebsitePanel.Providers.RemoteDesktopServices;
     using WebsitePanel.Providers.Common;
-    using WebsitePanel.Providers.HostedSolution;
     
     
     /// <remarks/>
@@ -126,6 +126,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback AddRdsCertificateOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetRdsServicesOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -275,6 +277,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event AddRdsCertificateCompletedEventHandler AddRdsCertificateCompleted;
         
+        /// <remarks/>
+        public event GetRdsServicesCompletedEventHandler GetRdsServicesCompleted;
+        
         /// <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) {
@@ -1999,7 +2004,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsServerInfo", 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 RdsServerInfo GetRdsServerInfo(int itemId, string fqdnName) {
+        public RdsServerInfo GetRdsServerInfo([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> itemId, string fqdnName) {
             object[] results = this.Invoke("GetRdsServerInfo", new object[] {
                         itemId,
                         fqdnName});
@@ -2007,7 +2012,7 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetRdsServerInfo(int itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetRdsServerInfo(System.Nullable<int> itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetRdsServerInfo", new object[] {
                         itemId,
                         fqdnName}, callback, asyncState);
@@ -2020,12 +2025,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetRdsServerInfoAsync(int itemId, string fqdnName) {
+        public void GetRdsServerInfoAsync(System.Nullable<int> itemId, string fqdnName) {
             this.GetRdsServerInfoAsync(itemId, fqdnName, null);
         }
         
         /// <remarks/>
-        public void GetRdsServerInfoAsync(int itemId, string fqdnName, object userState) {
+        public void GetRdsServerInfoAsync(System.Nullable<int> itemId, string fqdnName, object userState) {
             if ((this.GetRdsServerInfoOperationCompleted == null)) {
                 this.GetRdsServerInfoOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsServerInfoOperationCompleted);
             }
@@ -2043,7 +2048,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsServerStatus", 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 GetRdsServerStatus(int itemId, string fqdnName) {
+        public string GetRdsServerStatus([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> itemId, string fqdnName) {
             object[] results = this.Invoke("GetRdsServerStatus", new object[] {
                         itemId,
                         fqdnName});
@@ -2051,7 +2056,7 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetRdsServerStatus(int itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetRdsServerStatus(System.Nullable<int> itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetRdsServerStatus", new object[] {
                         itemId,
                         fqdnName}, callback, asyncState);
@@ -2064,12 +2069,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetRdsServerStatusAsync(int itemId, string fqdnName) {
+        public void GetRdsServerStatusAsync(System.Nullable<int> itemId, string fqdnName) {
             this.GetRdsServerStatusAsync(itemId, fqdnName, null);
         }
         
         /// <remarks/>
-        public void GetRdsServerStatusAsync(int itemId, string fqdnName, object userState) {
+        public void GetRdsServerStatusAsync(System.Nullable<int> itemId, string fqdnName, object userState) {
             if ((this.GetRdsServerStatusOperationCompleted == null)) {
                 this.GetRdsServerStatusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsServerStatusOperationCompleted);
             }
@@ -2087,7 +2092,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ShutDownRdsServer", 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 ShutDownRdsServer(int itemId, string fqdnName) {
+        public ResultObject ShutDownRdsServer([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> itemId, string fqdnName) {
             object[] results = this.Invoke("ShutDownRdsServer", new object[] {
                         itemId,
                         fqdnName});
@@ -2095,7 +2100,7 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginShutDownRdsServer(int itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginShutDownRdsServer(System.Nullable<int> itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("ShutDownRdsServer", new object[] {
                         itemId,
                         fqdnName}, callback, asyncState);
@@ -2108,12 +2113,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void ShutDownRdsServerAsync(int itemId, string fqdnName) {
+        public void ShutDownRdsServerAsync(System.Nullable<int> itemId, string fqdnName) {
             this.ShutDownRdsServerAsync(itemId, fqdnName, null);
         }
         
         /// <remarks/>
-        public void ShutDownRdsServerAsync(int itemId, string fqdnName, object userState) {
+        public void ShutDownRdsServerAsync(System.Nullable<int> itemId, string fqdnName, object userState) {
             if ((this.ShutDownRdsServerOperationCompleted == null)) {
                 this.ShutDownRdsServerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnShutDownRdsServerOperationCompleted);
             }
@@ -2131,7 +2136,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/RestartRdsServer", 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 RestartRdsServer(int itemId, string fqdnName) {
+        public ResultObject RestartRdsServer([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> itemId, string fqdnName) {
             object[] results = this.Invoke("RestartRdsServer", new object[] {
                         itemId,
                         fqdnName});
@@ -2139,7 +2144,7 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginRestartRdsServer(int itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginRestartRdsServer(System.Nullable<int> itemId, string fqdnName, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("RestartRdsServer", new object[] {
                         itemId,
                         fqdnName}, callback, asyncState);
@@ -2152,12 +2157,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void RestartRdsServerAsync(int itemId, string fqdnName) {
+        public void RestartRdsServerAsync(System.Nullable<int> itemId, string fqdnName) {
             this.RestartRdsServerAsync(itemId, fqdnName, null);
         }
         
         /// <remarks/>
-        public void RestartRdsServerAsync(int itemId, string fqdnName, object userState) {
+        public void RestartRdsServerAsync(System.Nullable<int> itemId, string fqdnName, object userState) {
             if ((this.RestartRdsServerOperationCompleted == null)) {
                 this.RestartRdsServerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRestartRdsServerOperationCompleted);
             }
@@ -2342,14 +2347,14 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCertificateByItemId", 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 RdsCertificate GetRdsCertificateByItemId(int itemId) {
+        public RdsCertificate GetRdsCertificateByItemId([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable<int> itemId) {
             object[] results = this.Invoke("GetRdsCertificateByItemId", new object[] {
                         itemId});
             return ((RdsCertificate)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetRdsCertificateByItemId(int itemId, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetRdsCertificateByItemId(System.Nullable<int> itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetRdsCertificateByItemId", new object[] {
                         itemId}, callback, asyncState);
         }
@@ -2361,12 +2366,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetRdsCertificateByItemIdAsync(int itemId) {
+        public void GetRdsCertificateByItemIdAsync(System.Nullable<int> itemId) {
             this.GetRdsCertificateByItemIdAsync(itemId, null);
         }
         
         /// <remarks/>
-        public void GetRdsCertificateByItemIdAsync(int itemId, object userState) {
+        public void GetRdsCertificateByItemIdAsync(System.Nullable<int> itemId, object userState) {
             if ((this.GetRdsCertificateByItemIdOperationCompleted == null)) {
                 this.GetRdsCertificateByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsCertificateByItemIdOperationCompleted);
             }
@@ -2422,6 +2427,44 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsServices", 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 ServiceInfo[] GetRdsServices() {
+            object[] results = this.Invoke("GetRdsServices", new object[0]);
+            return ((ServiceInfo[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetRdsServices(System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetRdsServices", new object[0], callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ServiceInfo[] EndGetRdsServices(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ServiceInfo[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetRdsServicesAsync() {
+            this.GetRdsServicesAsync(null);
+        }
+        
+        /// <remarks/>
+        public void GetRdsServicesAsync(object userState) {
+            if ((this.GetRdsServicesOperationCompleted == null)) {
+                this.GetRdsServicesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRdsServicesOperationCompleted);
+            }
+            this.InvokeAsync("GetRdsServices", new object[0], this.GetRdsServicesOperationCompleted, userState);
+        }
+        
+        private void OnGetRdsServicesOperationCompleted(object arg) {
+            if ((this.GetRdsServicesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetRdsServicesCompleted(this, new GetRdsServicesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -3675,4 +3718,30 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetRdsServicesCompletedEventHandler(object sender, GetRdsServicesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetRdsServicesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetRdsServicesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ServiceInfo[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ServiceInfo[])(this.results[0]));
+            }
+        }
+    }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index 2b0e1ab3..e9da405c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -248,22 +248,22 @@ namespace WebsitePanel.EnterpriseServer
             return GetRdsCollectionSessionHostsInternal(collectionId);
         }
 
-        public static RdsServerInfo GetRdsServerInfo(int itemId, string fqdnName)
+        public static RdsServerInfo GetRdsServerInfo(int? itemId, string fqdnName)
         {
             return GetRdsServerInfoInternal(itemId, fqdnName);
         }
 
-        public static string GetRdsServerStatus(int itemId, string fqdnName)
+        public static string GetRdsServerStatus(int? itemId, string fqdnName)
         {
             return GetRdsServerStatusInternal(itemId, fqdnName);
         }
 
-        public static ResultObject ShutDownRdsServer(int itemId, string fqdnName)
+        public static ResultObject ShutDownRdsServer(int? itemId, string fqdnName)
         {
             return ShutDownRdsServerInternal(itemId, fqdnName);
         }
 
-        public static ResultObject RestartRdsServer(int itemId, string fqdnName)
+        public static ResultObject RestartRdsServer(int? itemId, string fqdnName)
         {
             return RestartRdsServerInternal(itemId, fqdnName);
         }
@@ -288,7 +288,7 @@ namespace WebsitePanel.EnterpriseServer
             return GetRdsCertificateByServiceIdInternal(serviceId);
         }
 
-        public static RdsCertificate GetRdsCertificateByItemId(int itemId)
+        public static RdsCertificate GetRdsCertificateByItemId(int? itemId)
         {
             return GetRdsCertificateByItemIdInternal(itemId);
         }
@@ -298,22 +298,23 @@ namespace WebsitePanel.EnterpriseServer
             return AddRdsCertificateInternal(certificate);
         }
 
+        public static List<ServiceInfo> GetRdsServices()
+        {
+            return GetRdsServicesInternal();
+        }
+
+        private static List<ServiceInfo> GetRdsServicesInternal()
+        {
+            return ObjectUtils.CreateListFromDataSet<ServiceInfo>(DataProvider.GetServicesByGroupName(SecurityContext.User.UserId, ResourceGroups.RDS));
+        }
+
         private static ResultObject InstallSessionHostsCertificateInternal(RdsServer rdsServer)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "INSTALL_CERTIFICATE");
 
             try
-            {                
-                Organization org = OrganizationController.GetOrganization(rdsServer.ItemId.Value);                
-
-                if (org == null)
-                {
-                    result.IsSuccess = false;
-                    result.AddError("", new NullReferenceException("Organization not found"));
-                    return result;
-                }
-
-                int serviceId = GetRemoteDesktopServiceID(org.PackageId);
+            {                                
+                int serviceId = GetRdsServiceId(rdsServer.ItemId);
                 var rds = GetRemoteDesktopServices(serviceId);
                 var certificate = GetRdsCertificateByServiceIdInternal(serviceId);
                 
@@ -351,16 +352,9 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
-        private static RdsCertificate GetRdsCertificateByItemIdInternal(int itemId)
-        {
-            Organization org = OrganizationController.GetOrganization(itemId);
-
-            if (org == null)
-            {
-                return null;
-            }
-
-            int serviceId = GetRemoteDesktopServiceID(org.PackageId);
+        private static RdsCertificate GetRdsCertificateByItemIdInternal(int? itemId)
+        {            
+            int serviceId = GetRdsServiceId(itemId);
             var result = ObjectUtils.FillObjectFromDataReader<RdsCertificate>(DataProvider.GetRdsCertificateByServiceId(serviceId));
 
             return result;
@@ -539,6 +533,14 @@ namespace WebsitePanel.EnterpriseServer
 
             try
             {
+                Organization org = OrganizationController.GetOrganization(itemId);
+                if (org == null)
+                {
+                    return -1;
+                }
+
+                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+
                 foreach(var server in collection.Servers)
                 {                    
                     if (!server.FqdName.EndsWith(domainName, StringComparison.CurrentCultureIgnoreCase))
@@ -546,20 +548,12 @@ namespace WebsitePanel.EnterpriseServer
                         throw TaskManager.WriteError(new Exception("Fully Qualified Domain Name not valid."));
                     }
 
-                    if (!CheckRDSServerAvaliable(server.FqdName))
+                    if (!rds.CheckRDSServerAvaliable(server.FqdName))
                     {
                         throw TaskManager.WriteError(new Exception(string.Format("Unable to connect to {0} server.", server.FqdName)));
                     }
                 }
-
-                // load organization
-                Organization org = OrganizationController.GetOrganization(itemId);
-                if (org == null)
-                {                    
-                    return -1;
-                }
-
-                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+                                
                 collection.Name = GetFormattedCollectionName(collection.DisplayName, org.OrganizationId);
 
                 collection.Settings = new RdsCollectionSettings
@@ -1031,12 +1025,17 @@ namespace WebsitePanel.EnterpriseServer
 
             try
             {
-                if (CheckRDSServerAvaliable(rdsServer.FqdName))
+                int serviceId = GetRdsMainServiceId();
+                var rds = GetRemoteDesktopServices(serviceId);
+
+                if (rds.CheckRDSServerAvaliable(rdsServer.FqdName))
                 {
                     var domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
 
                     if (rdsServer.FqdName.EndsWith(domainName, StringComparison.CurrentCultureIgnoreCase))
-                    {
+                    {                        
+                        rds.AddSessionHostFeatureToServer(rdsServer.FqdName);
+                        rds.MoveSessionHostToRdsOU(rdsServer.Name);
                         rdsServer.Id = DataProvider.AddRDSServer(rdsServer.Name, rdsServer.FqdName, rdsServer.Description);
                     }
                     else
@@ -1194,12 +1193,6 @@ namespace WebsitePanel.EnterpriseServer
                 var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
 
                 RdsServer rdsServer = GetRdsServer(serverId);
-
-                //if (!rds.CheckSessionHostFeatureInstallation(rdsServer.FqdName))
-                {
-                    rds.AddSessionHostFeatureToServer(rdsServer.FqdName);
-                }
-
                 rds.MoveRdsServerToTenantOU(rdsServer.FqdName, org.OrganizationId);
                 DataProvider.AddRDSServerToOrganization(itemId, serverId);
             }
@@ -1508,36 +1501,32 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
-        private static RdsServerInfo GetRdsServerInfoInternal(int itemId, string fqdnName)
+        private static RdsServerInfo GetRdsServerInfoInternal(int? itemId, string fqdnName)
         {
-            Organization org = OrganizationController.GetOrganization(itemId);
+            int serviceId = GetRdsServiceId(itemId);
+            var result = new RdsServerInfo();
 
-            if (org == null)
+            if (serviceId != -1)
             {
-                return new RdsServerInfo();
+                var rds = GetRemoteDesktopServices(serviceId);
+                result = rds.GetRdsServerInfo(fqdnName);
             }
 
-            var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
-            var result = rds.GetRdsServerInfo(fqdnName);
-
             return result;
         }
 
-        private static string GetRdsServerStatusInternal(int itemId, string fqdnName)
-        {
-            Organization org = OrganizationController.GetOrganization(itemId);
+        private static string GetRdsServerStatusInternal(int? itemId, string fqdnName)
+        {            
             var result = "Unavailable";
-
-            if (org == null)
-            {
-                return result;
-            }
-
-            var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+            var serviceId = GetRdsServiceId(itemId);            
 
             try
             {
-                result = rds.GetRdsServerStatus(fqdnName);
+                if (serviceId != -1)
+                {
+                    var rds = GetRemoteDesktopServices(serviceId);
+                    result = rds.GetRdsServerStatus(fqdnName);
+                }                
             }
             catch
             {
@@ -1546,23 +1535,19 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }        
 
-        private static ResultObject ShutDownRdsServerInternal(int itemId, string fqdnName)
+        private static ResultObject ShutDownRdsServerInternal(int? itemId, string fqdnName)
         {
             var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "SHUTDOWN_RDS_SERVER");
 
             try
-            {                
-                Organization org = OrganizationController.GetOrganization(itemId);
+            {
+                int serviceId = GetRdsServiceId(itemId);
 
-                if (org == null)
+                if (serviceId != -1)
                 {
-                    result.IsSuccess = false;
-                    result.AddError("", new NullReferenceException("Organization not found"));
-                    return result;
+                    var rds = GetRemoteDesktopServices(serviceId);
+                    rds.ShutDownRdsServer(fqdnName);
                 }
-
-                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
-                rds.ShutDownRdsServer(fqdnName);
             }
             catch (Exception ex)
             {
@@ -1583,23 +1568,19 @@ namespace WebsitePanel.EnterpriseServer
             return result;
         }
 
-        private static ResultObject RestartRdsServerInternal(int itemId, string fqdnName)
+        private static ResultObject RestartRdsServerInternal(int? itemId, string fqdnName)
         {
-            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "RESTART_RDS_SERVER");
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "RESTART_RDS_SERVER");            
 
             try
             {
-                Organization org = OrganizationController.GetOrganization(itemId);
+                int serviceId = GetRdsServiceId(itemId);
 
-                if (org == null)
+                if (serviceId != -1)
                 {
-                    result.IsSuccess = false;
-                    result.AddError("", new NullReferenceException("Organization not found"));
-                    return result;
+                    var rds = GetRemoteDesktopServices(serviceId);
+                    rds.RestartRdsServer(fqdnName);
                 }
-
-                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
-                rds.RestartRdsServer(fqdnName);
             }
             catch (Exception ex)
             {
@@ -1761,20 +1742,6 @@ namespace WebsitePanel.EnterpriseServer
             var address = Dns.GetHostAddresses(hostname);
 
             return address;
-        }
-
-        private static bool CheckRDSServerAvaliable(string hostname)
-        {
-            bool result = false;
-            var ping = new Ping();
-            var reply = ping.Send(hostname, 1000);            
-
-            if (reply.Status == IPStatus.Success)
-            {
-                result = true;
-            }
-
-            return result;
         }        
 
         private static ResultObject DeleteRemoteDesktopServiceInternal(int itemId)
@@ -1819,6 +1786,29 @@ namespace WebsitePanel.EnterpriseServer
         private static int GetRemoteDesktopServiceID(int packageId)
         {
             return PackageController.GetPackageServiceId(packageId, ResourceGroups.RDS);
+        }     
+  
+        private static int GetRdsServiceId(int? itemId)
+        {
+            int serviceId = -1;
+
+            if (itemId.HasValue)
+            {
+                Organization org = OrganizationController.GetOrganization(itemId.Value);
+
+                if (org == null)
+                {
+                    return serviceId;
+                }
+
+                serviceId = GetRemoteDesktopServiceID(org.PackageId);
+            }
+            else
+            {
+                serviceId = GetRdsMainServiceId();
+            }
+
+            return serviceId;
         }
 
         private static RemoteDesktopServices GetRemoteDesktopServices(int serviceId)
@@ -1829,6 +1819,25 @@ namespace WebsitePanel.EnterpriseServer
             return rds;
         }
 
+        private static int GetRdsMainServiceId()
+        {
+            var settings = SystemController.GetSystemSettings(WebsitePanel.EnterpriseServer.SystemSettings.RDS_SETTINGS);            
+
+            if (!string.IsNullOrEmpty(settings["RdsMainController"]))
+            {
+                return Convert.ToInt32(settings["RdsMainController"]);                
+            }
+
+            var rdsServices = GetRdsServicesInternal();
+
+            if (rdsServices.Any())
+            {
+                return rdsServices.First().ServiceId;
+            }
+
+            return -1;
+        }
+
         private static string GetFormattedCollectionName(string displayName, string organizationId)
         {
             return string.Format("{0}-{1}", organizationId, displayName.Replace(" ", "_"));
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
index cd1567ff..4b5a69ef 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
@@ -291,25 +291,25 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public RdsServerInfo GetRdsServerInfo(int itemId, string fqdnName)
+        public RdsServerInfo GetRdsServerInfo(int? itemId, string fqdnName)
         {
             return RemoteDesktopServicesController.GetRdsServerInfo(itemId, fqdnName);
         }
 
         [WebMethod]
-        public string GetRdsServerStatus(int itemId, string fqdnName)
+        public string GetRdsServerStatus(int? itemId, string fqdnName)
         {
             return RemoteDesktopServicesController.GetRdsServerStatus(itemId, fqdnName);
         }
 
         [WebMethod]
-        public ResultObject ShutDownRdsServer(int itemId, string fqdnName)
+        public ResultObject ShutDownRdsServer(int? itemId, string fqdnName)
         {
             return RemoteDesktopServicesController.ShutDownRdsServer(itemId, fqdnName);
         }
 
         [WebMethod]
-        public ResultObject RestartRdsServer(int itemId, string fqdnName)
+        public ResultObject RestartRdsServer(int? itemId, string fqdnName)
         {
             return RemoteDesktopServicesController.RestartRdsServer(itemId, fqdnName);
         }
@@ -339,7 +339,7 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public RdsCertificate GetRdsCertificateByItemId(int itemId)
+        public RdsCertificate GetRdsCertificateByItemId(int? itemId)
         {
             return RemoteDesktopServicesController.GetRdsCertificateByItemId(itemId);
         }
@@ -349,5 +349,11 @@ namespace WebsitePanel.EnterpriseServer
         {
             return RemoteDesktopServicesController.AddRdsCertificate(certificate);
         }
+
+        [WebMethod]
+        public List<ServiceInfo> GetRdsServices()
+        {
+            return RemoteDesktopServicesController.GetRdsServices();
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
index 695f2576..01038055 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
@@ -79,5 +79,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         void MoveRdsServerToTenantOU(string hostName, string organizationId);
         void RemoveRdsServerFromTenantOU(string hostName, string organizationId);
         void InstallCertificate(byte[] certificate, string password, List<string> hostNames);
+        void MoveSessionHostToRdsOU(string hostName);
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index 41c6e520..013e0cdb 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -1102,8 +1102,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             try
             {
                 var guid = Guid.NewGuid();                
-                var x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);                
-                //var content = x509Cert.Export(X509ContentType.Pfx);
+                var x509Cert = new X509Certificate2(certificate, password, X509KeyStorageFlags.Exportable);                                
                 var filePath = SaveCertificate(certificate, guid);
                 runspace = OpenRunspace();
 
@@ -1114,6 +1113,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                     if (!errors.Any())
                     {
+                        RemoveCertificate(runspace, hostName, x509Cert.Thumbprint);                        
                         errors = ImportCertificate(runspace, hostName, password, string.Format("c:\\{0}.pfx", guid), x509Cert.Thumbprint);
                     }
 
@@ -1135,12 +1135,23 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             {
                 CloseRunspace(runspace);
             }
-        }   
+        }  
+ 
+        private void RemoveCertificate(Runspace runspace, string hostName, string thumbprint)
+        {
+            var scripts = new List<string>
+            {
+                string.Format("Remove-Item -Path cert:\\LocalMachine\\My\\{0}", thumbprint)
+            };
+
+            object[] errors = null;
+            ExecuteRemoteShellCommand(runspace, hostName, scripts, out errors);
+        }
 
         private object[] ImportCertificate(Runspace runspace, string hostName, string password, string certificatePath, string thumbprint)
         {
             var scripts = new List<string>
-            {
+            {                
                 string.Format("$mypwd = ConvertTo-SecureString -String {0} -Force –AsPlainText", password),
                 string.Format("Import-PfxCertificate –FilePath \"{0}\" cert:\\localMachine\\my -Password $mypwd", certificatePath),
                 string.Format("$cert = Get-Item cert:\\LocalMachine\\My\\{0}", thumbprint),
@@ -1366,6 +1377,27 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }
 
+        public void MoveSessionHostToRdsOU(string hostName)
+        {
+            if (!string.IsNullOrEmpty(ComputersRootOU))
+            {
+                CheckOrCreateComputersRoot(GetComputersRootPath());
+            }
+
+            var computerObject = GetComputerObject(hostName);
+
+            if (computerObject != null)
+            {
+                var samName = (string)ActiveDirectoryUtils.GetADObjectProperty(computerObject, "sAMAccountName");
+
+                if (!ActiveDirectoryUtils.IsComputerInGroup(samName, RdsServersRootOU))
+                {
+                    DirectoryEntry group = new DirectoryEntry(GetRdsServersGroupPath());
+                    computerObject.MoveTo(group);
+                }
+            } 
+        }
+
         public void MoveRdsServerToTenantOU(string hostName, string organizationId)
         {
             var tenantComputerGroupPath = GetTenantComputerGroupPath(organizationId);
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
index e9681bb1..40b2e4a8 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
@@ -99,6 +99,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback InstallCertificateOperationCompleted;
         
+        private System.Threading.SendOrPostCallback MoveSessionHostToRdsOUOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -209,6 +211,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event InstallCertificateCompletedEventHandler InstallCertificateCompleted;
         
+        /// <remarks/>
+        public event MoveSessionHostToRdsOUCompletedEventHandler MoveSessionHostToRdsOUCompleted;
+        
         /// <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)]
@@ -1737,6 +1742,46 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/MoveSessionHostToRdsOU", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void MoveSessionHostToRdsOU(string hostName) {
+            this.Invoke("MoveSessionHostToRdsOU", new object[] {
+                        hostName});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginMoveSessionHostToRdsOU(string hostName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("MoveSessionHostToRdsOU", new object[] {
+                        hostName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndMoveSessionHostToRdsOU(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void MoveSessionHostToRdsOUAsync(string hostName) {
+            this.MoveSessionHostToRdsOUAsync(hostName, null);
+        }
+        
+        /// <remarks/>
+        public void MoveSessionHostToRdsOUAsync(string hostName, object userState) {
+            if ((this.MoveSessionHostToRdsOUOperationCompleted == null)) {
+                this.MoveSessionHostToRdsOUOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMoveSessionHostToRdsOUOperationCompleted);
+            }
+            this.InvokeAsync("MoveSessionHostToRdsOU", new object[] {
+                        hostName}, this.MoveSessionHostToRdsOUOperationCompleted, userState);
+        }
+        
+        private void OnMoveSessionHostToRdsOUOperationCompleted(object arg) {
+            if ((this.MoveSessionHostToRdsOUCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.MoveSessionHostToRdsOUCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -2366,4 +2411,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void InstallCertificateCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void MoveSessionHostToRdsOUCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
index 9e49fb21..7a47e54b 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
@@ -646,5 +646,21 @@ namespace WebsitePanel.Server
                 throw;
             }
         }
+
+        [WebMethod, SoapHeader("settings")]
+        public void MoveSessionHostToRdsOU(string hostName)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' MoveSessionHostToRdsOU", ProviderSettings.ProviderName);
+                RDSProvider.MoveSessionHostToRdsOU(hostName);
+                Log.WriteEnd("'{0}' MoveSessionHostToRdsOU", ProviderSettings.ProviderName);
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' MoveSessionHostToRdsOU", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SystemSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SystemSettings.ascx.resx
index d0dd8013..fb855fc2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SystemSettings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SystemSettings.ascx.resx
@@ -162,4 +162,10 @@
   <data name="litFileManagerEditableExtensions.Text" xml:space="preserve">
     <value>(One (1) extension per line)</value>
   </data>
+  <data name="lblRdsController.Text" xml:space="preserve">
+    <value>Main RDS Controller:</value>
+  </data>
+  <data name="RdsSettings.Text" xml:space="preserve">
+    <value>RDS</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
index 625145e4..0b5c8e67 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/RDSHelper.cs
@@ -54,11 +54,8 @@ namespace WebsitePanel.Portal
 
             foreach (var rdsServer in rdsServers.Servers)
             {
-                if (rdsServer.ItemId.HasValue)
-                {
-                    rdsServer.Status = ES.Services.RDS.GetRdsServerStatus(rdsServer.ItemId.Value, rdsServer.FqdName);
-                    rdsServer.SslAvailable = ES.Services.RDS.GetRdsCertificateByItemId(rdsServer.ItemId.Value) != null;
-                }
+                rdsServer.Status = ES.Services.RDS.GetRdsServerStatus(null, rdsServer.FqdName);
+                rdsServer.SslAvailable = ES.Services.RDS.GetRdsCertificateByItemId(rdsServer.ItemId) != null;
             }
 
             return rdsServers.Servers;            
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx
index 56646324..b4c681b9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditCollectionSettings.ascx
@@ -205,7 +205,7 @@
                                 </tr> 
                                 <tr>                                    
                                     <td colspan="2">
-                                        <asp:CheckBox ID="cbAuthentication" Text="Allow connections only from computers runnig Remote Desktop with Network Level Authentication" runat="server"/>
+                                        <asp:CheckBox ID="cbAuthentication" Text="Allow connections only from computers running Remote Desktop with Network Level Authentication" runat="server"/>
                                     </td>
                                 </tr>                               
                             </table>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
index 61130777..45518cce 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
@@ -91,7 +91,7 @@
                 </asp:TemplateField>
                 <asp:TemplateField>
 			        <ItemTemplate>
-				        <asp:LinkButton ID="lnkInstallCertificate" runat="server" Text="Certificate" Visible='<%# Convert.ToBoolean(Eval("SslAvailable")) && Eval("ItemId") != null && Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
+				        <asp:LinkButton ID="lnkInstallCertificate" runat="server" Text="Certificate" Visible='<%# Convert.ToBoolean(Eval("SslAvailable")) && Eval("Status") != null && Eval("Status").ToString().StartsWith("Online") %>'
 					        CommandName="InstallCertificate" CommandArgument='<%# Eval("Id") %>' ToolTip="Repair Certificate"
                             OnClientClick="if(confirm('Are you sure you want to install certificate?')) ShowProgressDialog('Installing certificate...'); else return false;"></asp:LinkButton>                        
 			        </ItemTemplate>
@@ -100,7 +100,7 @@
 			        <ItemTemplate>
 				        <asp:LinkButton ID="lnkRemove" runat="server" Text="Remove" Visible='<%# Eval("ItemId") == null %>'
 					        CommandName="DeleteItem" CommandArgument='<%# Eval("Id") %>' 
-                            meta:resourcekey="cmdDelete" OnClientClick="return confirm('Are you sure you want to delete selected rds server?')"></asp:LinkButton>                        
+                            meta:resourcekey="cmdDelete" OnClientClick="if(confirm('Are you sure you want to delete selected rds server??')) ShowProgressDialog('Removeing RDS Server...'); else return false;"></asp:LinkButton>                        
 			        </ItemTemplate>
 		        </asp:TemplateField>
 	        </Columns>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
index eb5d9697..1b73054e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx.cs
@@ -88,6 +88,8 @@ namespace WebsitePanel.Portal
                         result = ES.Services.RDS.RemoveRdsServer(rdsServerId);
                     }
 
+                    ((ModalPopupExtender)asyncTasks.FindControl("ModalPopupProperties")).Hide();
+
                     if (!result.IsSuccess)
                     {
                         messageBox.ShowMessage(result, "REMOTE_DESKTOP_SERVICES_REMOVE_RDSSERVER", "RDS");
@@ -136,7 +138,7 @@ namespace WebsitePanel.Portal
         {
             ViewInfoModal.Show();
             var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
-            var serverInfo = ES.Services.RDS.GetRdsServerInfo(rdsServer.ItemId.Value, rdsServer.FqdName);
+            var serverInfo = ES.Services.RDS.GetRdsServerInfo(null, rdsServer.FqdName);
             litProcessor.Text = string.Format("{0}x{1} MHz", serverInfo.NumberOfCores, serverInfo.MaxClockSpeed);
             litLoadPercentage.Text = string.Format("{0}%", serverInfo.LoadPercentage);
             litMemoryAllocated.Text = string.Format("{0} MB", serverInfo.MemoryAllocatedMb);
@@ -149,14 +151,14 @@ namespace WebsitePanel.Portal
         private void Restart(string serverId)
         {
             var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
-            ES.Services.RDS.RestartRdsServer(rdsServer.ItemId.Value, rdsServer.FqdName);
+            ES.Services.RDS.RestartRdsServer(null, rdsServer.FqdName);
             Response.Redirect(Request.Url.ToString(), true);
         }
 
         private void ShutDown(string serverId)
         {
             var rdsServer = ES.Services.RDS.GetRdsServer(Convert.ToInt32(serverId));
-            ES.Services.RDS.ShutDownRdsServer(rdsServer.ItemId.Value, rdsServer.FqdName);
+            ES.Services.RDS.ShutDownRdsServer(null, rdsServer.FqdName);
             Response.Redirect(Request.Url.ToString(), true);
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx
index 24542dbe..5fef4935 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx
@@ -70,6 +70,18 @@
 			</tr>
 		</table>
 	</asp:Panel>
+
+    <wsp:CollapsiblePanel ID="RdsSettings" runat="server" TargetControlID="PanelRdsSettings" meta:resourcekey="RdsSettings" Text="RDS" />
+    <asp:Panel ID="PanelRdsSettings" runat="server" Height="0" style="overflow:hidden;">
+        <table>
+			<tr>
+				<td class="SubHead" style="width:200px;"><asp:Localize ID="lblRdsController" runat="server" meta:resourcekey="lblRdsController" />
+				<td style="width:200px;">
+                    <asp:DropDownList ID="ddlRdsController" runat="server" CssClass="HugeTextBox200"/>
+                </td>
+			</tr>
+		</table>
+    </asp:Panel>
 </div>
 <div class="FormFooter">
 	<asp:Button runat="server" ID="btnSaveSettings" meta:resourcekey="btnSaveSettings" 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
index 13aaa285..61f77cda 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
@@ -51,6 +51,7 @@ namespace WebsitePanel.Portal
 		public const string SMTP_ENABLE_SSL = "SmtpEnableSsl";
 		public const string BACKUPS_PATH = "BackupsPath";
         public const string FILE_MANAGER_EDITABLE_EXTENSIONS = "EditableExtensions";
+        public const string RDS_MAIN_CONTROLLER = "RdsMainController";
 
         /*
         public const string FEED_ENABLE_MICROSOFT = "FeedEnableMicrosoft";
@@ -136,6 +137,25 @@ namespace WebsitePanel.Portal
                 // Original WebsitePanel Extensions
                 txtFileManagerEditableExtensions.Text = FileManager.ALLOWED_EDIT_EXTENSIONS.Replace(",", System.Environment.NewLine);
             }
+
+            // RDS
+            var services = ES.Services.RDS.GetRdsServices();
+
+            foreach(var service in services)
+            {
+                ddlRdsController.Items.Add(new ListItem(service.ServiceName, service.ServiceId.ToString()));
+            }
+
+            settings = ES.Services.System.GetSystemSettings(WSP.SystemSettings.RDS_SETTINGS);
+
+            if (settings != null && !string.IsNullOrEmpty(settings[RDS_MAIN_CONTROLLER]))
+            {
+                ddlRdsController.SelectedValue = settings[RDS_MAIN_CONTROLLER];
+            }
+            else if (ddlRdsController.Items.Count > 0)
+            {
+                ddlRdsController.SelectedValue = ddlRdsController.Items[0].Value;
+            }
 		}
 
 		private void SaveSettings()
@@ -207,6 +227,16 @@ namespace WebsitePanel.Portal
                 result = ES.Services.System.SetSystemSettings(
                     WSP.SystemSettings.FILEMANAGER_SETTINGS, settings);
 
+                if (result < 0)
+                {
+                    ShowResultMessage(result);
+                    return;
+                }
+
+                settings = new WSP.SystemSettings();
+                settings[RDS_MAIN_CONTROLLER] = ddlRdsController.SelectedValue;
+                result = ES.Services.System.SetSystemSettings(WSP.SystemSettings.RDS_SETTINGS, settings);
+
                 if (result < 0)
                 {
                     ShowResultMessage(result);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.designer.cs
index 6b3cb964..d8358733 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -220,6 +192,42 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litFileManagerEditableExtensions;
         
+        /// <summary>
+        /// RdsSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel RdsSettings;
+        
+        /// <summary>
+        /// PanelRdsSettings control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel PanelRdsSettings;
+        
+        /// <summary>
+        /// lblRdsController 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 lblRdsController;
+        
+        /// <summary>
+        /// ddlRdsController 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 ddlRdsController;
+        
         /// <summary>
         /// btnSaveSettings control.
         /// </summary>

From e70da870c6f2750c920b224ec565fa1bfcad112f Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 12 Mar 2015 14:23:49 -0400
Subject: [PATCH 44/46] Added tag build-2.1.0.613 for changeset 3caeed743a87


From de337fe5f3fa717c1d7c5e3288bcd8371f6dd041 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 12 Mar 2015 14:41:05 -0400
Subject: [PATCH 45/46] Added tag build-2.1.0.614 for changeset 4a18c479a6ea


From 9064cb2eb8c1541bfd416f07cd57e87cfdab6352 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 12 Mar 2015 14:48:06 -0400
Subject: [PATCH 46/46] Added tag build-2.1.0.615 for changeset e48f0bc074d1