--- joko/ToolBox/Windows/VpnDial/src/Module_Main.bas	2005/09/28 22:50:30	1.2
+++ joko/ToolBox/Windows/VpnDial/src/Module_Main.bas	2005/10/06 20:15:34	1.3
@@ -21,48 +21,73 @@
 
     Dim cmdline As New CommandLine
     Dim conName As String
-    Dim script_name As String, script_args As String
     Dim rasItem As RasEntryData
     Dim success As Boolean
+    
+    Dim script_name As String, script_args As String
+    Dim setup_user As String, setup_pass As String
 
     ReadRasEntries
     cmdline.parse
     
-    If cmdline.hasSwitch("gui") Then
-        Form_Main.Show
-    Else
-        
-        If cmdline.hasSwitch("dial") Then
-        
-            ' dial command
-            conName = cmdline.getArgument("dial")
-            On Error Resume Next
-            Set rasItem = RasEntries(conName)
-            If Err.Number = 0 Then
-                success = RasConnect(rasItem.entryname, rasItem.PhonebookPath)
-            Else
-                MsgBox "Unkown RAS-Connection """ & conName & """."
-            End If
-            On Error GoTo 0
-        
-        ElseIf cmdline.hasSwitch("hangup") Then
-            ' hangup command
-            conName = cmdline.getArgument("hangup")
-            success = RasDisconnect(conName)
-            'MsgBox success
+    'If cmdline.hasSwitch("gui") Then
+    '    Form_Main.Show
+    'Else
         
+    ' dial command
+    If cmdline.hasSwitch("dial") Then
+    
+        conName = cmdline.getArgument("dial")
+        On Error Resume Next
+        Set rasItem = RasEntries(conName)
+        If Err.Number = 0 Then
+            success = RasConnect(rasItem.entryname, rasItem.PhonebookPath)
+        Else
+            MsgBox "Unkown RAS-Connection """ & conName & """."
         End If
+        On Error GoTo 0
+    
+    ' hangup command
+    ElseIf cmdline.hasSwitch("hangup") Then
+        conName = cmdline.getArgument("hangup")
+        success = RasDisconnect(conName)
+        'MsgBox success
+    
+    'End If
+    
+    ' run script
+    ElseIf cmdline.hasSwitch("script") And success = True Then
+        script_name = cmdline.getArgument("script")
+        If script_name <> "" Then
+            script_args = Chr(34) & DetermineClientIP() & Chr(34) & " " & Chr(34) & DetermineServerIP & Chr(34)
+            Shell App.Path & "\" & script_name & " " & script_args, vbHide
+        End If
+    'End If
+    
+    ' setup
+    ElseIf cmdline.hasSwitch("setup") Then
+        conName = cmdline.getArgument("setup")
+        If conName <> "" Then
+        
+            Set rasItem = RasEntries(conName)
         
-        ' run script
-        If cmdline.hasSwitch("script") And success = True Then
-            script_name = cmdline.getArgument("script")
-            If script_name <> "" Then
-                script_args = Chr(34) & DetermineClientIP() & Chr(34) & " " & Chr(34) & DetermineServerIP & Chr(34)
-                Shell App.Path & "\" & script_name & " " & script_args, vbHide
+            If cmdline.hasSwitch("gui") Then
+                With Form_Credentials
+                    .ras_connectionName = rasItem.entryname
+                    .ras_phoneBook = rasItem.PhonebookPath
+                    .Show
+                End With
+        
+            ElseIf cmdline.hasSwitch("user") And cmdline.hasSwitch("pass") Then
+                setup_user = cmdline.getArgument("user")
+                setup_pass = cmdline.getArgument("pass")
+                SetupRasEntry rasItem.entryname, rasItem.PhonebookPath, setup_user, setup_pass
             End If
-        End If
         
+        End If
     End If
+        
+    'End If
     
 End Sub