[swebs-commits] swebswebserver/winui .cvsignore,1.5,1.6 WinUI.vbp,1.63,1.64 cHTTPCGI.cls,1.3,1.4 cHTTPCGICol.cls,1.3,1.4 cHTTPConfig.cls,1.4,1.5 cHTTPIndexCol.cls,1.3,1.4 cHTTPVirtHostCol.cls,1.3,1.4 credits.rtf,1.18,1.19 frmAbout.frm,1.34,1.35 frmAbout.frx,1.20,1.21 frmMain.frm,1.74,1.75 lang.xml,1.9,1.10 swebscc.exe,1.60,1.61

[<ple...@us...>]

Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv8417/swebswebserver/winui

Modified Files:
	.cvsignore WinUI.vbp cHTTPCGI.cls cHTTPCGICol.cls 
	cHTTPConfig.cls cHTTPIndexCol.cls cHTTPVirtHostCol.cls 
	credits.rtf frmAbout.frm frmAbout.frx frmMain.frm lang.xml 
	swebscc.exe 
Log Message:
I've been putting this off for two weeks, and got it done in just a couple hours... Well, this seems to work and it compiles.. 

Let me know if anything is broke..

Index: .cvsignore
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore	25 Oct 2003 00:38:57 -0000	1.5
+++ .cvsignore	5 Nov 2003 21:39:20 -0000	1.6
@@ -4,4 +4,5 @@
 WinUI.PDM
 WinUI.csi
 TransExtract.exe
-SWEBS.dll
\ No newline at end of file
+SWEBS.dll
+

Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- WinUI.vbp	25 Oct 2003 00:38:57 -0000	1.63
+++ WinUI.vbp	5 Nov 2003 21:39:21 -0000	1.64
@@ -52,7 +52,7 @@
 CompatibleMode="0"
 MajorVer=1
 MinorVer=0
-RevisionVer=173
+RevisionVer=176
 AutoIncrementVer=1
 ServerSupportFiles=0
 VersionCompanyName="SWEBS Development Team"

Index: cHTTPCGI.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGI.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPCGI.cls	18 Oct 2003 15:35:27 -0000	1.3
+++ cHTTPCGI.cls	5 Nov 2003 21:39:21 -0000	1.4
@@ -39,40 +39,40 @@
 
 'local variable(s) to hold property value(s)
 Private mvarInterpreter As String 'local copy
-Private mvarExtention As String 'local copy
+Private mvarExtension As String 'local copy
 
-Public Property Let Extention(ByVal vData As String)
+Public Property Let Extension(ByVal vData As String)
     'used when assigning a value to the property, on the left side of an assignment.
     'Syntax: X.Extention = 5
     '<EhHeader>
-    On Error GoTo Extention_Err
-    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extention")
+    On Error GoTo Extension_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
     '</EhHeader>
-100     mvarExtention = vData
+100     mvarExtension = vData
     '<EhFooter>
     WinUI.Debuger.CallStack.Pop
     Exit Property
 
-Extention_Err:
-    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extention", Erl, False
+Extension_Err:
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
     Resume Next
     '</EhFooter>
 End Property
 
-Public Property Get Extention() As String
+Public Property Get Extension() As String
     'used when retrieving value of a property, on the right side of an assignment.
     'Syntax: Debug.Print X.Extention
     '<EhHeader>
-    On Error GoTo Extention_Err
-    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extention")
+    On Error GoTo Extension_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGI.Extension")
     '</EhHeader>
-100     Extention = mvarExtention
+100     Extension = mvarExtension
     '<EhFooter>
     WinUI.Debuger.CallStack.Pop
     Exit Property
 
-Extention_Err:
-    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extention", Erl, False
+Extension_Err:
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGI.Extension", Erl, False
     Resume Next
     '</EhFooter>
 End Property

Index: cHTTPCGICol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPCGICol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPCGICol.cls	18 Oct 2003 15:35:27 -0000	1.3
+++ cHTTPCGICol.cls	5 Nov 2003 21:39:21 -0000	1.4
@@ -42,7 +42,7 @@
 'local variable to hold collection
 Private mCol As Collection
 
