make new perl_checker happy (and that's not easy!)

8 files changed, 77 insertions, 77 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index bf5a63475..d27292cf4 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -83,7 +83,7 @@ sub adsl_conf {
   adsl_conf_step_1:
     adsl_ask_info ($adsl, $netc, $intf) or return;
   adsl_conf_step_2:
-    $adsl_type eq 'speedtouch' or conf_network_card($netc, $intf, 'static' , '10.0.0.10' ) or goto adsl_conf_step_1;
+    $adsl_type eq 'speedtouch' 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/ethernet.pm b/perl-install/network/ethernet.pm
index e25cb7e68..1bdaec245 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -37,7 +37,7 @@ sub configure_cable {
 					_("Which dhcp client do you want to use?
 Default is dhcpcd"),
 					sub { $_[0]{description} },
-					\@m )) {
+					\@m)) {
 	    $f->{c}==1 and $netcnx->{dhcp_client}="dhcpcd" and $in->do_pkgs->install(qw(dhcpcd));
 	    $f->{c}==3 and $netcnx->{dhcp_client}="dhcpxd" and $in->do_pkgs->install(qw(dhcpxd));
 	    $f->{c}==4 and $netcnx->{dhcp_client}="dhcp-client" and $in->do_pkgs->install(qw(dhcp-client));
@@ -91,7 +91,7 @@ I cannot set up this connection type.")) and return;
     again :
 	$interface = $in->ask_from_list(_("Choose the network interface"),
 					_("Please choose which network adapter you want to use to connect to Internet"),
-					[ map { $_->[0] . ($_->[1] ? " ( using module $_->[1] )" : "") } @all_cards ]
+					[ map { $_->[0] . ($_->[1] ? " (using module $_->[1])" : "") } @all_cards ]
 				       ) or return;
     defined $interface or goto again;
   l1:
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 1ab029b87..504655d11 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -167,7 +167,7 @@ sub isdn_ask_info {
     my ($isdn, $netc) = @_;
     my $f = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db";
     $f = "$prefix$f" if !-e $f;
-    my $str= $in->ask_from_treelist( _("ISDN Configuration"), _("Select your provider.\nIf it isn't listed, choose Unlisted."),
+    my $str= $in->ask_from_treelist(_("ISDN Configuration"), _("Select your provider.\nIf it isn't listed, choose Unlisted."),
 				     '|', ['Unlisted - edit manually',
 					   read_providers_backend($f)], 'Unlisted - edit manually')
       or return;
@@ -188,7 +188,7 @@ sub isdn_ask_protocol {
     my $e = $in->ask_from_listf(_("ISDN Configuration"),
 				_("Which protocol do you want to use?"),
 				sub { $_[0]{description} },
-				\@toto ) or return 0;
+				\@toto) or return 0;
     $e->{protokol};
 }
 
@@ -215,7 +215,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
     $e = $in->ask_from_listf(_("ISDN Configuration"),
 			     _("Which is your ISDN card?"),
 			     sub { $_[0]{description} },
-			     [ grep {$_->{card} eq $isdn->{card_type}; } @isdndata ] ) or goto isdn_ask_step_1;
+			     [ grep { $_->{card} eq $isdn->{card_type} } @isdndata ]) or goto isdn_ask_step_1;
     $e->{$_} and $isdn->{$_} = $e->{$_} foreach qw(driver type mem io io0 io1 irq firmware);
 
   isdn_ask_step_3:
@@ -229,7 +229,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
 sub isdn_detect {
     my ($isdn, $netc) = @_;
     if ($isdn->{id}) {
-  	log::l("found isdn card : $isdn->{description}; vendor : $isdn->{vendor};id : $isdn->{id}; driver : $isdn->{driver}\n");
+  	log::l("found isdn card : $isdn->{description}; vendor : $isdn->{vendor}; id : $isdn->{id}; driver : $isdn->{driver}\n");
 	$isdn->{description} =~ s/\|/ -- /;
 	if ($isdn->{type} eq '') {
 	    isdn_ask($isdn, $netc, _("I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen.")) or return;
diff --git a/perl-install/network/isdn_consts.pm b/perl-install/network/isdn_consts.pm
index 357da529a..831bb6f25 100644
--- a/perl-install/network/isdn_consts.pm
+++ b/perl-install/network/isdn_consts.pm
@@ -2,7 +2,7 @@ package network::isdn; # $Id$
 
 @isdndata =
   (
-   {description => "Teles 16.0 (ISA)",               #1 irq, mem, io
+   { description => "Teles 16.0 (ISA)",               #1 irq, mem, io
     driver => 'hisax',
     type => '1',
     irq => '5',
@@ -10,28 +10,28 @@ package network::isdn; # $Id$
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Teles  8.0 (ISA)", #2 irq, mem
+   { description => "Teles  8.0 (ISA)", #2 irq, mem
     driver => 'hisax',
     type => '2',
     irq => '9',
     mem => '0xd800',
     card => 'isa',
    },
-   {description => "Teles 16.3 (ISA non PnP)", #3 irq, io
+   { description => "Teles 16.3 (ISA non PnP)", #3 irq, io
     driver => 'hisax',
     type => '3',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Teles 16.3c (ISA PnP)", #14 irq, io
+   { description => "Teles 16.3c (ISA PnP)", #14 irq, io
     driver => 'hisax',
     type => '14',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Creatix/Teles (ISA PnP)",	#4 irq, io0 (ISAC), io1 (HSCX)
+   { description => "Creatix/Teles (ISA PnP)",	#4 irq, io0 (ISAC), io1 (HSCX)
     driver => 'hisax',
     type => '4',
     irq => '5',
@@ -39,156 +39,156 @@ package network::isdn; # $Id$
     io1 => '0x0000',
     card => 'isa',
    },
-   {description => "Teles generic (PCI)", #21 no parameter
+   { description => "Teles generic (PCI)", #21 no parameter
     driver => 'hisax',
     type => '21',
     card => 'pci',
    },
-   {description => "Teles 16.3 (PCMCIA)",	#8 irq, io
+   { description => "Teles 16.3 (PCMCIA)",	#8 irq, io
     driver => 'hisax',
     type => '8',
     irq => '',
     io => '0x',
     card => 'isa',
    },
-   {description => "Teles S0Box", #25 irq, io (of the used lpt port)
+   { description => "Teles S0Box", #25 irq, io (of the used lpt port)
     driver => 'hisax',
     type => '25',
     irq => '7',
     io => '0x378',
     card => 'isa',
    },
-   {description => "ELSA PCC/PCF cards (ISA)", #6 io or nothing for autodetect (the io is required only if you have n>1 ELSA card )
+   { description => "ELSA PCC/PCF cards (ISA)", #6 io or nothing for autodetect (the io is required only if you have n>1 ELSA card)
     driver => 'hisax',
     type => '6',
     io => "",
     card => 'isa',
    },
-   {description => "ELSA Quickstep 1000 (ISA)", #7 irq, io  (from isapnp setup)
+   { description => "ELSA Quickstep 1000 (ISA)", #7 irq, io  (from isapnp setup)
     driver => 'hisax',
     type => '7',
     irq => '5',
     io => '0x300',
     card => 'isa',
    },
-   {description => "ELSA Quickstep 1000 (PCI)", #18 no parameter
+   { description => "ELSA Quickstep 1000 (PCI)", #18 no parameter
     driver => 'hisax',
     type => '18',
     card => 'pci',
    },
-   {description => "ELSA Quickstep 3000 (PCI)", #18 no parameter
+   { description => "ELSA Quickstep 3000 (PCI)", #18 no parameter
     driver => 'hisax',
     type => '18',
     card => 'pci',
    },
-   {description => "ELSA generic (PCMCIA)", #10 irq, io  (set with card manager)
+   { description => "ELSA generic (PCMCIA)", #10 irq, io  (set with card manager)
     driver => 'hisax',
     type => '10',
     irq => '',
     io => '0x',
     card => 'isa',
    },
-   {description => "ELSA MicroLink (PCMCIA)", #10 irq, io  (set with card manager)
+   { description => "ELSA MicroLink (PCMCIA)", #10 irq, io  (set with card manager)
     driver => 'elsa_cs',
     card => 'isa',
    },
-   {description => "ITK ix1-micro Rev.2 (ISA)", #9 irq, io
+   { description => "ITK ix1-micro Rev.2 (ISA)", #9 irq, io
     driver => 'hisax',
     type => '9',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Eicon.Diehl Diva (ISA PnP)", #11 irq, io
+   { description => "Eicon.Diehl Diva (ISA PnP)", #11 irq, io
     driver => 'hisax',
     type => '11',
     irq => '9',
     io => '0x180',
     card => 'isa',
    },
-   {description => "Eicon.Diehl Diva 20 (PCI)", #11 no parameter
+   { description => "Eicon.Diehl Diva 20 (PCI)", #11 no parameter
     driver => 'hisax',
     type => '11',
     card => 'pci',
    },
-   {description => "Eicon.Diehl Diva 20PRO (PCI)", #11 no parameter
+   { description => "Eicon.Diehl Diva 20PRO (PCI)", #11 no parameter
     driver => 'hisax',
     type => '11',
     card => 'pci',
    },
-   {description => "Eicon.Diehl Diva 20_U (PCI)", #11 no parameter
+   { description => "Eicon.Diehl Diva 20_U (PCI)", #11 no parameter
     driver => 'hisax',
     type => '11',
     card => 'pci',
    },
-   {description => "Eicon.Diehl Diva 20PRO_U (PCI)", #11 no parameter
+   { description => "Eicon.Diehl Diva 20PRO_U (PCI)", #11 no parameter
     driver => 'hisax',
     type => '11',
     card => 'pci',
    },
-   {description => "ASUS COM ISDNLink (ISA)", #12 irq, io  (from isapnp setup)
+   { description => "ASUS COM ISDNLink (ISA)", #12 irq, io  (from isapnp setup)
     driver => 'hisax',
     type => '12',
     irq => '5',
     io => '0x200',
     card => 'isa',
    },
-   {description => "ASUS COM ISDNLink (PCI)",
+   { description => "ASUS COM ISDNLink (PCI)",
     driver => 'hisax',
     type => '35',
     card => 'pci',
    },
-   {description => "DynaLink (PCI)",
+   { description => "DynaLink (PCI)",
     driver => 'hisax',
     type => '12',
     card => 'pci',
    },
-   {description => "DynaLink IS64PH, ASUSCOM (PCI)", #36
+   { description => "DynaLink IS64PH, ASUSCOM (PCI)", #36
     driver => 'hisax',
     type => '36',
     card => 'pci',
    },
-   {description => "HFC-2BS0 based cards (ISA)", #13 irq, io
+   { description => "HFC-2BS0 based cards (ISA)", #13 irq, io
     driver => 'hisax',
     type => '13',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "HFC 2BDS0 (PCI)", #35 none
+   { description => "HFC 2BDS0 (PCI)", #35 none
     driver => 'hisax',
     type => '35',
     card => 'pci',
    },
-   {description => "HFC 2BDS0 S+, SP (PCMCIA)", #37 irq,io (pcmcia must be set with cardmgr)
+   { description => "HFC 2BDS0 S+, SP (PCMCIA)", #37 irq,io (pcmcia must be set with cardmgr)
     driver => 'hisax',
     type => '37',
     card => 'isa',
    },
-   {description => "Sedlbauer Speed Card (ISA)", #15 irq, io
+   { description => "Sedlbauer Speed Card (ISA)", #15 irq, io
     driver => 'hisax',
     type => '15',
     irq => '9',
     io=> '0xd80',
     card => 'isa',
    },
-   {description => "Sedlbauer PC/104 (ISA)", #15 irq, io
+   { description => "Sedlbauer PC/104 (ISA)", #15 irq, io
     driver => 'hisax',
     type => '15',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Sedlbauer Speed Card (PCI)", #15 no parameter
+   { description => "Sedlbauer Speed Card (PCI)", #15 no parameter
     driver => 'hisax',
     type => '15',
     card => 'pci',
    },
-   {description => "Sedlbauer Speed Star (PCMCIA)", #22 irq, io (set with card manager)
+   { description => "Sedlbauer Speed Star (PCMCIA)", #22 irq, io (set with card manager)
     driver => 'sedlbauer_cs',
     card => 'isa',
    },
-   {description => "Sedlbauer Speed Fax+ (ISA Pnp)", #28 irq, io (from isapnp setup)
+   { description => "Sedlbauer Speed Fax+ (ISA Pnp)", #28 irq, io (from isapnp setup)
     driver => 'hisax',
     type => '28',
     irq => '9',
@@ -196,27 +196,27 @@ package network::isdn; # $Id$
     card => 'isa',
     firmware => '/usr/lib/isdn/ISAR.BIN',
    },
-   {description => "Sedlbauer Speed Fax+ (PCI)", #28 no parameter
+   { description => "Sedlbauer Speed Fax+ (PCI)", #28 no parameter
     driver => 'hisax',
     type => '28',
     card => 'pci',
     firmware => '/usr/lib/isdn/ISAR.BIN',
    },
-   {description => "USR Sportster internal (ISA)", #16 irq, io
+   { description => "USR Sportster internal (ISA)", #16 irq, io
     driver => 'hisax',
     type => '16',
     irq => '9',
     io=> '0xd80',
     card => 'isa',
    },
-   {description => "MIC card (ISA)",	#17 irq, io
+   { description => "MIC card (ISA)",	#17 irq, io
     driver => 'hisax',
     type => '17',
     irq => '9',
     io => '0xd80',
     card => 'isa',
    },
-   {description => "Compaq ISDN S0 card (ISA)", #19 irq, io0, io1, io (from isapnp setup io=IO2)
+   { description => "Compaq ISDN S0 card (ISA)", #19 irq, io0, io1, io (from isapnp setup io=IO2)
     driver => 'hisax',
     type => '19',
     irq => '5',
@@ -225,12 +225,12 @@ package network::isdn; # $Id$
     io1 => '0x0000',
     card => 'isa',
    },
-   {description => "NETjet card (PCI)", #20 no parameter
+   { description => "NETjet card (PCI)", #20 no parameter
     driver => 'hisax',
     type => '20',
     card => 'pci',
    },
-   {description => "Dr. Neuhaus Niccy (ISA PnP)", #24 irq, io0, io1 (from isapnp setup)
+   { description => "Dr. Neuhaus Niccy (ISA PnP)", #24 irq, io0, io1 (from isapnp setup)
     driver => 'hisax',
     type => '24',
     irq => '5',
@@ -238,41 +238,41 @@ package network::isdn; # $Id$
     io1 => '0x0000',
     card => 'isa',
    },
-   {description => "Dr. Neuhaus Niccy (PCI)", ##24 no parameter
+   { description => "Dr. Neuhaus Niccy (PCI)", ##24 no parameter
     driver => 'hisax',
     type => '24',
     card => 'pci',
    },
-   {description => "AVM A1 (Fritz) (ISA non PnP)", #5 irq, io
+   { description => "AVM A1 (Fritz) (ISA non PnP)", #5 irq, io
     driver => 'hisax',
     type => '5',
     irq => '10',
     io => '0x300',
     card => 'isa',
    },
-   {description => "AVM (ISA Pnp)", #27 irq, io  (from isapnp setup)
+   { description => "AVM (ISA Pnp)", #27 irq, io  (from isapnp setup)
     driver => 'hisax',
     type => '27',
     irq => '5',
     io => '0x300',
     card => 'isa',
    },
-   {description => "AVM A1 (Fritz) (PCMCIA)", #26 irq, io (set with card manager)
+   { description => "AVM A1 (Fritz) (PCMCIA)", #26 irq, io (set with card manager)
     driver => 'hisax',
     type => '26',
     irq => '',
     card => 'isa',
    },
-   {description => "AVM PCI (Fritz!) (PCI)", #27 no parameter
+   { description => "AVM PCI (Fritz!) (PCI)", #27 no parameter
     driver => 'hisax',
     type => '27',
     card => 'pci',
    },
-   {description => "AVM B1 (PCI)",
+   { description => "AVM B1 (PCI)",
     driver => 'b1pci',
     card => 'pci',
    },
-   {description => "Siemens I-Surf 1.0 (ISA Pnp)", #29 irq, io, memory (from isapnp setup)   
+   { description => "Siemens I-Surf 1.0 (ISA Pnp)", #29 irq, io, memory (from isapnp setup)   
     driver => 'hisax',
     type => '29',
     irq => '9',
@@ -280,43 +280,43 @@ package network::isdn; # $Id$
     mem => '0xd000',
     card => 'isa',
    },
-   {description => "ACER P10 (ISA Pnp)",	#30 irq, io (from isapnp setup)   
+   { description => "ACER P10 (ISA Pnp)",	#30 irq, io (from isapnp setup)   
     driver => 'hisax',
     type => '30',
     irq => '5',
     io => '0x300',
     card => 'isa',
    },
-   {description => "HST Saphir (ISA Pnp)", #31 irq, io
+   { description => "HST Saphir (ISA Pnp)", #31 irq, io
     driver => 'hisax',
     type => '31',
     irq => '5',
     io => '0x300',
     card => 'isa',
    },
-   {description => "Telekom A4T (PCI)", #32 none
+   { description => "Telekom A4T (PCI)", #32 none
     driver => 'hisax',
     type => '32',
     card => 'pci',
    },
-   {description => "Scitel Quadro (PCI)", #33 subcontroller (4*S0, subctrl 1...4)
+   { description => "Scitel Quadro (PCI)", #33 subcontroller (4*S0, subctrl 1...4)
     driver => 'hisax',
     type => '33',
     card => 'pci',
    },
-   {description => "Gazel ISDN cards (ISA)", #34 irq,io
+   { description => "Gazel ISDN cards (ISA)", #34 irq,io
     driver => 'hisax',
     type => '34',
     irq => '5',
     io => '0x300',
     card => 'isa',
    },
-   {description => "Gazel ISDN cards (PCI)", #34 none
+   { description => "Gazel ISDN cards (PCI)", #34 none
     driver => 'hisax',
     type => '34',
     card => 'pci',
    },
-   {description => "W6692 and Winbond based cards (PCI)", #36 none
+   { description => "W6692 and Winbond based cards (PCI)", #36 none
     driver => 'hisax',
     type => '36',
     card => 'pci',
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 2edf23245..f15797687 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -50,7 +50,7 @@ sub intro {
 	my $e = $in->ask_from_listf(_("Internet connection & configuration"),
 				    _($text),
 				    sub { $_[0]{description} },
-				    \@l );
+				    \@l);
 	run_program::rooted($prefix, $connect_prog) if ($e->{c}==1);
 	run_program::rooted($prefix, $disconnect_file) if ($e->{c}==2);
 	main($prefix, $netcnx, $netc, $mouse, $in, $intf, 0, 0) if ($e->{c}==3);
@@ -76,11 +76,11 @@ sub detect {
     require network::adsl;
     network::adsl->import;
     map {
-	( !$net_install and adsl_detect($_->[0]) ) ? $auto_detect->{adsl}=$_->[0] : $auto_detect->{lan}{$_->[0]}=$_->[1]; } @all_cards;
+	(!$net_install and adsl_detect($_->[0])) ? $auto_detect->{adsl}=$_->[0] : $auto_detect->{lan}{$_->[0]}=$_->[1] } @all_cards;
     my $modem={};
     require network::modem;
     network::modem->import;
-    modem_detect_backend($modem);#, $mouse);
+    modem_detect_backend($modem);
     $modem->{device} and $auto_detect->{modem}=$modem->{device};
 }
 
@@ -118,7 +118,7 @@ sub init_globals {
 			       prefix => $prefix,
 			       connect_file => "/etc/sysconfig/network-scripts/net_cnx_up",
 			       disconnect_file => "/etc/sysconfig/network-scripts/net_cnx_down",
-			       connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg" );
+			       connect_prog => "/etc/sysconfig/network-scripts/net_cnx_pg");
 }
 
 sub main {
@@ -194,7 +194,7 @@ If you don't want to use the auto detection, deselect the checkbox.
 	     [_("LAN connection"), $netc->{autodetect}{lan}, __("ethernet card(s) detected"), \$conf{lan}]
 	);
     my $i=0;
-    map { defined $set_default or do { $_->[1] and $set_default=$i; }; $i++; } @l;
+    map { defined $set_default or do { $_->[1] and $set_default=$i }; $i++ } @l;
     @l = (
 [_("Normal modem connection") . if_($netc->{autodetect}{modem}, " - " . _("detected on port %s", $netc->{autodetect}{modem})), \$conf{modem}],
 [_("ISDN connection") . if_($netc->{autodetect}{isdn}{description}, " - " . _("detected %s", $netc->{autodetect}{isdn}{description})), \$conf{isdn}],
@@ -218,9 +218,9 @@ If you don't want to use the auto detection, deselect the checkbox.
 #    load_conf ($netcnx, $netc, $intf);
     $conf{modem} and do { pre_func("modem"); require network::modem; network::modem::configure($netcnx, $mouse, $netc) or goto step_2 };
     $conf{isdn} and do { pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc) or goto step_2 };
-    $conf{adsl} and do { pre_func("adsl"); require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2};
-    $conf{cable} and do { pre_func("cable"); require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1; };
-    $conf{lan} and do { pre_func("local network"); require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1; };
+    $conf{adsl} and do { pre_func("adsl"); require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2 };
+    $conf{cable} and do { pre_func("cable"); require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1 };
+    $conf{lan} and do { pre_func("local network"); require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1 };
 
   step_2_1:
     my $nb = keys %{$netc->{internet_cnx}};
@@ -276,7 +276,7 @@ Test your connection via net_monitor or mcc. If your connection doesn't work, yo
 	$in->ask_okcancel(_("Network Configuration"), $m, 1);
 	undef $::Wizard_no_previous;
 	undef $::Wizard_finished;
-    } else {  $::isStandalone and $in->ask_warn('', $m ); }
+    } else { $::isStandalone and $in->ask_warn('', $m) }
 
   step_5:
 
@@ -365,7 +365,7 @@ sub save_conf {
     output("$prefix/etc/sysconfig/network-scripts/drakconnect_conf",
       "SystemName=" . do { $netc->{HOSTNAME} =~ /([^\.]*)\./; $1 } . "
 DomainName=" . do { $netc->{HOSTNAME} =~ /\.(.*)/; $1 } . "
-InternetAccessType=" . do { if ($netcnx->{type}) { $netcnx->{type}; } else { $netc->{GATEWAY} ? "lan" : ""; } } . "
+InternetAccessType=" . do { if ($netcnx->{type}) { $netcnx->{type} } else { $netc->{GATEWAY} ? "lan" : "" } } . "
 InternetInterface=" . ($netc->{GATEWAY} && (!$netcnx->{type} || $netcnx->{type} eq 'lan') ? $netc->{NET_DEVICE} : $netcnx->{NET_INTERFACE}) . "
 InternetGateway=$netc->{GATEWAY}
 DNSPrimaryIP=$netc->{dnsServer}
@@ -426,7 +426,7 @@ PPPLogin=$modem->{login}
 PPPPassword=$modem->{passwd}
 PPPConfirmPassword=$modem->{passwd}
 PPPAuthentication=$modem->{auth}
-PPPSpecialCommand=" . ($netcnx->{type} eq 'isdn_external' ? $netcnx->{isdn_external}{special_command} : '' ) . "
+PPPSpecialCommand=" . ($netcnx->{type} eq 'isdn_external' ? $netcnx->{isdn_external}{special_command} : '') . "
 
 ADSLInterfacesList=
 ADSLModem=" .  q( # Obsolete information. Please don't use it.) . "
@@ -606,7 +606,7 @@ sub read_net_conf {
 
 sub set_net_conf {
     my ($netcnx, $netc)=@_;
-    setVarsInShMode("$prefix/etc/sysconfig/drakconnect", 0600, $netcnx, "NET_DEVICE", "NET_INTERFACE", "type", "PROFILE" );
+    setVarsInShMode("$prefix/etc/sysconfig/drakconnect", 0600, $netcnx, "NET_DEVICE", "NET_INTERFACE", "type", "PROFILE");
     setVarsInShMode("$prefix/etc/sysconfig/drakconnect." . $netcnx->{type}, 0600, $netcnx->{$netcnx->{type}}); #- doesn't work, don't know why
     setVarsInShMode("$prefix/etc/sysconfig/drakconnect.netc", 0600, $netc); #- doesn't work, don't know why
 }
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 60d8ffd41..57c08784e 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -128,7 +128,7 @@ sub write_interface_conf {
     my @mask = split '\.', $intf->{NETMASK};
     my $hwaddr;
     $::o->{miscellaneous}{track_network_id} and $hwaddr = -e "$prefix/sbin/ip" && `LC_ALL= LANG= $prefix/sbin/ip -o link show $intf->{DEVICE} 2>/dev/null`;
-    if ($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/; }
+    if ($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/ }
     $hwaddr and $intf->{HWADDR} = undef;
     add2hash($intf, {
 		     BROADCAST => join('.', mapn { int $_[0] | ~int $_[1] & 255 } \@ip, \@mask),
@@ -228,7 +228,7 @@ sub netmask {
     $ip =~ $ip_regexp;
     if ($1 >= 1 && $1 < 127) {
 	return "255.0.0.0";    #-1.0.0.0 to 127.0.0.0
-    } elsif ($1  >= 128 && $1 <= 191 ){
+    } elsif ($1  >= 128 && $1 <= 191){
 	return "255.255.0.0";  #-128.0.0.0 to 191.255.0.0
     } elsif ($1 >= 192 && $1 <= 223) {
 	return "255.255.255.0";
@@ -306,7 +306,7 @@ notation (for example, 1.2.3.4).");
     my @fields = qw(IPADDR NETMASK);
     $::isStandalone or $in->set_help('configureNetworkIP');
     $in->ask_from(_("Configuring network device %s", $intf->{DEVICE}),
-  	          (_("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver %s)", $module) : '' ) ."\n\n") .
+  	          (_("Configuring network device %s", $intf->{DEVICE}) . ($module ? _(" (driver %s)", $module) : '') ."\n\n") .
 	          $text,
 	         [ { label => _("IP address"), val => \$intf->{IPADDR}, disabled => sub { $pump } },
 	           { label => _("Netmask"),     val => \$intf->{NETMASK}, disabled => sub { $pump } },
diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index abf742800..751dbbc4a 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -41,7 +41,7 @@ sub smbclient {
     my $ip    = $server->{ip} ? "-I $server->{ip}" : '';
     my $group = $server->{group} ? " -W $server->{group}" : '';
 
-    my $U = $server->{username} ? "$server->{domain}/$server->{username}%$server->{password}" : '%';
+    my $U = $server->{username} ? sprintf("%s/%s%%%s", @$server{'domain', 'username', 'password'}) : '%';
     `smbclient -U $U -L $name $ip$group`;
 }
 
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index f155f359d..33f3bb6be 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -63,7 +63,7 @@ Try to reconfigure your connection.");
 	    $in->ask_okcancel(_("Network Configuration"), $m, 1);
 	    undef $::Wizard_no_previous;
 	    undef $::Wizard_finished;
-	} else {  $in->ask_warn('', $m ); }
+	} else {  $in->ask_warn('', $m) }
 	$::isInstall and disconnect_backend();
     }
     undef $::Wizard_no_previous;
@@ -153,7 +153,7 @@ sub connected_bg {
 	    undef $kid_pipe;
 	    $$ref = $a;
   	}
-    } else { $kid_pipe = connected2(); }
+    } else { $kid_pipe = connected2() }
     1;
 }