|
From: <cod...@go...> - 2008-12-17 19:46:38
|
Author: M0...@gm...
Date: Wed Dec 17 11:44:57 2008
New Revision: 422
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlNetConf.module
Log:
Attempt to fix network bug
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/.project
+# /home/moe/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsGlobal.class
+# /home/moe/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsPartSel.class
+# /home/moe/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsWinDrives.class
+# /home/moe/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FMain.class
+# /home/moe/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmDiskPart.class
+# /home/moe/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPartScheme.class
+# /home/moe/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPartSel.class
+# /home/moe/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPkgSel.class
+# /home/moe/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmSelISO.class
+# /home/moe/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmSummary.class
+# /home/moe/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmWinDrives.class
+# /home/moe/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlCore.module
+# /home/moe/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlDiskPart.module
+# /home/moe/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlObjSizer.module
+# /home/moe/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlPartSel.module
+# /home/moe/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlPkgSel.module
+# /home/moe/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlSetup.module
+# /home/moe/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlSummarize.module
+# /home/moe/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Dec 17 11:44:57 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlWinDrives.module
+# /home/moe/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Wed Dec 17 11:44:57 2008
@@ -77,7 +77,7 @@
' SHELL "cat /tmp/nic| tr -s \' \'\"\" " TO seths
SHELL "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" |
tr -s \' \'\"\" " TO seths
'SHELL "ifconfig -a | grep ^[a-z]|grep -v ^lo | tr -s \' \'\"\"" TO
seths
- File.Save(Temp("eths"), Trim(seths))
+ 'File.Save(Temp("eths"), Trim(seths))
'Message(File.Load(Temp("eths")))
seths = Trim(seths)
@@ -139,8 +139,174 @@
sStatus = ("Unplugged")
END IF
- IF sType <> ("Wireless") THEN
-
+ ' ' ' IF sType <> ("Wireless") THEN
+ ' ' '
+ ' ' ' WITH FrmNetConf.TSNetDevices
+ ' ' ' PRINT .Count
+ ' ' '
+ ' ' '
+ ' ' ' .index = i
+ ' ' ' '.text = Left(sDevList[i], 4)
+ ' ' ' .text = sDev
+ ' ' ' IF sDevList[i] <> "" THEN
+ ' ' ' INC .Count
+ ' ' ' END IF
+ ' ' ' .picture = pTabPic
+ ' ' ' ' populate it with the objects
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "DevAddresses"
+ ' ' ' WITH tl
+ ' ' ' .Move(4, 16)
+ ' ' ' .text = ("Hardware Address")
+ ' ' ' .Height = 21
+ ' ' ' .Alignment = Align.Normal
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text)
+ ' ' ' 'y = .top + .Height + 4
+ ' ' ' END WITH
+ ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices)
AS "txtDevAddresses" ' MAC Address box
+ ' ' ' WITH tb
+ ' ' ' .Move(tl.left + tl.Width + 8, tl.top)
+ ' ' ' .text = DConv(sDevAddr)
+ ' ' ' .ReadOnly = TRUE
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24
+ ' ' ' .Height = tl.Height
+ ' ' ' x = .Left
+ ' ' ' cbwidth = .Width
+ ' ' ' iwifiboxwidth = .Width
+ ' ' ' END WITH
+ ' ' '
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "DevTYpeLbl"
+ ' ' ' WITH tl
+ ' ' ' .Move(x + tb.Width + 8, tb.top)
+ ' ' ' .text = ("Interface Type")
+ ' ' ' .Height = 21
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text)
+ ' ' ' .Alignment = Align.Normal
+ ' ' ' END WITH
+ ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices)
AS "txtDevType" ' Interface Type (wireless, wired)
+ ' ' ' WITH tb
+ ' ' ' .Move(tl.left + tl.width + 8, tl.top)
+ ' ' ' .text = sType
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text) +
24
+ ' ' ' .Height = 21
+ ' ' ' .ReadOnly = TRUE
+ ' ' ' .tag = sDev
+ ' ' ' END WITH
+ ' ' ' objIntTypes.Add(tb)
+ ' ' ' 'add a box here to enable/disable the
interface
+ ' ' ' bCb = NEW CheckBox(FrmNetConf.TSNetDevices)
AS "bEnableInterface" ' enable/disable interface box
+ ' ' ' WITH bCb
+ ' ' ' .Move(4, tb.top + tb.Height + 4)
+ ' ' ' .text = ("Automatically activate this
interface at start-up")
+ ' ' ' .Value = TRUE
+ ' ' ' .Height = 21
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text) +
36
+ ' ' ' .tag = sDev
+ ' ' ' y = .top + .Height + 8
+ ' ' ' objCheckboxes.Add(bCb)
+ ' ' ' END WITH
+ ' ' ' ' Split the design here for wireless and wired
devices
+ ' ' ' 'IF sType = "Wireless" THEN
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "ConfModeLbl"
+ ' ' ' WITH tl
+ ' ' ' .Move(4, y)
+ ' ' ' .text = ("Setup Mode")
+ ' ' ' .height = 21
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text)
+ ' ' ' .Alignment = Align.BottomLeft
+ ' ' ' 'y = .top + .Height + 4
+ ' ' ' iLeft = .Left
+ ' ' ' END WITH
+ ' ' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices)
AS "MethodSel" ' Setup Method combobox
+ ' ' ' WITH cb
+ ' ' ' .Move(x, y)
+ ' ' ' .width = cbwidth
+ ' ' ' .Height = 21
+ ' ' ' .ReadOnly = TRUE
+ ' ' ' .list = ["DHCP", "STATIC"]
+ ' ' '
+ ' ' ' .tag = sDev
+ ' ' ' '.ReadOnly = TRUE
+ ' ' ' 'itop = y
+ ' ' ' icbleft = .Left
+ ' ' ' END WITH
+ ' ' ' y = cb.top + cb.Height + 4
+ ' ' ' itop = y
+ ' ' ' objCombos.Add(cb)
+ ' ' ' IF StYPE = ("Wireless") THEN
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ ' ' ' WITH tl
+ ' ' ' .text = ("Encryption type")
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text)
+ ' ' ' .Height = 21
+ ' ' ' '.Move(x + cb.Width + 96, y - .Height - 8)
+ ' ' ' .Move(ileft + 300 + 24, itop + 12)
+ ' ' ' .Alignment = Align.BottomLeft
+ ' ' ' '.Border = Border.Plain
+ ' ' ' END WITH
+ ' ' ' iWifix = tl.Left
+ ' ' ' iwifiy = tl.Top
+ ' ' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices)
AS "cbWifiEnc"
+ ' ' ' WITH cb
+ ' ' ' .ReadOnly = TRUE
+ ' ' ' .list = [("None"), "WPA", "WEP"]
+ ' ' ' .Width = tb.Width
+ ' ' ' .tag = sDev
+ ' ' ' .Height = tl.Height
+ ' ' ' .Move(tl.left + tl.Width + 12, tl.top)
+ ' ' '
+ ' ' ' iwifiboxleft = .Left
+ ' ' '
+ ' ' ' END WITH
+ ' ' ' objcbWifi.Add(cb)
+ ' ' '
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ ' ' ' WITH tl
+ ' ' ' .text = ("Encryption key")
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text)
+ ' ' ' .Height = 21
+ ' ' ' .Move(iwifix, iwifiy + .Height + 12)
+ ' ' ' .Alignment = Align.Normal
+ ' ' ' END WITH
+ ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices)
+ ' ' ' WITH tb
+ ' ' ' .text = ""
+ ' ' ' .Width = iwifiboxwidth
+ ' ' ' .Height = 21
+ ' ' ' .Password = TRUE
+ ' ' ' .Move(iwifiboxleft, tl.Top)
+ ' ' ' .Enabled = TRUE
+ ' ' ' .tag = sDev
+ ' ' ' END WITH
+ ' ' ' objtxtWifiKey.Add(tb)
+ ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ ' ' ' WITH tl
+ ' ' ' .text = ("Access Point")
+ ' ' ' .Width = MdlObjSizer.get_object_width(.Text)
+ ' ' ' .Height = 21
+ ' ' ' .Alignment = Align.Normal
+ ' ' ' .Move(iWifix, tb.top + tb.Height + 4)
+ ' ' ' '.Enabled = TRUE
+ ' ' ' '.ReadOnly = FALSE
+ ' ' ' END WITH
+ ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices)
+ ' ' ' WITH tb
+ ' ' ' .tag = sDev
+ ' ' ' '.ReadOnly = TRUE
+ ' ' ' .Width = iwifiboxwidth
+ ' ' ' .Height = 21
+ ' ' ' .Move(iwifiboxleft, tl.Top)
+ ' ' ' .ReadOnly = FALSE
+ ' ' '
+ ' ' ' ' add the access points here
+ ' ' ' END WITH
+ ' ' ' objcbWifiessid.Add(tb)
+ ' ' '
+ ' ' '
+ ' ' ' END IF
+ ' ' '
+ ' ' '
+ IF sType = ("Wired") THEN
+
WITH FrmNetConf.TSNetDevices
PRINT .Count
@@ -204,108 +370,9 @@
y = .top + .Height + 8
objCheckboxes.Add(bCb)
END WITH
- ' Split the design here for wireless and wired devices
- 'IF sType = "Wireless" THEN
- tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "ConfModeLbl"
- WITH tl
- .Move(4, y)
- .text = ("Setup Mode")
- .height = 21
- .Width = MdlObjSizer.get_object_width(.text)
- .Alignment = Align.BottomLeft
- 'y = .top + .Height + 4
- iLeft = .Left
- END WITH
- cb = NEW ComboBox(FrmNetConf.TSNetDevices)
AS "MethodSel" ' Setup Method combobox
- WITH cb
- .Move(x, y)
- .width = cbwidth
- .Height = 21
- .ReadOnly = TRUE
- .list = ["DHCP", "STATIC"]
-
- .tag = sDev
- '.ReadOnly = TRUE
- 'itop = y
- icbleft = .Left
- END WITH
- y = cb.top + cb.Height + 4
- itop = y
- objCombos.Add(cb)
- IF StYPE = ("Wireless") THEN
- tl = NEW TextLabel(FrmNetConf.TSNetDevices)
- WITH tl
- .text = ("Encryption type")
- .Width = MdlObjSizer.get_object_width(.text)
- .Height = 21
- '.Move(x + cb.Width + 96, y - .Height - 8)
- .Move(ileft + 300 + 24, itop + 12)
- .Alignment = Align.BottomLeft
- '.Border = Border.Plain
- END WITH
- iWifix = tl.Left
- iwifiy = tl.Top
- cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "cbWifiEnc"
- WITH cb
- .ReadOnly = TRUE
- .list = [("None"), "WPA", "WEP"]
- .Width = tb.Width
- .tag = sDev
- .Height = tl.Height
- .Move(tl.left + tl.Width + 12, tl.top)
-
- iwifiboxleft = .Left
-
- END WITH
- objcbWifi.Add(cb)
-
- tl = NEW TextLabel(FrmNetConf.TSNetDevices)
- WITH tl
- .text = ("Encryption key")
- .Width = MdlObjSizer.get_object_width(.text)
- .Height = 21
- .Move(iwifix, iwifiy + .Height + 12)
- .Alignment = Align.Normal
- END WITH
- tb = NEW TextBox(FrmNetConf.TSNetDevices)
- WITH tb
- .text = ""
- .Width = iwifiboxwidth
- .Height = 21
- .Password = TRUE
- .Move(iwifiboxleft, tl.Top)
- .Enabled = TRUE
- .tag = sDev
- END WITH
- objtxtWifiKey.Add(tb)
- tl = NEW TextLabel(FrmNetConf.TSNetDevices)
- WITH tl
- .text = ("Access Point")
- .Width = MdlObjSizer.get_object_width(.Text)
- .Height = 21
- .Alignment = Align.Normal
- .Move(iWifix, tb.top + tb.Height + 4)
- '.Enabled = TRUE
- '.ReadOnly = FALSE
- END WITH
- tb = NEW TextBox(FrmNetConf.TSNetDevices)
- WITH tb
- .tag = sDev
- '.ReadOnly = TRUE
- .Width = iwifiboxwidth
- .Height = 21
- .Move(iwifiboxleft, tl.Top)
- .ReadOnly = FALSE
-
- ' add the access points here
- END WITH
- objcbWifiessid.Add(tb)
- END IF
-
- IF sType = ("Wired") THEN
tl = NEW TextLabel(FrmNetConf.TSNetDevices)
WITH tl
.text = ("STATUS:") & " <b>" & sStatus & "</b>"
@@ -334,7 +401,7 @@
END WITH
'END IF
- END IF
+' END IF
|