-Public Function Add(Interpreter As String, Extention As String, Optional sKey As String) As cHTTPCGI
+Public Function Add(Interpreter As String, Extension As String, Optional sKey As String) As cHTTPCGI
         'create a new object
     '<EhHeader>
     On Error GoTo Add_Err
@@ -52,7 +52,7 @@
 100     Set objNewMember = New cHTTPCGI
         'set the properties passed into the method
 104     objNewMember.Interpreter = Interpreter
-108     objNewMember.Extention = Extention
+108     objNewMember.Extension = Extension
 112     If Len(sKey) = 0 Then
 116         mCol.Add objNewMember
         Else
@@ -174,3 +174,21 @@
     Set mCol = Nothing
 End Sub
 
+Public Function Clear()
+        'destroys collection
+    '<EhHeader>
+    On Error GoTo Clear_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPCGICol.Clear")
+    '</EhHeader>
+100     Set mCol = Nothing
+        'creates the collection
+104     Set mCol = New Collection
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Function
+
+Clear_Err:
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPCGICol.Clear", Erl, False
+    Resume Next
+    '</EhFooter>
+End Function

Index: cHTTPConfig.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPConfig.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTPConfig.cls	18 Oct 2003 15:35:27 -0000	1.4
+++ cHTTPConfig.cls	5 Nov 2003 21:39:21 -0000	1.5
@@ -179,11 +179,11 @@
         '<IndexFile>
 248     Set Node = ConfigXML.SearchForTag(Nothing, "IndexFile")
 252     If Node Is Nothing Then
-256         Index.Add "index.html", "index.html"
+256         Index.Add "index.html"
         Else
 260         Do While Not (Node Is Nothing)
 264             If Trim$(Node.Content) <> "" Then
-268                 Index.Add Trim$(Node.Content), Trim$(Node.Content)
+268                 Index.Add Trim$(Node.Content)
                 End If
 272             Set Node = ConfigXML.SearchForTag(Node, "IndexFile")
             Loop

Index: cHTTPIndexCol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPIndexCol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPIndexCol.cls	18 Oct 2003 15:35:27 -0000	1.3
+++ cHTTPIndexCol.cls	5 Nov 2003 21:39:21 -0000	1.4
@@ -173,3 +173,21 @@
     Set mCol = Nothing
 End Sub
 
+Public Function Clear()
+        'destroys collection
+    '<EhHeader>
+    On Error GoTo Clear_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPIndexCol.Clear")
+    '</EhHeader>
+100     Set mCol = Nothing
+        'creates the collection
+104     Set mCol = New Collection
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Function
+
+Clear_Err:
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPIndexCol.Clear", Erl, False
+    Resume Next
+    '</EhFooter>
+End Function

Index: cHTTPVirtHostCol.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTPVirtHostCol.cls,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cHTTPVirtHostCol.cls	18 Oct 2003 15:35:27 -0000	1.3
+++ cHTTPVirtHostCol.cls	5 Nov 2003 21:39:21 -0000	1.4
@@ -51,7 +51,6 @@
         Dim objNewMember As cHTTPVirtHost
 100     Set objNewMember = New cHTTPVirtHost
 
-
         'set the properties passed into the method
 104     objNewMember.HostName = HostName
 108     objNewMember.Domain = Domain
@@ -63,12 +62,10 @@
 128         mCol.Add objNewMember, sKey
         End If
 
-
         'return the object created
 132     Set Add = objNewMember
 136     Set objNewMember = Nothing
 
-
     '<EhFooter>
     WinUI.Debuger.CallStack.Pop
     Exit Function
@@ -182,3 +179,21 @@
     Set mCol = Nothing
 End Sub
 
+Public Function Clear()
+        'destroys collection
+    '<EhHeader>
+    On Error GoTo Clear_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cHTTPVirtHostCol.Clear")
+    '</EhHeader>
+100     Set mCol = Nothing
+        'creates the collection
+104     Set mCol = New Collection
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Function
+
+Clear_Err:
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.cHTTPVirtHostCol.Clear", Erl, False
+    Resume Next
+    '</EhFooter>
+End Function

Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
Binary files /tmp/cvsLGCNlI and /tmp/cvsyFIzug differ

Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- frmAbout.frm	18 Oct 2003 15:35:27 -0000	1.34
+++ frmAbout.frm	5 Nov 2003 21:39:21 -0000	1.35
@@ -53,7 +53,7 @@
       ForeColor       =   &H00FF0000&
       Height          =   195
       Left            =   120
