diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-11 19:11:59 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-11 19:11:59 +0000 |
commit | bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea (patch) | |
tree | 42b0132d629d68fffde6b0e828126c18c0c3d1ed /perl-install/network | |
parent | 195f44c2da47b9f0df0461b593935d89619a5a0e (diff) | |
download | drakx-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar drakx-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.gz drakx-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.bz2 drakx-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.tar.xz drakx-bfd84f6e2df1b083c8d95f6f8a84ede73d36dfea.zip |
add or remove spaces where need to please perl_checker
Diffstat (limited to 'perl-install/network')
-rw-r--r-- | perl-install/network/adsl.pm | 2 | ||||
-rw-r--r-- | perl-install/network/drakfirewall.pm | 2 | ||||
-rw-r--r-- | perl-install/network/ethernet.pm | 6 | ||||
-rw-r--r-- | perl-install/network/isdn.pm | 4 | ||||
-rw-r--r-- | perl-install/network/isdn_consts.pm | 4 | ||||
-rw-r--r-- | perl-install/network/modem.pm | 2 | ||||
-rw-r--r-- | perl-install/network/netconnect.pm | 20 | ||||
-rw-r--r-- | perl-install/network/network.pm | 2 | ||||
-rw-r--r-- | perl-install/network/shorewall.pm | 8 | ||||
-rw-r--r-- | perl-install/network/tools.pm | 10 |
10 files changed, 30 insertions, 30 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index c90913c62..8f1763151 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -93,7 +93,7 @@ sub adsl_conf { adsl_conf_step_1: adsl_ask_info ($adsl, $netc, $intf) or return; adsl_conf_step_2: - $adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static' , '10.0.0.10') or goto adsl_conf_step_1; + $adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1; adsl_conf_backend($adsl, $netc, $adsl_type); 1; } diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm index 7e1e225aa..1611626e5 100644 --- a/perl-install/network/drakfirewall.pm +++ b/perl-install/network/drakfirewall.pm @@ -162,7 +162,7 @@ where port is between 1 and 65535.", $invalid_port)); return 1; } }, - }}, + } }, [ { text => N("Everything (no firewall)"), val => \$disabled, type => 'bool' }, (map { { text => $_->{name}, val => \$_->{on}, type => 'bool', disabled => sub { $disabled } } } @l), diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index ae5c8755b..3754cfd4a 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -27,11 +27,11 @@ sub configure_cable { if ($::expert) { my @m = ( { description => "dhcpcd", - c => 1}, + c => 1 }, { description => "dhcpxd", - c => 3}, + c => 3 }, { description => "dhcp-client", - c => 4}, + c => 4 }, ); if (my $f = $in->ask_from_listf(N("Connect to the Internet"), N("Which dhcp client do you want to use? diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 029f75bcf..9029cc7c0 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -181,9 +181,9 @@ sub isdn_ask_info { sub isdn_ask_protocol { my @toto = ( { description => $::expert ? N("Europe protocol (EDSS1)") : N("Europe protocol"), - protokol => 2}, + protokol => 2 }, { description => $::expert ? N("Protocol for the rest of the world\nNo D-Channel (leased lines)") : N("Protocol for the rest of the world"), - protokol => 3} + protokol => 3 } ); my $e = $in->ask_from_listf(N("ISDN Configuration"), N("Which protocol do you want to use?"), diff --git a/perl-install/network/isdn_consts.pm b/perl-install/network/isdn_consts.pm index 831bb6f25..eff83b0b5 100644 --- a/perl-install/network/isdn_consts.pm +++ b/perl-install/network/isdn_consts.pm @@ -169,7 +169,7 @@ package network::isdn; # $Id$ driver => 'hisax', type => '15', irq => '9', - io=> '0xd80', + io => '0xd80', card => 'isa', }, { description => "Sedlbauer PC/104 (ISA)", #15 irq, io @@ -206,7 +206,7 @@ package network::isdn; # $Id$ driver => 'hisax', type => '16', irq => '9', - io=> '0xd80', + io => '0xd80', card => 'isa', }, { description => "MIC card (ISA)", #17 irq, io diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index 6bde79dff..1003cc637 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -12,7 +12,7 @@ use MDK::Common::Globals "network", qw($in $prefix); @ISA = qw(Exporter); @EXPORT = qw(pppConfig); -sub configure{ +sub configure { my ($netcnx, $mouse, $netc) = @_; $netcnx->{type}='modem'; $netcnx->{$netcnx->{type}}={}; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 592092a06..a472f0a2c 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -34,13 +34,13 @@ sub intro { } my @l = ( !$connected && -e $connect_file ? { description => N("Connect"), - c => 1} : (), + c => 1 } : (), $connected && -e $disconnect_file ? { description => N("Disconnect"), - c => 2} : (), + c => 2 } : (), { description => N("Configure the connection"), - c => 3}, + c => 3 }, { description => N("Cancel"), - c => 4}, + c => 4 }, ); my $e = $in->ask_from_listf(N("Internet connection & configuration"), translate($text), @@ -184,7 +184,7 @@ If you don't want to use the auto detection, deselect the checkbox. my $set_default; my %conf; $conf{$_} = $netc->{autodetect}{$_} ? 1 : 0 foreach 'modem', 'winmodem', 'adsl', 'cable', 'lan'; - $conf{isdn} = $netc->{autodetect}{isdn}{description} ? 1: 0; + $conf{isdn} = $netc->{autodetect}{isdn}{description} ? 1 : 0; # my @l = ( # [N("Normal modem connection"), $netc->{autodetect}{modem}, N_("detected on port %s"), \$conf{modem}], # [N("ISDN connection"), $netc->{autodetect}{isdn}{description}, N_("detected %s"), \$conf{isdn}], @@ -229,14 +229,14 @@ If you don't want to use the auto detection, deselect the checkbox. } elsif ($nb > 1) { $in->ask_from(N("Network Configuration Wizard"), N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n" . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center")), - [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ]} ] + [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ] } ] ) or goto step_2; } elsif ($nb == 1) { $netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0]; } member($netc->{internet_cnx_choice}, ('adsl', 'isdn')) and $netc->{at_boot} = $in->ask_yesorno(N("Network Configuration Wizard"), N("Do you want to start the connection at boot?")); - if ($netc->{internet_cnx_choice} ) { + if ($netc->{internet_cnx_choice}) { write_cnx_script($netc); $netcnx->{type} = $netc->{internet_cnx}{$netc->{internet_cnx_choice}}{type}; } else { @@ -268,8 +268,8 @@ If you don't want to use the auto detection, deselect the checkbox. The configuration will now be applied to your system. ") . if_($::isStandalone && $in->isa('interactive_gtk'), -N("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems.")) - : N("Problems occured during configuration. +N("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems.")) : + N("Problems occured during configuration. Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."); if ($::isWizard) { $::Wizard_no_previous=1; @@ -409,7 +409,7 @@ ISDNCardVendor=$isdn->{vendor} ISDNId=$isdn->{id} ISDNProvider=$netc->{DOMAINNAME2} ISDNProviderPhone=$isdn->{phone_out} -ISDNProviderDomain=" . do { $netc->{DOMAINNAME2} =~ /\.(.*)/; $1} . " +ISDNProviderDomain=" . do { $netc->{DOMAINNAME2} =~ /\.(.*)/; $1 } . " ISDNProviderDNS1=$netc->{dnsServer2} ISDNProviderDNS2=$netc->{dnsServer3} ISDNDialing=$isdn->{dialing_mode} diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 8b7fb7ce0..3c4a75895 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -228,7 +228,7 @@ sub netmask { $ip =~ $ip_regexp; if ($1 >= 1 && $1 < 127) { "255.0.0.0"; #-1.0.0.0 to 127.0.0.0 - } elsif ($1 >= 128 && $1 <= 191){ + } elsif ($1 >= 128 && $1 <= 191) { "255.255.0.0"; #-128.0.0.0 to 191.255.0.0 } elsif ($1 >= 192 && $1 <= 223) { "255.255.255.0"; diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index d93817e9e..a173c13f8 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -111,14 +111,14 @@ sub write { [ 'all', 'all', 'REJECT', 'info' ], ); set_config_file('rules', - (map - { map_each { [ 'ACCEPT', $_, 'fw', $::a, join(',', @$::b), '-' ] } %ports_by_proto } - ('net', if_($conf->{masquerade}, 'masq'), if_($conf->{loc_interface}, 'loc'))), + (map { + map_each { [ 'ACCEPT', $_, 'fw', $::a, join(',', @$::b), '-' ] } %ports_by_proto + } ('net', if_($conf->{masquerade}, 'masq'), if_($conf->{loc_interface}, 'loc'))), if_($conf->{masquerade}, map { [ 'ACCEPT', 'masq', 'fw', $_, join(',', @drakgw_ports), '-' ] } 'tcp', 'udp'), if_($conf->{masquerade}, map { [ 'ACCEPT', 'fw', 'masq', $_, join(',', @internal_ports), '-' ] } 'tcp', 'udp'), ); set_config_file('masq', - $conf->{masquerade} ? [ $conf->{net_interface}, $conf->{masquerade}{subnet} ]: (), + $conf->{masquerade} ? [ $conf->{net_interface}, $conf->{masquerade}{subnet} ] : (), ); if ($conf->{disabled}) { diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 108cfee83..e1db41702 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -54,7 +54,7 @@ sub ask_connect_now { $up = connected(); } my $m = $up ? (N("The system is now connected to Internet.") . - if_($::isInstall, N("For security reason, it will be disconnected now.")) ) : + if_($::isInstall, N("For security reason, it will be disconnected now."))) : N("The system doesn't seem to be connected to internet. Try to reconfigure your connection."); if ($::isWizard) { @@ -82,7 +82,7 @@ sub ask_info2 { $in->ask_from(N("Connection Configuration"), N("Please fill or check the field below"), [ - if__($cnx->{irq}, { label => N("Card IRQ"), val => \$cnx->{irq} }) , + if__($cnx->{irq}, { label => N("Card IRQ"), val => \$cnx->{irq} }), if__($cnx->{mem}, { label => N("Card mem (DMA)"), val => \$cnx->{mem} }), if__($cnx->{io}, { label => N("Card IO"), val => \$cnx->{io} }), if__($cnx->{io0}, { label => N("Card IO_0"), val => \$cnx->{io0} }), @@ -93,8 +93,8 @@ sub ask_info2 { if__($netc->{dnsServer2}, { label => N("Provider dns 1 (optional)"), val => \$netc->{dnsServer2} }), if__($netc->{dnsServer3}, { label => N("Provider dns 2 (optional)"), val => \$netc->{dnsServer3} }), if__($cnx->{vpivci}, { label => N("Choose your country"), val => \$netc->{vpivci}, list => detect_timezone() }), - if__($cnx->{dialing_mode}, { label => N("Dialing mode"), val => \$cnx->{dialing_mode},list=>["auto","manual"]}), - if__($cnx->{speed}, { label => N("Connection speed"), val => \$cnx->{speed}, list => ["64 Kb/s", "128 Kb/s"]}), + if__($cnx->{dialing_mode}, { label => N("Dialing mode"), val => \$cnx->{dialing_mode},list => ["auto","manual"] }), + if__($cnx->{speed}, { label => N("Connection speed"), val => \$cnx->{speed}, list => ["64 Kb/s", "128 Kb/s"] }), if__($cnx->{huptimeout}, { label => N("Connection timeout (in sec)"), val => \$cnx->{huptimeout} }), if__($cnx->{login}, { label => N("Account Login (user name)"), val => \$cnx->{login} }), if__($cnx->{passwd}, { label => N("Account Password"), val => \$cnx->{passwd}, hidden => 1 }), @@ -219,7 +219,7 @@ sub connected2 { } } -sub disconnected { } +sub disconnected {} sub write_initscript { |