fixed: func return value was not tested

2 files changed, 16 insertions, 15 deletions

diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz
index b17a76c2..7cc436c6 100644
--- a/postfix_wizard/postfix.wiz
+++ b/postfix_wizard/postfix.wiz
@@ -180,7 +180,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="Form_of_address"
-		jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_masquerade.sh"
+		jumpScript="__WIZ_HOME__/postfix_wizard/check_masquerade.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -327,7 +327,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="ISP"
-		jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_relay.sh"
+		jumpScript="__WIZ_HOME__/postfix_wizard/check_relay.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -526,6 +526,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="Confirmation"
+		func="do_it"
 		nextButtonText="Do It"
 		executionLevel="NORMAL"
 		nextFinish="false"
@@ -601,7 +602,7 @@
 		<Freetext
 			name="freetext1"
 			alignement="Fill"
-			fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
+			fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
 			helpText="Internet Mail Gateway"
 			guiType="textfield"
 			editable="false"
@@ -617,7 +618,7 @@
 		<Freetext
 			name="freetext2"
 			alignement="Fill"
-			fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
+			fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
 			helpText="Form of the Address"
 			guiType="textfield"
 			editable="false"
@@ -806,7 +807,6 @@
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="Congratulations"
 		nextButtonText="Quit"
-		func="do_it"
 		executionLevel="NORMAL"
 		nextFinish="true"
 		canBack="false"
diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz
index 39b9a060..d497aa4f 100644
--- a/server_wizard/server.wiz
+++ b/server_wizard/server.wiz
@@ -14,6 +14,7 @@
 	dbFilename="/var/log/wizards/server.wdb"
 	referenceLength="425"
 	referenceHeight="13"
+	perlModule="__WIZ_HOME__/server_wizard/scripts/Serverconf.pm"
 >
 
 	<Variable
@@ -260,7 +261,7 @@
 	<Page
 		name="Note"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_config.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/check_config.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -397,7 +398,7 @@
 	<Page
 		name="ask_hostname"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_domain.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/check_domain.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -580,7 +581,7 @@
 	<Page
 		name="choose_net_device"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/set_ip.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/set_ip.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -655,7 +656,7 @@
 			name="deviceChooser"
 			variableName="net_device"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh"
+			fillScript="__WIZ_HOME__/server_wizard/liste_device.sh"
 			helpText="Device:"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -744,7 +745,7 @@
 			name="domainnameField"
 			variableName="domainname"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_domain.sh"
+			fillScript="__WIZ_HOME__/server_wizard/compute_domain.sh"
 			helpText="Computed domain Name"
 			guiType="textfield"
 			inputType="any"
@@ -789,7 +790,7 @@
 	<Page
 		name="ask_network_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_network.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/check_network.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -887,7 +888,7 @@
 			name="freetext2"
 			variableName="network_address"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh"
+			fillScript="__WIZ_HOME__/server_wizard/compute_ipnet.sh"
 			helpText="IP net address:"
 			guiType="textfield"
 			inputType="ip"
@@ -981,7 +982,7 @@
 			name="freetext3"
 			variableName="server_address"
 			alignement="Fill"
-			fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh"
+			fillScript="__WIZ_HOME__/server_wizard/compute_server_ip.sh"
 			guiType="textfield"
 			inputType="any"
 			editable="false"
@@ -1052,7 +1053,7 @@
 	<Page
 		name="ask_server_address"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/check_server_ip.sh"
+		jumpScript="__WIZ_HOME__/server_wizard/check_server_ip.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -1353,7 +1354,7 @@
 	<Page
 		name="doit"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
-		jumpScript="__WIZ_HOME__/server_wizard/scripts/do_it_net.sh"
+		func="do_it"
 		nextButtonText="Configure"
 		executionLevel="NORMAL"
 		nextFinish="false"