summaryrefslogtreecommitdiffstats
path: root/ftp_wizard
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-03-02 16:09:52 +0000
committerFlorent Villard <warly@mandriva.com>2003-03-02 16:09:52 +0000
commitfa4374712f745c27fce46f99c575fba6f03fc251 (patch)
treed922cce3866a88910c8fd91fb5518ba14e9bd5ed /ftp_wizard
parent92bc886b773cfe8148af69399e2cced600c4422d (diff)
downloaddrakwizard-fa4374712f745c27fce46f99c575fba6f03fc251.tar
drakwizard-fa4374712f745c27fce46f99c575fba6f03fc251.tar.gz
drakwizard-fa4374712f745c27fce46f99c575fba6f03fc251.tar.bz2
drakwizard-fa4374712f745c27fce46f99c575fba6f03fc251.tar.xz
drakwizard-fa4374712f745c27fce46f99c575fba6f03fc251.zip
removed unused dir asked in ftp wizard
Diffstat (limited to 'ftp_wizard')
-rw-r--r--ftp_wizard/ftp.wiz75
-rw-r--r--ftp_wizard/scripts/ProFtpconf.pm2
2 files changed, 3 insertions, 74 deletions
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;
}