diff options
| -rw-r--r-- | perl-install/proxy.pm | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/perl-install/proxy.pm b/perl-install/proxy.pm index 3d04a9513..5f4252ae7 100644 --- a/perl-install/proxy.pm +++ b/perl-install/proxy.pm @@ -11,13 +11,6 @@ my $config_file = "/usr/lib/wgetrc"; sub main { my ($prefix, $in, $install) = @_; - begin: - $::isWizard = 1; - $::Wizard_no_previous = 1; - $in->ask_okcancel(_("Proxy configuration"), - _("Welcome to the proxy configuration utility.\n\nHere, you'll be able to set up your http and ftp proxies\nwith or without login and password\n" - ), 1) or quit_global($in, 0); - my $proxy_cfg = {}; # grab current config @@ -36,34 +29,70 @@ sub main { } /http_user = (.*)/ and $proxy_cfg->{login} = $1; /http_passwd = (.*)/ and $proxy_cfg->{passwd} = $1; + /http_passwd = (.*)/ and $proxy_cfg->{passwd2} = $1; } + begin: + $::isWizard = 1; + $::Wizard_no_previous = 1; + $in->ask_okcancel(_("Proxy configuration"), + _("Welcome to the proxy configuration utility.\n\nHere, you'll be able to set up your http and ftp proxies\nwith or without login and password\n" + ), 1) or quit_global($in, 0); + # http proxy + step_http_proxy: + undef $::Wizard_no_previous; $in->ask_from_entries_refH(_("Proxy configuration"), _("Please fill in the http proxy informations"), [ { label => _("URL"), val => \$proxy_cfg->{http_url} }, { label => _("port"), val => \$proxy_cfg->{http_port} } ] - ); - undef $::Wizard_no_previous; + ) or goto begin; + if ($proxy_cfg->{http_url} && $proxy_cfg->{http_url} !~ /^http:/) + { + $in->ask_warn('', _("Url should begin with 'http:'")); + goto step_http_proxy; + } + if ($proxy_cfg->{http_port} && $proxy_cfg->{http_port} !~ /^\d+$/) + { + $in->ask_warn('', _("The port part should be numeric")); + goto step_http_proxy; + } # ftp proxy + step_ftp_proxy: $in->ask_from_entries_refH(_("Proxy configuration"), _("Please fill in the ftp proxy informations"), [ { label => _("URL"), val => \$proxy_cfg->{ftp_url} }, { label => _("port"), val => \$proxy_cfg->{ftp_port} } ] - ); + ) or goto step_http_proxy; + if ($proxy_cfg->{ftp_url} && $proxy_cfg->{ftp_url} !~ /^ftp:/) + { + $in->ask_warn('', _("Url should begin with 'ftp:'")); + goto step_ftp_proxy; + } + if ($proxy_cfg->{ftp_port} && $proxy_cfg->{ftp_port} !~ /^\d+$/) + { + $in->ask_warn('', _("The port part should be numeric")); + goto step_ftp_proxy; + } # proxy login/passwd + step_login: $in->ask_from_entries_refH(_("Proxy configuration"), _("Please enter proxy login and password, if any.\nLeave it blank if you don't want login/passwd"), [ { label => _("login"), val => \$proxy_cfg->{login} }, - { label => _("password"), val => \$proxy_cfg->{passwd} } + { label => _("password"), val => \$proxy_cfg->{passwd}, hidden => 1 }, + { label => _("re-type password"), val => \$proxy_cfg->{passwd2}, hidden => 1 } ] - ); - + ) or goto step_ftp_proxy; + if ($proxy_cfg->{passwd} ne $proxy_cfg->{passwd2}) + { + $in->ask_warn('', _("The passwords don't match. Try again!")); + goto step_login; + } # save config substInFile { s/^http_proxy.*\n//; $_ .= "http_proxy = $proxy_cfg->{http_url}:$proxy_cfg->{http_port}\n" if eof } $config_file; substInFile { s/^ftp_proxy.*\n//; $_ .= "ftp_proxy = $proxy_cfg->{ftp_url}:$proxy_cfg->{ftp_port}\n" if eof } $config_file; |