removed unused dir asked in ftp wizard

5 files changed, 43 insertions, 118 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index dc2b74a6..9af2c073 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -90,7 +90,7 @@ if (/-summary/) {
 	push @$data, '';
     }
 
-    if ($in->ask_from("summary", translate($summary->{info}), $data)) {
+    if ($in->ask_from(translate("summary"), translate($summary->{info}), $data)) {
 	foreach (@{$summary->{freetext}}) {
 	    if ($_->{main_order} eq 'bool') {
 		$ENV{$variable{$_->{variableName}}} = $ENV{$variable{$_->{variableName}}} ? 1 : 0;
diff --git a/drakwizard.spec b/drakwizard.spec
index b1af2a36..5fc99271 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
 - compute a correct domainame, dns and gateway in IFCFG.pm
 - replace shell function for chek_masquerade and check_relay by perl ones
 - restart postfix at the end of postfix configuration
+- fix summary not returning right combo boxes and boolean values
 
 * Thu Dec 19 2002 Arnaud Desmons <adesmons@mandrakesoft.com> 1.1-1mdk
 - fix to get png images with gtk2
diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz
index 839e36df..5c7a055c 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -29,16 +29,13 @@
 		shellVariable="wiz_ftp_external"
 	>
 	</Variable>
+	
 	<Variable
 		name="wiz_ftp_home"
 		shellVariable="wiz_ftp_external"
 	>
 	</Variable>
-	<Variable
-		name="wiz_dir"
-		shellVariable="wiz_dir"
-	>
-	</Variable>
+
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-ftp.html"
 		name="welcome"
@@ -165,67 +162,6 @@
 	</Page>
 
 	<Page
-		name="ask_dir"
-		func="check_dir"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Target
-			targetName="error_in_dir"
-			jumpIndex="1"
-		>
-		</Target>
-
-		<Target
-			targetName="confirmation"
-			jumpIndex="10"
-		>
-		</Target>
-
-		<Info
-			helpText="Shared directory:"
-		>
-		</Info>
-
-		<Info
-			helpText="Type the path of the directory you want being shared."
-		>
-		</Info>
-
-		<Freetext
-			name="freetext_dir"
-			variableName="wiz_dir"
-			fillfunc="get_dir"
-			helpText="Shared directory:"
-		        editable="true"
-		>
-		</Freetext>
-
-	</Page>
-
-
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="error_in_dir"
-		jumpPage="ask_dir"
-		nextButtonText="Fix it"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Info
-			helpText="The path you entered does not exist."
-		>
-		</Info>
-	</Page>
-
-
-	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-ftp.html"
 		name="confirmation"
 		func="do_it"
@@ -263,13 +199,6 @@ needed to configure your FTP Server"
 		>
 		</Freetext>
 
-		<Freetext
-			variableName="wiz_dir"
-			helpText="Public directory:"
-			editable="false"
-		>
-		</Freetext>
-
 		<Info
 			helpText="To accept these values, and configure your server, click the Next button or use the Back button to correct them."
 		>
diff --git a/ftp_wizard/scripts/ProFtpconf.pm b/ftp_wizard/scripts/ProFtpconf.pm
index fece3460..854245cc 100644
--- a/ftp_wizard/scripts/ProFtpconf.pm
+++ b/ftp_wizard/scripts/ProFtpconf.pm
@@ -34,7 +34,7 @@ sub	true {
 }
 
 sub	check_dir {
-    -d ($ENV{wiz_dir}) and return 10;
+    -d $ENV{wiz_dir} and return 10;
     1;
 }
 
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 4fabfb89..72539747 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-02 16:49+0100\n"
+"POT-Creation-Date: 2003-03-02 17:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
 #: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:5
 #: ../samba_wizard/samba.wiz_.c:7 ../server_wizard/server.wiz_.c:5
 #: ../web_wizard/apache2.wiz_.c:11 ../web_wizard/web.wiz_.c:11
 msgid "OK"
@@ -119,7 +119,7 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
 #: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../ftp_wizard/ftp.wiz_.c:3 ../news_wizard/news.wiz_.c:6
 #: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
 #: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:33
 #: ../web_wizard/apache2.wiz_.c:8 ../web_wizard/web.wiz_.c:8
@@ -146,7 +146,7 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
 #: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:15
-#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:15
 #: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
 #: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
 #: ../samba_wizard/samba.wiz_.c:45 ../server_wizard/server.wiz_.c:44
@@ -156,7 +156,7 @@ msgid "Quit"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:16
-#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/apache2.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:17 ../web_wizard/apache2.wiz_.c:22
 #: ../web_wizard/web.wiz_.c:22
 msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
 #: ../dhcp_wizard/dhcp.wiz_.c:18 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:19
 #: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
 #: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
 #: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
@@ -237,7 +237,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:16
 #: ../web_wizard/apache2.wiz_.c:21 ../web_wizard/web.wiz_.c:21
 msgid "Sorry, you must be root to do this..."
 msgstr ""
@@ -298,10 +298,9 @@ msgid ""
 "service:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
-#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1 ../web_wizard/apache2.wiz_.c:1
-#: ../web_wizard/web.wiz_.c:1
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../news_wizard/news.wiz_.c:2
+#: ../samba_wizard/samba.wiz_.c:1 ../server_wizard/server.wiz_.c:1
+#: ../web_wizard/apache2.wiz_.c:1 ../web_wizard/web.wiz_.c:1
 msgid "Fix it"
 msgstr ""
 
@@ -319,7 +318,7 @@ msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:6
 #: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
 #: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:6
 #: ../server_wizard/server.wiz_.c:6 ../web_wizard/apache2.wiz_.c:10
@@ -568,78 +567,61 @@ msgstr ""
 msgid "Protection Level:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:1
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:3
-msgid "Public directory:"
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:4
+#: ../ftp_wizard/ftp.wiz_.c:2
 msgid "Internet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:6
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:5
 msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:10
+#: ../ftp_wizard/ftp.wiz_.c:8
 msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:11
+#: ../ftp_wizard/ftp.wiz_.c:9
 msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:12
+#: ../ftp_wizard/ftp.wiz_.c:10
 msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:13
+#: ../ftp_wizard/ftp.wiz_.c:11
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:14
+#: ../ftp_wizard/ftp.wiz_.c:12
 msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:13
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:16
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:17
-msgid "Shared directory:"
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:21
+#: ../ftp_wizard/ftp.wiz_.c:18
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:18
-#: ../web_wizard/apache2.wiz_.c:23 ../web_wizard/web.wiz_.c:23
-msgid "The path you entered does not exist."
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:24
+#: ../ftp_wizard/ftp.wiz_.c:20
 msgid "FTP Server Configuration Wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
-msgid "Type the path of the directory you want being shared."
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:26
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "Your server can act as an FTP Server toward your internal network (intranet) "
 "and as an FTP Server for the Internet."
@@ -1132,6 +1114,15 @@ msgstr ""
 msgid "Workgroup:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Shared directory:"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:18 ../web_wizard/apache2.wiz_.c:23
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr ""
+
 #: ../samba_wizard/samba.wiz_.c:19
 msgid ""
 "* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
@@ -1279,6 +1270,10 @@ msgstr ""
 msgid "File permissions"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
+
 #: ../server_wizard/server.wiz_.c:2
 msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""