fixed : func return value was not tested

5 files changed, 13 insertions, 14 deletions

diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz
index 6ac5e0f8..ae58fd39 100644
--- a/dhcp_wizard/dhcp.wiz
+++ b/dhcp_wizard/dhcp.wiz
@@ -137,7 +137,7 @@
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="ask_dhcp_ip_range"
 		comment="Ask the dhcp ip range"
-		jumpScript="__WIZ_HOME__/dhcp_wizard/scripts/check_range.sh"
+		jumpScript="__WIZ_HOME__/dhcp_wizard/check_range.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -224,7 +224,7 @@
 			name="dhcpIpLow"
 			variableName="dhcp_range_low"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/dhcp_wizard/scripts/compute_range1.sh"
+			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range1.sh"
 			helpText="Lowest IP Address:"
 			guiType="textfield"
 			editable="true"
@@ -241,7 +241,7 @@
 			name="dhcpIpHigh"
 			variableName="dhcp_range_high"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/dhcp_wizard/scripts/compute_range2.sh"
+			fillScript="__WIZ_HOME__/dhcp_wizard/compute_range2.sh"
 			helpText="Highest IP address:"
 			guiType="textfield"
 			editable="true"
@@ -302,7 +302,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
 		name="doit"
-		func="do_it"
+		jumpScript="__WIZ_HOME__/dhcp_wizard/do_it_dhcp.sh"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
 		nextFinish="false"
diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz
index a6dc994d..5cfa18eb 100644
--- a/firewall_wizard/firewall.wiz
+++ b/firewall_wizard/firewall.wiz
@@ -267,7 +267,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
 		name="choose_net_device"
-		jumpScript="__WIZ_HOME__/firewall_wizard/scripts/check_ext_device.sh"
+		jumpScript="__WIZ_HOME__/firewall_wizard/check_ext_device.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -343,8 +343,8 @@
 			name="deviceChooser"
 			variableName="firewallDevice"
 			alignement="Fill"
-			defaultOptionScript="__WIZ_HOME__/firewall_wizard/scripts/compute_ext_device.sh"
-			fillScript="__WIZ_HOME__/firewall_wizard/scripts/liste_ext_device.sh"
+			defaultOptionScript="__WIZ_HOME__/firewall_wizard/compute_ext_device.sh"
+			fillScript="__WIZ_HOME__/firewall_wizard/liste_ext_device.sh"
 			helpText="Device"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -462,7 +462,7 @@
 		<Freetext
 			name="freetext"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/firewall_wizard/scripts/compute_level_name.sh"
+			fillScript="__WIZ_HOME__/firewall_wizard/compute_level_name.sh"
 			helpText="Protecion Level:"
 			guiType="textfield"
 			editable="false"
diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz
index f5070703..025dc3e2 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -369,6 +369,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-ftp.html"
 		name="confirmation"
+		func="do_it"
 		jumpPage="congratulations"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
@@ -501,7 +502,6 @@
 		nextButtonText="Quit"
 		executionLevel="NORMAL"
 		nextFinish="true"
-		func="do_it"
 		canBack="false"
 		canCancel="false"
 	>
diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz
index 848a9917..67cf4cd7 100644
--- a/news_wizard/news.wiz
+++ b/news_wizard/news.wiz
@@ -116,7 +116,7 @@
 	<Page
 		name="ask_news_server"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		jumpScript="__WIZ_HOME__/news_wizard/scripts/check_news_server.sh"
+		jumpScript="__WIZ_HOME__/news_wizard/check_news_server.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -277,7 +277,7 @@
 	<Page
 		name="ask_news_freq"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
-		jumpScript="__WIZ_HOME__/news_wizard/scripts/check_valid_hours.sh"
+		jumpScript="__WIZ_HOME__/news_wizard/check_valid_hours.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -430,6 +430,7 @@
 	<Page
 		name="doit"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
+		func="do_it"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
 		nextFinish="false"
@@ -573,7 +574,6 @@
 		name="done"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
 		nextButtonText="Quit"
-		func="do_it"
 		executionLevel="NORMAL"
 		nextFinish="true"
 		canBack="false"
diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz
index 2b24ae4d..ad155a82 100644
--- a/web_wizard/web.wiz
+++ b/web_wizard/web.wiz
@@ -13,7 +13,6 @@
 	dbPositions="0"
 	referenceLength="425"
 	referenceHeight="13"
-	perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
 >
 
 	<Variable
@@ -369,11 +368,11 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
 		name="confirmation"
+		jumpScript="__WIZ_HOME__/web_wizard/do_it_web.sh"
 		jumpPage="congratulations"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
 		nextFinish="false"
-		func="finish"
 		canBack="true"
 		canCancel="true"
 	>