diff options
| author | Angelo Naselli <anaselli@linux.it> | 2014-07-04 00:56:17 +0200 |
|---|---|---|
| committer | Angelo Naselli <anaselli@linux.it> | 2014-07-04 00:56:17 +0200 |
| commit | bc17794bb03c0083e43d219e24a92e3e51769223 (patch) | |
| tree | d002b43e0cf4d02e98977e729bd7e09c18ba09dc /lib/AdminPanel | |
| parent | cb5c7ea44a31b39adec99e7602c10ad7fd8aa152 (diff) | |
| parent | ab285ca850f4ee2c7ea5bcb50039bdffe89a537c (diff) | |
| download | manatools-bc17794bb03c0083e43d219e24a92e3e51769223.tar manatools-bc17794bb03c0083e43d219e24a92e3e51769223.tar.gz manatools-bc17794bb03c0083e43d219e24a92e3e51769223.tar.bz2 manatools-bc17794bb03c0083e43d219e24a92e3e51769223.tar.xz manatools-bc17794bb03c0083e43d219e24a92e3e51769223.zip | |
Merge branch 'master' of ssh://git.mageia.org/software/adminpanel
Diffstat (limited to 'lib/AdminPanel')
| -rw-r--r-- | lib/AdminPanel/Module/Proxy.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/AdminPanel/Module/Proxy.pm b/lib/AdminPanel/Module/Proxy.pm index c8011065..afe77361 100644 --- a/lib/AdminPanel/Module/Proxy.pm +++ b/lib/AdminPanel/Module/Proxy.pm @@ -186,8 +186,15 @@ sub _manageProxyDialog { my $label_width = 25; my $inputfield_width = 45; # getVarsFromSh returns an empty hash if no vars are defined + # possible alternatives: + # . Config::Auto::parse my $proxy_curr_settings = { getVarsFromSh('/etc/profile.d/proxy.sh') }; - my $httpsProxyEqualToHttpProxy = 1 if(($proxy_curr_settings->{http_proxy} eq $proxy_curr_settings->{https_proxy})&&($proxy_curr_settings->{http_proxy} ne "")); + my $httpsProxyEqualToHttpProxy = 0; + if((defined($proxy_curr_settings->{http_proxy}) && defined($proxy_curr_settings->{https_proxy}))&& + (($proxy_curr_settings->{http_proxy} eq $proxy_curr_settings->{https_proxy}) && + ($proxy_curr_settings->{http_proxy} ne ""))){ + $httpsProxyEqualToHttpProxy = 1; + } # # @layout |