-      MouseIcon       =   "frmAbout.frx":16B1
+      MouseIcon       =   "frmAbout.frx":173F
       MousePointer    =   99  'Custom
       TabIndex        =   4
       ToolTipText     =   "Go To URL: http://swebs.sourceforge.net/"
@@ -63,7 +63,7 @@
    Begin VB.Image imgLogo 
       Height          =   480
       Left            =   600
-      Picture         =   "frmAbout.frx":19BB
+      Picture         =   "frmAbout.frx":1A49
       Top             =   120
       Width           =   480
    End

Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvsvGlCvM and /tmp/cvsYgbJLo differ

Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- frmMain.frm	25 Oct 2003 00:38:57 -0000	1.74
+++ frmMain.frm	5 Nov 2003 21:39:21 -0000	1.75
@@ -241,7 +241,6 @@
          _ExtentY        =   5741
          _Version        =   393217
          BorderStyle     =   0
-         Enabled         =   -1  'True
          ReadOnly        =   -1  'True
          ScrollBars      =   3
          AutoVerbMenu    =   -1  'True
@@ -1199,29 +1198,30 @@
 End Sub
 
 Private Sub cmdBrowseErrorLog_Click()
-'Dim strDefaultFile As String
-'    blnDirty = True
-'    dlgMain.DialogTitle = "Please select a file..."
-'    dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-'    strDefaultFile = Mid$(Config.vHost((WinUI.Config.ErrorLog + 1), 4), (InStrRev(Config.vHost((WinUI.Config.ErrorLog + 1), 4), "\") + 1))
-'    dlgMain.FileName = strDefaultFile
-'    dlgMain.InitDir = WinUI.Path
-'    dlgMain.ShowSave
-'    If dlgMain.FileName <> strDefaultFile Then
-'        txtvHostLog.Text = dlgMain.FileName
-'    End If
-'<EhHeader>
-On Error GoTo cmdBrowseErrorLog_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdBrowseErrorLog_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click")
+    '</EhHeader>
+    Dim strDefaultFile As String
+
+100     blnDirty = True
+104     dlgMain.DialogTitle = "Please select a file..."
+108     dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112     strDefaultFile = Mid$(WinUI.Server.HTTP.Config.ErrorLog, (InStrRev(WinUI.Server.HTTP.Config.ErrorLog, "\") + 1))
+116     dlgMain.FileName = strDefaultFile
+120     dlgMain.InitDir = WinUI.Path
+124     dlgMain.ShowSave
+128     If dlgMain.FileName <> strDefaultFile Then
+132         txtvHostLog.Text = dlgMain.FileName
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdBrowseErrorLog_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseErrorLog_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdBrowseErrorPages_Click()
@@ -1329,29 +1329,30 @@
 End Sub
 
 Private Sub cmdBrowsevHostLog_Click()
-'Dim strDefaultFile As String
-'    blnDirty = True
-'    dlgMain.DialogTitle = "Please select a file..."
-'    dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-'    strDefaultFile = Mid$(WinUI.Config.vHost((lstvHosts.ListIndex + 1), 4), (InStrRev(Config.vHost((lstvHosts.ListIndex + 1), 4), "\") + 1))
-'    dlgMain.FileName = strDefaultFile
-'    dlgMain.InitDir = Mid$(Config.vHost((lstvHosts.ListIndex + 1), 4), 1, (Len(Config.vHost((lstvHosts.ListIndex + 1), 4)) - InStrRev(Config.vHost((lstvHosts.ListIndex + 1), 4), "\")))
-'    dlgMain.ShowSave
-'    If dlgMain.FileName <> strDefaultFile Then
-'        txtvHostLog.Text = dlgMain.FileName
-'    End If
-'<EhHeader>
-On Error GoTo cmdBrowsevHostLog_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdBrowsevHostLog_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click")
+    '</EhHeader>
+    Dim strDefaultFile As String
+
+100     blnDirty = True
+104     dlgMain.DialogTitle = "Please select a file..."
+108     dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112     strDefaultFile = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, (InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\") + 1))
+116     dlgMain.FileName = strDefaultFile
+120     dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, 1, (Len(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log) - InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\")))
+124     dlgMain.ShowSave
+128     If dlgMain.FileName <> strDefaultFile Then
+132         txtvHostLog.Text = dlgMain.FileName
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdBrowsevHostLog_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowsevHostLog_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdBrowsevHostRoot_Click()
@@ -1375,29 +1376,30 @@
 End Sub
 
 Private Sub cmdBrowseLogFile_Click()
-'Dim strDefaultFile As String
-'    blnDirty = True
-'    dlgMain.DialogTitle = "Please select a file..."
-'    dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
-'    strDefaultFile = Mid$(Config.LogFile, (InStrRev(Config.LogFile, "\") + 1))
-'    dlgMain.FileName = strDefaultFile
-'    dlgMain.InitDir = Mid$(Config.LogFile, 1, (Len(Config.LogFile) - InStrRev(Config.LogFile, "\")))
-'    dlgMain.ShowSave
-'    If dlgMain.FileName <> strDefaultFile Then
-'        txtLogFile.Text = dlgMain.FileName
-'    End If
-'<EhHeader>
-On Error GoTo cmdBrowseLogFile_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdBrowseLogFile_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click")
+    '</EhHeader>
+    Dim strDefaultFile As String
+
+100     blnDirty = True
+104     dlgMain.DialogTitle = "Please select a file..."
+108     dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+112     strDefaultFile = Mid$(WinUI.Server.HTTP.Config.LogFile, (InStrRev(WinUI.Server.HTTP.Config.LogFile, "\") + 1))
+116     dlgMain.FileName = strDefaultFile
+120     dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.LogFile, 1, (Len(WinUI.Server.HTTP.Config.LogFile) - InStrRev(WinUI.Server.HTTP.Config.LogFile, "\")))
+124     dlgMain.ShowSave
+128     If dlgMain.FileName <> strDefaultFile Then
+132         txtLogFile.Text = dlgMain.FileName
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdBrowseLogFile_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdBrowseLogFile_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdCancel_Click()
@@ -1434,43 +1436,44 @@
 End Sub
 
 Private Sub cmdCGIRemove_Click()
-'***this needs replaced
-'Dim lngRetVal As Long
-'Dim i As Long
-'
-'    If lstCGI.ListIndex >= 0 Then
-'        lngRetVal = MsgBox(WinUI.GetTranslatedText("Are you sure you want to delete this item?\r\rThis can not be undone."), vbQuestion + vbYesNo)
-'        If lngRetVal = vbYes Then
-'            blnDirty = True
-'            RemoveCGI (lstCGI.ListIndex + 1)
-'            lstCGI.Clear
-'            If WinUI.Config.CGI(1, 2) <> "" Then
-'                For i = 1 To UBound(WinUI.Config.CGI)
-'                    lstCGI.AddItem WinUI.Config.CGI(i, 2)
-'                Next
-'            Else
-'                lstCGI.Enabled = False
-'                cmdBrowseCGIInterp.Enabled = False
-'                cmdCGIRemove.Enabled = False
-'                txtCGIInterp.Enabled = False
-'                txtCGIExt.Enabled = False
-'                txtCGIInterp.Text = ""
-'                txtCGIExt.Text = ""
-'            End If
-'        End If
-'    End If
-'<EhHeader>
-On Error GoTo cmdCGIRemove_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGIRemove_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdCGIRemove_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCGIRemove_Click")
+    '</EhHeader>
+    Dim lngRetVal As Long
+    Dim vItem As Variant
+    Dim i As Long
+
+100     If lstCGI.ListIndex >= 0 Then
+104         lngRetVal = MsgBox(WinUI.GetTranslatedText("Are you sure you want to delete this item?\r\rThis can not be undone."), vbQuestion + vbYesNo)
+108         If lngRetVal = vbYes Then
+112             blnDirty = True
+116             WinUI.Server.HTTP.Config.CGI.Remove (lstCGI.Text)
+120             lstCGI.Clear
+124             If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
+128                 For Each vItem In WinUI.Server.HTTP.Config.CGI
+132                     lstCGI.AddItem vItem.Extension
+136                     lstCGI.Enabled = True
+                    Next
+                Else
+140                 lstCGI.Enabled = False
+144                 cmdBrowseCGIInterp.Enabled = False
+148                 cmdCGIRemove.Enabled = False
+152                 txtCGIInterp.Enabled = False
+156                 txtCGIExt.Enabled = False
+160                 txtCGIInterp.Text = ""
+164                 txtCGIExt.Text = ""
+                End If
+            End If
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdCGIRemove_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGIRemove_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCGIRemove_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdNewCGICancel_Click()
@@ -1492,38 +1495,39 @@
 End Sub
 
 Private Sub cmdNewCGIOK_Click()
-'***this needs replaced
-'Dim i As Long
-'
-'    If txtNewCGIInterp.Text <> "" And txtNewCGIExt.Text <> "" Then
-'        blnDirty = True
-'        AddNewCGI txtNewCGIExt.Text, txtNewCGIInterp.Text
-'        If WinUI.Config.CGI(1, 2) <> "" Then
-'            lstCGI.Clear
-'            For i = 1 To UBound(WinUI.Config.CGI)
-'                lstCGI.AddItem WinUI.Config.CGI(i, 2)
-'            Next
-'        Else
-'            lstCGI.Enabled = False
-'        End If
-'        fraNewCGI.ZOrder 1
-'        txtNewCGIInterp.Text = ""
-'        txtNewCGIExt.Text = ""
-'    Else
-'        MsgBox WinUi.GetTranslatedText("Please fill all fields.")
-'    End If
-'<EhHeader>
-On Error GoTo cmdNewCGIOK_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGIOK_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdNewCGIOK_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewCGIOK_Click")
+    '</EhHeader>
+    Dim vItem As Variant
+    Dim i As Long
+
+100     If txtNewCGIInterp.Text <> "" And txtNewCGIExt.Text <> "" Then
+104         blnDirty = True
+108         WinUI.Server.HTTP.Config.CGI.Add txtNewCGIInterp.Text, txtNewCGIExt.Text, txtNewCGIExt.Text
+112         If WinUI.Server.HTTP.Config.CGI.Count > 0 Then
+116             lstCGI.Clear
+120             For Each vItem In WinUI.Server.HTTP.Config.CGI
+124                 lstCGI.AddItem vItem.Extension
+128                 lstCGI.Enabled = True
+                Next
+            Else
+132             lstCGI.Enabled = False
+            End If
+136         fraNewCGI.ZOrder 1
+140         txtNewCGIInterp.Text = ""
+144         txtNewCGIExt.Text = ""
+        Else
+148         MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdNewCGIOK_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGIOK_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewCGIOK_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdNewvHostCancel_Click()
@@ -1547,41 +1551,41 @@
 End Sub
 
 Private Sub cmdNewvHostOK_Click()
-'***this needs replaced
-'Dim i As Long
-'
-'    If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then
-'        blnDirty = True
-'        AddNewvHost txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text
-'        lstvHosts.Clear
-'        If WinUI.Config.vHost(1).Name <> "" Then
-'            For i = 1 To UBound(WinUI.Config.vHost)
-'                lstvHosts.AddItem WinUI.Config.vHost(i).Name
-'            Next
-'            lstvHosts.Enabled = True
-'        Else
-'            lstvHosts.Enabled = False
-'        End If
-'        fraNewvHost.ZOrder 1
-'        txtNewvHostName.Text = ""
-'        txtNewvHostDomain.Text = ""
-'        txtNewvHostRoot.Text = ""
-'        txtNewvHostLogs.Text = ""
-'    Else
-'        MsgBox WinUi.GetTranslatedText("Please fill all fields.")
-'    End If
-'<EhHeader>
-On Error GoTo cmdNewvHostOK_Click_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewvHostOK_Click")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo cmdNewvHostOK_Click_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdNewvHostOK_Click")
+    '</EhHeader>
+    Dim vItem As Variant
+    Dim i As Long
+
+100     If txtNewvHostName.Text <> "" And txtNewvHostDomain.Text <> "" And txtNewvHostRoot.Text <> "" And txtNewvHostLogs.Text <> "" Then
+104         blnDirty = True
+108         WinUI.Server.HTTP.Config.VirtHost.Add txtNewvHostName.Text, txtNewvHostDomain.Text, txtNewvHostRoot.Text, txtNewvHostLogs.Text, txtNewvHostName.Text
+112         lstvHosts.Clear
+116         If WinUI.Server.HTTP.Config.VirtHost.Count > 0 Then
+120             For Each vItem In WinUI.Server.HTTP.Config.VirtHost
+124                 lstvHosts.AddItem vItem.HostName
+                Next
+128             lstvHosts.Enabled = True
+            Else
+132             lstvHosts.Enabled = False
+            End If
+136         fraNewvHost.ZOrder 1
+140         txtNewvHostName.Text = ""
+144         txtNewvHostDomain.Text = ""
+148         txtNewvHostRoot.Text = ""
+152         txtNewvHostLogs.Text = ""
+        Else
+156         MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 cmdNewvHostOK_Click_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewvHostOK_Click", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdNewvHostOK_Click", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub cmdOK_Click()
@@ -1913,7 +1917,7 @@
 108     txtCGIInterp.Enabled = True
 112     txtCGIExt.Enabled = True
 116     txtCGIInterp.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Interpreter
-120     txtCGIExt.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention
+120     txtCGIExt.Text = WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension
     '<EhFooter>
     WinUI.Debuger.CallStack.Pop
     Exit Sub
@@ -2366,7 +2370,7 @@
 160     lstCGI.Enabled = False
 164     lstCGI.Clear
 168     For Each vItem In WinUI.Server.HTTP.Config.CGI
-172         lstCGI.AddItem vItem.Extention
+172         lstCGI.AddItem vItem.Extension
 176         lstCGI.Enabled = True
         Next
     
@@ -2459,8 +2463,8 @@
     WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtCGIExt_Change")
     '</EhHeader>
 100     If lstCGI.ListIndex <> -1 Then
-104         If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention <> txtCGIExt.Text Then
-108             WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extention = txtCGIExt.Text
+104         If WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension <> txtCGIExt.Text Then
+108             WinUI.Server.HTTP.Config.CGI.Item(lstCGI.Text).Extension = txtCGIExt.Text
 112             blnDirty = True
             End If
         End If
@@ -2553,30 +2557,29 @@
 End Sub
 
 Private Sub txtIndexFiles_Change()
-'***this needs replaced
-'Dim strTmpArray() As String
-'Dim lngRecCount As Long
-'Dim i As Long
-'    strTmpArray = Split(Trim$(txtIndexFiles.Text), " ")
-'    If UBound(strTmpArray) >= 1 Then
-'        ReDim WinUI.Config.Index(1 To (UBound(strTmpArray) + 1))
-'        lngRecCount = UBound(strTmpArray)
-'        For i = 0 To lngRecCount
-'            WinUI.Config.Index(i + 1) = strTmpArray(i)
-'        Next
-'    End If
-'<EhHeader>
-On Error GoTo txtIndexFiles_Change_Err
-WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtIndexFiles_Change")
-'</EhHeader>
-'<EhFooter>
-WinUI.Debuger.CallStack.Pop
-Exit Sub
+    '<EhHeader>
+    On Error GoTo txtIndexFiles_Change_Err
+    WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.txtIndexFiles_Change")
+    '</EhHeader>
+    Dim strTmpArray() As String
+    Dim lngRecCount As Long
+    Dim i As Long
+100     strTmpArray = Split(Trim$(txtIndexFiles.Text), " ")
+104     If Not IsEmpty(strTmpArray) Then
+108         WinUI.Server.HTTP.Config.Index.Clear
+112         lngRecCount = UBound(strTmpArray)
+116         For i = 0 To lngRecCount
+120             WinUI.Server.HTTP.Config.Index.Add strTmpArray(i)
+            Next
+        End If
+    '<EhFooter>
+    WinUI.Debuger.CallStack.Pop
+    Exit Sub
 
 txtIndexFiles_Change_Err:
-DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtIndexFiles_Change", Erl, False
-Resume Next
-'</EhFooter>
+    DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.txtIndexFiles_Change", Erl, False
+    Resume Next
+    '</EhFooter>
 End Sub
 
 Private Sub txtIndexFiles_KeyPress(KeyAscii As Integer)

Index: lang.xml
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lang.xml	18 Oct 2003 15:35:28 -0000	1.9
+++ lang.xml	5 Nov 2003 21:39:22 -0000	1.10
@@ -27,8 +27,6 @@
 				Lang-Maintainer
 			</lang>
 		</lang-obj>
-		<lang-obj name="frmEventView">
-		</lang-obj>
 		<lang-obj name="frmMain">
 			<lang base="Loading Log File">
 				Loading Log File
@@ -300,24 +298,9 @@
 			<lang base="Stopped">
 				Stopped
 			</lang>
-			<lang base="Start Pending">
-				Start Pending
-			</lang>
-			<lang base="Stop Pending">
-				Stop Pending
-			</lang>
 			<lang base="Running">
 				Running
 			</lang>
-			<lang base="Continue Pending">
-				Continue Pending
-			</lang>
-			<lang base="Pause Pending">
-				Pause Pending
-			</lang>
-			<lang base="Paused">
-				Paused
-			</lang>
 			<lang base="Loading Configuration Data">
 				Loading Configuration Data
 			</lang>
@@ -372,8 +355,6 @@
 				What will you use this software for?
 			</lang>
 		</lang-obj>
-		<lang-obj name="frmSplash">
-		</lang-obj>
 		<lang-obj name="frmTip">
 			<lang base="TOD XML Data File Not Found.">
 				TOD XML Data File Not Found.
@@ -408,18 +389,6 @@
 				File Size
 			</lang>
 		</lang-obj>
-		<lang-obj name="cDebug">
-		</lang-obj>
-		<lang-obj name="cEventLog">
-		</lang-obj>
-		<lang-obj name="cHookingThunk">
-		</lang-obj>
-		<lang-obj name="cHTTP">
-		</lang-obj>
-		<lang-obj name="cHTTPCGI">
-		</lang-obj>
-		<lang-obj name="cHTTPCGICol">
-		</lang-obj>
 		<lang-obj name="cHTTPConfig">
 			<lang base="Date">
 				Date
@@ -452,40 +421,10 @@
 				vHost: Name
 			</lang>
 		</lang-obj>
-		<lang-obj name="cHTTPIndex">
-		</lang-obj>
-		<lang-obj name="cHTTPIndexCol">
-		</lang-obj>
-		<lang-obj name="cHTTPStats">
-		</lang-obj>
-		<lang-obj name="cHTTPVirtHost">
-		</lang-obj>
-		<lang-obj name="cHTTPVirtHostCol">
-		</lang-obj>
-		<lang-obj name="cMemDC">
-		</lang-obj>
-		<lang-obj name="cMenuHook">
-		</lang-obj>
-		<lang-obj name="cNet">
-		</lang-obj>
 		<lang-obj name="cRegistration">
 			<lang base="Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?">
 				Would you like to register your software? It's fast and Free!\r\rProduct registration is used to provide the best possible service, products, and support for our users.\rWe will not contact you nor will we sell or give away any of your information.\r\rWould you like to register now?
 			</lang>
-		</lang-obj>
-		<lang-obj name="cServer">
-		</lang-obj>
-		<lang-obj name="cSubclassingThunk">
-		</lang-obj>
-		<lang-obj name="cSysTray">
-		</lang-obj>
-		<lang-obj name="cUpdate">
-		</lang-obj>
-		<lang-obj name="cUtil">
-		</lang-obj>
-		<lang-obj name="cWinUI">
-		</lang-obj>
-		<lang-obj name="basExceptionFilter">
 		</lang-obj>
 		<lang-obj name="basMain">
 			<lang base="SWEBS Web Server - Control Center">

Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
Binary files /tmp/cvsePCboS and /tmp/cvsQXtU1G differ