Skip to content

Commit

Permalink
Add Load/Save of RD Gateway information to SQL.
Browse files Browse the repository at this point in the history
  • Loading branch information
Riley McArdle committed Feb 1, 2010
1 parent 201d1b7 commit 6afe0c9
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 4 deletions.
14 changes: 14 additions & 0 deletions mRemoteV1/Config/Config.Connections.Load.vb
View file
Expand Up @@ -536,6 +536,20 @@ Namespace Config
conI.Inherit.ExtApp = .Item("InheritExtApp")
End If

If Me.confVersion >= 2.2 Then
conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
conI.RDGatewayHostname = .Item("RDGatewayHostname")
conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
conI.RDGatewayUsername = .Item("RDGatewayUsername")
conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW)
conI.RDGatewayDomain = .Item("RDGatewayDomain")
conI.Inherit.RDGatewayUsageMethod = .Item("InheritRDGatewayUsageMethod")
conI.Inherit.RDGatewayHostname = .Item("InheritRDGatewayHostname")
conI.Inherit.RDGatewayUsername = .Item("InheritRDGatewayUsername")
conI.Inherit.RDGatewayPassword = .Item("InheritRDGatewayPassword")
conI.Inherit.RDGatewayDomain = .Item("InheritRDGatewayDomain")
End If

If SQLUpdate = True Then
conI.PleaseConnect = .Item("Connected")
End If
Expand Down
46 changes: 43 additions & 3 deletions mRemoteV1/Config/Config.Connections.Save.vb
View file
Expand Up @@ -227,7 +227,9 @@ Namespace Config
"RedirectPrinters, RedirectSmartCards, RedirectSound, RedirectKeys, " & _
"Connected, PreExtApp, PostExtApp, MacAddress, UserField, ExtApp, VNCCompression, VNCEncoding, VNCAuthMode, " & _
"VNCProxyType, VNCProxyIP, VNCProxyPort, VNCProxyUsername, VNCProxyPassword, " & _
"VNCColors, VNCSmartSizeMode, VNCViewOnly, InheritCacheBitmaps, InheritColors, " & _
"VNCColors, VNCSmartSizeMode, VNCViewOnly, " & _
"RDGatewayUsageMethod, RDGatewayHostname, RDGatewayUseConnectionCredentials, RDGatewayUsername, RDGatewayPassword, RDGatewayDomain, " & _
"InheritCacheBitmaps, InheritColors, " & _
"InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritDomain, " & _
"InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
"InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
Expand All @@ -238,6 +240,7 @@ Namespace Config
"InheritVNCAuthMode, InheritVNCProxyType, InheritVNCProxyIP, InheritVNCProxyPort, " & _
"InheritVNCProxyUsername, InheritVNCProxyPassword, InheritVNCColors, " & _
"InheritVNCSmartSizeMode, InheritVNCViewOnly, " & _
"InheritRDGatewayUsageMethod, InheritRDGatewayHostname, InheritRDGatewayUseConnectionCredentials, InheritRDGatewayUsername, InheritRDGatewayPassword, InheritRDGatewayDomain, " & _
"PositionID, ParentID, ConstantID, LastChange)" & _
"VALUES (", sqlCon)

Expand Down Expand Up @@ -340,6 +343,28 @@ Namespace Config
sqlQuery.CommandText &= "'" & .VNCSmartSizeMode.ToString & "',"
sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"

sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod.ToString & "',"
sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials.ToString & "',"

If Me._SaveSecurity.Username = True Then
sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
Else
sqlQuery.CommandText &= "'" & "" & "',"
End If

If Me._SaveSecurity.Password = True Then
sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
Else
sqlQuery.CommandText &= "'" & "" & "',"
End If

If Me._SaveSecurity.Domain = True Then
sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
Else
sqlQuery.CommandText &= "'" & "" & "',"
End If

With .Inherit
If Me._SaveSecurity.Inheritance = True Then
sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
Expand Down Expand Up @@ -383,6 +408,13 @@ Namespace Config
sqlQuery.CommandText &= "'" & .VNCColors & "',"
sqlQuery.CommandText &= "'" & .VNCSmartSizeMode & "',"
sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"

sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod & "',"
sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials & "',"
sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
Else
sqlQuery.CommandText &= "'" & False & "',"
sqlQuery.CommandText &= "'" & False & "',"
Expand Down Expand Up @@ -425,6 +457,13 @@ Namespace Config
sqlQuery.CommandText &= "'" & False & "',"
sqlQuery.CommandText &= "'" & False & "',"
sqlQuery.CommandText &= "'" & False & "',"

sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsageMethod
sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayHostname
sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUseConnectionCredentials
sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsername
sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayPassword
sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayDomain
End If
End With

Expand Down Expand Up @@ -704,7 +743,7 @@ Namespace Config
xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUsername)
xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUseConnectionCredentials)
xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
Expand Down Expand Up @@ -761,8 +800,9 @@ Namespace Config
End Sub
#End Region

Private csvWr As StreamWriter
#Region "CSV"
Private csvWr As StreamWriter

Private Sub SaveTomRCSV()
If App.Runtime.ConnectionsFileLoaded = False Then
Exit Sub
Expand Down
14 changes: 13 additions & 1 deletion mRemoteV1/Help/SQLScript.txt
View file
Expand Up @@ -61,6 +61,12 @@ CREATE TABLE [dbo].[tblCons] (
[VNCColors] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[VNCSmartSizeMode] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[VNCViewOnly] [bit] NOT NULL ,
[RDGatewayUsageMethod] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[RDGatewayHostname] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[RDGatewayUseConnectionCredentials] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
[RDGatewayUsername] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[RDGatewayPassword] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[RDGatewayDomain] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[InheritCacheBitmaps] [bit] NOT NULL ,
[InheritColors] [bit] NOT NULL ,
[InheritDescription] [bit] NOT NULL ,
Expand Down Expand Up @@ -100,7 +106,13 @@ CREATE TABLE [dbo].[tblCons] (
[InheritVNCProxyPassword] [bit] NOT NULL ,
[InheritVNCColors] [bit] NOT NULL ,
[InheritVNCSmartSizeMode] [bit] NOT NULL ,
[InheritVNCViewOnly] [bit] NOT NULL
[InheritVNCViewOnly] [bit] NOT NULL ,
[InheritRDGatewayUsageMethod] [bit] NOT NULL ,
[InheritRDGatewayHostname] [bit] NOT NULL ,
[InheritRDGatewayUseConnectionCredentials] [bit] NOT NULL ,
[InheritRDGatewayUsername] [bit] NOT NULL ,
[InheritRDGatewayPassword] [bit] NOT NULL ,
[InheritRDGatewayDomain] [bit] NOT NULL
) ON [PRIMARY]
GO

Expand Down

0 comments on commit 6afe0c9

Please sign in to comment.