From fa4374712f745c27fce46f99c575fba6f03fc251 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Sun, 2 Mar 2003 16:09:52 +0000
Subject: removed unused dir asked in ftp wizard

---
 ftp_wizard/ftp.wiz               | 75 ++--------------------------------------
 ftp_wizard/scripts/ProFtpconf.pm |  2 +-
 2 files changed, 3 insertions(+), 74 deletions(-)

(limited to 'ftp_wizard')

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"
@@ -164,67 +161,6 @@
 		</Info>
 	</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"
@@ -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;
 }
 
-- 
cgit v1.2.1