Merge

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

@@ -605,13 +605,20 @@ namespace WebsitePanel.EnterpriseServer
                 }
                 else
                 {
-                    result.AddError("", new Exception("The server that you are adding, is not available"));
+                    result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_SERVER", new Exception("The server that you are adding, is not available"));
                     return result;
                 }
             }
             catch (Exception ex)
             {
-                result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_SERVER", ex);
+                if (ex.InnerException != null)
+                {
+                    result.AddError("Unable to add RDS Server", ex.InnerException);
+                }
+                else
+                {
+                    result.AddError("Unable to add RDS Server", ex);
+                }
             }
             finally
             {
@@ -1167,18 +1174,12 @@ namespace WebsitePanel.EnterpriseServer
         private static bool CheckRDSServerAvaliable(string hostname)
         {
             bool result = false;
+            var ping = new Ping();
+            var reply = ping.Send(hostname, 1000);
 
-            try
+            if (reply.Status == IPStatus.Success)
             {
-                var ping = new Ping();
+                result = true;
-                var reply = ping.Send(hostname, 1000); // 1 second time out (in ms)
-
-                if (reply.Status == IPStatus.Success)
-                    result = true;
-            }
-            catch (Exception)
-            {
-                result = false;
             }
 
             return result;

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

@@ -63,5 +63,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         bool CheckServerAvailability(string hostName);
         string[] GetApplicationUsers(string collectionName, string applicationName);
         bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users);
+        bool CheckRDSServerAvaliable(string hostname);
     }
 }

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

@@ -165,6 +165,20 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             return new string[]{};
         }
 
+        public 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;
+        }
+
         #endregion
 
         #region RDS Collections

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

@@ -69,6 +69,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback SetApplicationUsersOperationCompleted;
         
+        private System.Threading.SendOrPostCallback CheckRDSServerAvaliableOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -134,6 +136,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event SetApplicationUsersCompletedEventHandler SetApplicationUsersCompleted;
         
+        /// <remarks/>
+        public event CheckRDSServerAvaliableCompletedEventHandler CheckRDSServerAvaliableCompleted;
+        
         /// <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)]
@@ -1021,6 +1026,48 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CheckRDSServerAvaliable", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool CheckRDSServerAvaliable(string hostname) {
+            object[] results = this.Invoke("CheckRDSServerAvaliable", new object[] {
+                        hostname});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCheckRDSServerAvaliable(string hostname, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CheckRDSServerAvaliable", new object[] {
+                        hostname}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public bool EndCheckRDSServerAvaliable(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CheckRDSServerAvaliableAsync(string hostname) {
+            this.CheckRDSServerAvaliableAsync(hostname, null);
+        }
+        
+        /// <remarks/>
+        public void CheckRDSServerAvaliableAsync(string hostname, object userState) {
+            if ((this.CheckRDSServerAvaliableOperationCompleted == null)) {
+                this.CheckRDSServerAvaliableOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckRDSServerAvaliableOperationCompleted);
+            }
+            this.InvokeAsync("CheckRDSServerAvaliable", new object[] {
+                        hostname}, this.CheckRDSServerAvaliableOperationCompleted, userState);
+        }
+        
+        private void OnCheckRDSServerAvaliableOperationCompleted(object arg) {
+            if ((this.CheckRDSServerAvaliableCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CheckRDSServerAvaliableCompleted(this, new CheckRDSServerAvaliableCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -1436,4 +1483,30 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void CheckRDSServerAvaliableCompletedEventHandler(object sender, CheckRDSServerAvaliableCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CheckRDSServerAvaliableCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CheckRDSServerAvaliableCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
 }

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

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

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

@@ -5620,5 +5620,8 @@
   <data name="SchedulerTask.SCHEDULE_TASK_DOMAIN_EXPIRATION" xml:space="preserve">
     <value>Check domain expiration date</value>
   </data>
+  <data name="Error.REMOTE_DESKTOP_SERVICES_ADD_RDS_SERVER" xml:space="preserve">
+    <value>Unable to add RDS Server</value>
+  </data>
 
 </root>

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

@@ -67,8 +67,7 @@
 							    <ItemTemplate>                                                                        
 									<asp:LinkButton ID="imgRemove1" runat="server" Text="Remove" Visible='<%# Eval("RdsCollectionId") == null %>'
 									    CommandName="DeleteItem" CommandArgument='<%# Eval("Id") %>' 
-                                        meta:resourcekey="cmdDelete" OnClientClick="return confirm('Are you sure you want to remove selected server?')"></asp:LinkButton>
+                                        meta:resourcekey="cmdDelete" OnClientClick="return confirm('Are you sure you want to remove selected server?')"></asp:LinkButton>                                    
-                                    <asp:Label ID="lbRemove" Text="Remove" runat="server" Visible='<%# Eval("RdsCollectionId") != null %>'></asp:Label>
 							    </ItemTemplate>
 						    </asp:TemplateField>
 					    </Columns>

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

@@ -41,6 +41,8 @@ namespace WebsitePanel.Portal.RDS
         
         protected void Page_Load(object sender, EventArgs e)
         {
+            remoreApps.Module = Module;
+
             if (!IsPostBack)
             {
                 RdsCollection collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
@@ -48,8 +50,8 @@ namespace WebsitePanel.Portal.RDS
 
                 locCName.Text = collection.Name;
 
-                remoreApps.SetApps(collectionApps, Module);
+                remoreApps.SetApps(collectionApps);
-            }
+            }            
         }
 
         protected void btnSave_Click(object sender, EventArgs e)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx

@@ -43,16 +43,16 @@
 	        <Columns>
 		        <asp:BoundField DataField="Name" HtmlEncode="true" SortExpression="Name" HeaderText="Server name">
 		            <HeaderStyle Wrap="false" />
-                    <ItemStyle Wrap="False" Width="35%"/>
+                    <ItemStyle Wrap="False" Width="25%"/>
                 </asp:BoundField>
-		        <asp:BoundField DataField="Address" HeaderText="IP Address"><ItemStyle  Width="20%"/></asp:BoundField>
+		        <asp:BoundField DataField="Address" HeaderText="IP Address"><ItemStyle  Width="15%"/></asp:BoundField>
-                <asp:BoundField DataField="ItemName" HeaderText="Organization"><ItemStyle  Width="35%"/></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:TemplateField>
 			        <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="return confirm('Are you sure you want to delete selected rds server?')"></asp:LinkButton>                        
-                        <asp:Label ID="lbRemove" Text="Remove" runat="server" Visible='<%# Eval("ItemId") != null %>'></asp:Label>
 			        </ItemTemplate>
 		        </asp:TemplateField>
 	        </Columns>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServersAddserver.ascx

@@ -20,8 +20,7 @@
             <tr>
                 <td class="FormLabel150"><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="145px"></asp:TextBox>                     
-                    <asp:RequiredFieldValidator ID="valServerComments" runat="server" ErrorMessage="*" ControlToValidate="txtServerComments"></asp:RequiredFieldValidator>                               
 			    </td>
 		    </tr>
 	    </table>

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

@@ -75,15 +75,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtServerComments;
         
-        /// <summary>
-        /// valServerComments 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 valServerComments;
-        
         /// <summary>
         /// btnAdd control.
         /// </summary>