From 7af8432f4bed8fc156aabbfae07e7746c469472b Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 31 Mar 2015 01:26:36 -0700 Subject: [PATCH] RDS GPO changes --- .../RemoteDesktopServices/RdsServerSettings.cs | 18 +++++++++++++++++- .../SettingsRdsPolicy.ascx.resx | 2 +- .../RDS/RDSEditUserExperience.ascx | 16 +++++++++++++--- .../RDS/RDSEditUserExperience.ascx.cs | 18 ++++++++++++------ .../RDS/RDSEditUserExperience.ascx.designer.cs | 8 ++++---- .../WebsitePanel/SettingsRdsPolicy.ascx | 16 +++++++++++++--- .../WebsitePanel/SettingsRdsPolicy.ascx.cs | 14 ++++++++++---- .../SettingsRdsPolicy.ascx.designer.cs | 8 ++++---- 8 files changed, 74 insertions(+), 26 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs index 1c347305..be32aaa8 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs @@ -38,7 +38,7 @@ namespace WebsitePanel.EnterpriseServer.Base.RDS public const string CHANGE_DESKTOP_DISABLED_USERS = "ChangingDesktopDisabledUsers"; public const string SCREEN_SAVER_DISABLED_ADMINISTRATORS = "ScreenSaverDisabledAdministrators"; public const string SCREEN_SAVER_DISABLED_USERS = "ScreenSaverDisabledUsers"; - public const string DRIVE_SPACE_THRESHOLD_VALUE = "DriveSpaceThresholdValue"; + public const string DRIVE_SPACE_THRESHOLD_VALUE = "DriveSpaceThresholdValue"; public string SettingsName { get; set; } public int ServerId { get; set; } @@ -58,5 +58,21 @@ namespace WebsitePanel.EnterpriseServer.Base.RDS settings = value; } } + + public static List> ScreenSaverTimeOuts + { + get + { + return new List> { + new KeyValuePair("", "None"), + new KeyValuePair("10", "10"), + new KeyValuePair("20", "20"), + new KeyValuePair("30", "30"), + new KeyValuePair("40", "40"), + new KeyValuePair("50", "50"), + new KeyValuePair("60", "60") + }; + } + } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx index 91b50033..6f342a55 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx @@ -145,7 +145,7 @@ Disable Task Manager - Lock Screen Timeout + Lock Screen Timeout (sec.) Changing Desktop Disabled diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx index cb177a39..ff6065a3 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx @@ -29,7 +29,7 @@ @@ -145,8 +145,18 @@
- +
-
- + + + + + + + + + + + +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs index 4d5ee15a..cfe4ba23 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs @@ -15,6 +15,12 @@ namespace WebsitePanel.Portal.RDS { if (!IsPostBack) { + var timeouts = RdsServerSettings.ScreenSaverTimeOuts; + ddTimeout.DataSource = timeouts; + ddTimeout.DataTextField = "Value"; + ddTimeout.DataValueField = "Key"; + ddTimeout.DataBind(); + var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID); litCollectionName.Text = collection.DisplayName; BindSettings(); @@ -39,7 +45,7 @@ namespace WebsitePanel.Portal.RDS private void BindSettings(RdsServerSettings settings) { var setting = GetServerSetting(settings, RdsServerSettings.LOCK_SCREEN_TIMEOUT); - txtTimeout.Text = setting.PropertyValue; + ddTimeout.SelectedValue = setting.PropertyValue; cbTimeoutAdministrators.Checked = setting.ApplyAdministrators; cbTimeoutUsers.Checked = setting.ApplyUsers; @@ -72,7 +78,7 @@ namespace WebsitePanel.Portal.RDS cbScreenSaverUsers.Checked = setting.ApplyUsers; setting = GetServerSetting(settings, RdsServerSettings.DRIVE_SPACE_THRESHOLD); - txtThreshold.Text = setting.PropertyValue; + ddTreshold.SelectedValue = setting.PropertyValue; } private RdsServerSetting GetServerSetting(RdsServerSettings settings, string propertyName) @@ -87,7 +93,7 @@ namespace WebsitePanel.Portal.RDS settings.Settings.Add(new RdsServerSetting { PropertyName = RdsServerSettings.LOCK_SCREEN_TIMEOUT, - PropertyValue = txtTimeout.Text, + PropertyValue = ddTimeout.SelectedValue, ApplyAdministrators = cbTimeoutAdministrators.Checked, ApplyUsers = cbTimeoutUsers.Checked }); @@ -151,7 +157,7 @@ namespace WebsitePanel.Portal.RDS settings.Settings.Add(new RdsServerSetting { PropertyName = RdsServerSettings.DRIVE_SPACE_THRESHOLD, - PropertyValue = txtThreshold.Text, + PropertyValue = ddTreshold.SelectedValue, ApplyAdministrators = true, ApplyUsers = true }); @@ -161,7 +167,7 @@ namespace WebsitePanel.Portal.RDS private void BindDefaultSettings(UserSettings settings) { - txtTimeout.Text = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE]; + ddTimeout.SelectedValue = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE]; cbTimeoutAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS]); cbTimeoutUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS]); @@ -186,7 +192,7 @@ namespace WebsitePanel.Portal.RDS cbScreenSaverAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS]); cbScreenSaverUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS]); - txtThreshold.Text = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE]; + ddTreshold.SelectedValue = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE]; } private bool SaveServerSettings() diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs index a743b041..ced85d01 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs @@ -85,13 +85,13 @@ namespace WebsitePanel.Portal.RDS { protected global::System.Web.UI.WebControls.Panel timeoutPanel; /// - /// txtTimeout control. + /// ddTimeout control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtTimeout; + protected global::System.Web.UI.WebControls.DropDownList ddTimeout; /// /// cbTimeoutUsers control. @@ -382,13 +382,13 @@ namespace WebsitePanel.Portal.RDS { protected global::System.Web.UI.WebControls.Panel driveSpacePanel; /// - /// txtThreshold control. + /// ddTreshold control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtThreshold; + protected global::System.Web.UI.WebControls.DropDownList ddTreshold; /// /// buttonPanel control. diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx index 5b860eef..8e0a1ea6 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx @@ -6,7 +6,7 @@ @@ -122,8 +122,18 @@
- +
-
- + + + + + + + + + + + +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs index c7cc46ff..cdbd2821 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs @@ -13,7 +13,13 @@ namespace WebsitePanel.Portal { public void BindSettings(UserSettings settings) { - txtTimeout.Text = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE]; + var timeouts = RdsServerSettings.ScreenSaverTimeOuts; + ddTimeout.DataSource = timeouts; + ddTimeout.DataTextField = "Value"; + ddTimeout.DataValueField = "Key"; + ddTimeout.DataBind(); + + ddTimeout.SelectedValue = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE]; cbTimeoutAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS]); cbTimeoutUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS]); @@ -38,12 +44,12 @@ namespace WebsitePanel.Portal cbScreenSaverAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS]); cbScreenSaverUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS]); - txtThreshold.Text = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE]; + ddTreshold.SelectedValue = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE]; } public void SaveSettings(UserSettings settings) { - settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE] = txtTimeout.Text; + settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE] = ddTimeout.SelectedValue; settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS] = cbTimeoutAdministrators.Checked.ToString(); settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS] = cbTimeoutUsers.Checked.ToString(); settings[RdsServerSettings.REMOVE_RUN_COMMAND_ADMINISTRATORS] = cbRunCommandAdministrators.Checked.ToString(); @@ -60,7 +66,7 @@ namespace WebsitePanel.Portal settings[RdsServerSettings.CHANGE_DESKTOP_DISABLED_USERS] = cbDesktopUsers.Checked.ToString(); settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS] = cbScreenSaverAdministrators.Checked.ToString(); settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS] = cbScreenSaverUsers.Checked.ToString(); - settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE] = txtThreshold.Text; + settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE] = ddTreshold.SelectedValue; } } } \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs index ab5d3f15..4c962af4 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs @@ -31,13 +31,13 @@ namespace WebsitePanel.Portal { protected global::System.Web.UI.WebControls.Panel timeoutPanel; /// - /// txtTimeout control. + /// ddTimeout control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtTimeout; + protected global::System.Web.UI.WebControls.DropDownList ddTimeout; /// /// cbTimeoutUsers control. @@ -328,12 +328,12 @@ namespace WebsitePanel.Portal { protected global::System.Web.UI.WebControls.Panel driveSpacePanel; /// - /// txtThreshold control. + /// ddTreshold control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtThreshold; + protected global::System.Web.UI.WebControls.DropDownList ddTreshold; } }