added usage of fillfunc

1 files changed, 12 insertions, 11 deletions

diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz
index c0930fa1..4c70514d 100644
--- a/postfix_wizard/postfix.wiz
+++ b/postfix_wizard/postfix.wiz
@@ -3,11 +3,11 @@
 
 <Wizard
 	name="general"
-	libScript="__WIZ_HOME__/common/scripts/functions.sh"
+	libScript="/usr/share/wizards/common/scripts/functions.sh"
 	wizardTitle="Postfix wizard"
 	imagePosition="top"
-	defaultImage="__WIZ_HOME__/postfix_wizard/images/courrier"
-	perlModule="__WIZ_HOME__/postfix_wizard/scripts/Postfixconf.pm"
+	defaultImage="/usr/share/wizards/postfix_wizard/images/courrier"
+	perlModule="/usr/share/wizards/postfix_wizard/scripts/Postfixconf.pm"
 	rpm="postfix"
 >
 
@@ -26,7 +26,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="welcome"
-		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -97,7 +97,7 @@
 		<Freetext
 			name="freetext"
 			variableName="wiz_mail_masquerade"
-			fillScript="get_var wiz_mail_masquerade"
+			fillfunc="get_mail_masquerade"
 			editable="true"
 		>
 		</Freetext>
@@ -106,7 +106,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="/usr/share/wizards/postfix_wizard/scripts/check_masquerade.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -140,7 +140,7 @@
 		<Freetext
 			name="wiz_mail_masquerade"
 			variableName="wiz_mail_masquerade"
-			fillScript="get_var wiz_domain_name $wiz_mail_masquerade"
+			fillfunc="get_mail_masquerade"
 			helpText="Mail Address:"
 			editable="true"
 		>
@@ -172,7 +172,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="/usr/share/wizards/postfix_wizard/scripts/check_relay.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -208,6 +208,7 @@
 			variableName="wiz_ext_mail_relay"
 			helpText="Mail Server Name:"
 			editable="true"
+			fillfunc="get_mail_relay"
 		>
 		</Freetext>
 
@@ -282,7 +283,7 @@ needed to configure your Internet Mail Service:"
 
 		<Freetext
 			name="freetext1"
-			fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
+			variableName="wiz_ext_mail_relay"
 			helpText="Internet Mail Gateway"
 			editable="false"
 		>
@@ -290,7 +291,7 @@ needed to configure your Internet Mail Service:"
 
 		<Freetext
 			name="freetext2"
-			fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
+			variableName="wiz_mail_masquerade"
 			helpText="Form of the Address"
 			editable="false"
 		>
@@ -327,7 +328,7 @@ needed to configure your Internet Mail Service:"
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
 		name="error_need_net"
-		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+		subWizard="/usr/share/wizards/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"