Fix perlcritic issues for all scripts starting with m to r

irssi · Oct 19, 2014 · dd80027 · dd80027
1 parent 263a56d
commit dd80027
Show file tree

Hide file tree

Showing 37 changed files with 103 additions and 84 deletions.
diff --git a/scripts/autoopper.pl b/scripts/autoopper.pl
@@ -159,7 +159,7 @@ sub read_dynamic_hosts {
 # Save data to file
 sub cmd_save_autoop {
 	my $file = Irssi::get_irssi_dir."/autoop";
-	open FILE, "> $file" or return;
+	open FILE, ">", "$file" or return;
 
 	foreach my $item (@opitems) {
 		printf FILE ("%s\t%s\t%s\n", $item->{mask}, $item->{chan}, $item->{dynamic});
@@ -172,7 +172,7 @@ sub cmd_save_autoop {
 # Load data from file
 sub cmd_load_autoop {
 	my $file = Irssi::get_irssi_dir."/autoop";
-	open FILE, "< $file" or return;
+	open FILE, "<","$file" or return;
 	undef @opitems if (@opitems);
 
 	while (<FILE>) {

diff --git a/scripts/mail.pl b/scripts/mail.pl
@@ -1,3 +1,5 @@
+use strict;
+use vars qw($VERSION %IRSSI);
 $VERSION = "2.92";
 %IRSSI = (
     authors     => "Timo Sirainen, Matti Hiljanen, Joost Vunderink, Bart Matthaei",
@@ -114,7 +116,7 @@ sub mbox_count {
 	$last_mtime = $mtime;
 
 	my $f = gensym;
-	return 0 if (!open($f, $mailfile));
+	return 0 if (!open($f, "<", $mailfile));
 
 	# count new mails only
 	my $internal_removed = 0;

diff --git a/scripts/mailcheck_imap.pl b/scripts/mailcheck_imap.pl
@@ -3,6 +3,7 @@
 # Contains code from centericq.pl (public domain) and imapbiff (GPL) and
 # hence this is also GPL'd.
 
+use strict;
 use vars qw($VERSION %IRSSI);
 $VERSION = "0.5";
 %IRSSI = (
@@ -40,9 +41,6 @@
 
 use Irssi;
 use Irssi::TextUI;
-
-
-use strict;
 use IO::Socket;
 
 # TODO : avoid requiring SSL when it's not in use?

diff --git a/scripts/mailcheck_mbox_flux.pl b/scripts/mailcheck_mbox_flux.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 
+use strict;
 use Irssi;
 
 use vars qw($VERSION %IRSSI);
@@ -14,11 +15,9 @@
     changed     => "Mon Mar  4 23:25:18 EET 2002"
 );
 
-use strict;
-
 sub getMessages( $ ) {
   local *F;
-  open(F, $_[0]) or return ();
+  open(F, "<", $_[0]) or return ();
   my $inHeaders = 0;
   my $headers;
   my %result = ();

diff --git a/scripts/mailcheck_pop3_kimmo.pl b/scripts/mailcheck_pop3_kimmo.pl
@@ -8,6 +8,7 @@
 # >install Net::POP3
 #
 
+use strict;
 use Irssi;
 use Net::POP3;
 use vars qw($VERSION %IRSSI);
@@ -23,17 +24,16 @@
 );
 
 
-
-
+my (%_mailcount, %_mailchecktimer);
 
 sub cmd_checkmail
 {
 	my $args = shift;
 	my ($user, $pass, $host) = split(/\;/, $args);
-	my $i, $from, $subject, $head;
+	my ($i, $from, $subject, $head);
 	my $POP3TIMEOUT = Irssi::settings_get_int("pop3_timeout");
-        my $pop = Net::POP3->new( $host, Timeout => $POP3TIMEOUT );
-	$count = $pop->login($user, $pass);
+    my $pop = Net::POP3->new( $host, Timeout => $POP3TIMEOUT );
+	my $count = $pop->login($user, $pass);
 
 	if (!$count || !$pop)
 	{
@@ -83,18 +83,18 @@ sub cmd_mail
 	my $args = shift;
 	my (@arg) = split(/\s+/, $args);
 
-	if ((@arg[0] eq "add") && @arg[1] && @arg[2])
+	if (($arg[0] eq "add") && $arg[1] && $arg[2])
 	{
-		if ($_mailchecktimer{@arg[1]})
+		if ($_mailchecktimer{$arg[1]})
 		{
-			Irssi::print("Account " . @arg[1] . " is already being monitored.");
+			Irssi::print("Account " . $arg[1] . " is already being monitored.");
 		}
 		else
 		{
-			start_check(@arg[1], @arg[2]);
+			start_check($arg[1], $arg[2]);
 		}
 	}
-	elsif (@arg[0] eq "list")
+	elsif ($arg[0] eq "list")
 	{
 		Irssi::print("Active POP3 Accounts Being Monitored:");
 		foreach (keys %_mailchecktimer)

diff --git a/scripts/mass_hilight_blocker.pl b/scripts/mass_hilight_blocker.pl
@@ -15,6 +15,7 @@
 # * 30.05.2004
 # first version of the script
 
+use strict;
 use Irssi;
 use vars qw($VERSION %IRSSI); 
 $VERSION = "0.2";
@@ -39,7 +40,7 @@ sub sig_printtext {
       my $server  =  $dest->{server};	# get server and channel for target
       my $channel =  $server->channel_find($dest->{target});
 
-      foreach $nick ($channel->nicks()) # walk through nicks
+      foreach my $nick ($channel->nicks()) # walk through nicks
         {
           $nick = $nick->{nick};
           $nick =~ s/([\]\[])/\\$1/g;	# ']' and '[' need masking

diff --git a/scripts/mkshorterlink.pl b/scripts/mkshorterlink.pl
@@ -14,8 +14,6 @@
 use strict;
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "0.3";
-
 %IRSSI = (
 	  'authors'	=> 'Gergely Nagy',
 	  'contact'	=> 'algernon\@bonehunter.rulez.org',
@@ -165,7 +163,7 @@ sub load_unshortlist {
 	my $count = 0;
 	local *CONF;
 
-	open CONF, "< $file";
+	open CONF, "<", $file;
 	while (<CONF>)
 	{
 		$noshort{$_} = 1;
@@ -181,7 +179,7 @@ sub save_unshortlist {
 	my $file = Irssi::get_irssi_dir."/unshortlist";
 	local *CONF;
 
-	open CONF, "> $file";
+	open CONF, ">", $file;
 	foreach (keys %noshort)
 	{
 		print CONF $_ if ($noshort{$_});

diff --git a/scripts/monitor.pl b/scripts/monitor.pl
@@ -351,7 +351,7 @@ sub cmd_monitor_save {
 	#my ($data, $server, $item) = @_;
 	my $file = Irssi::get_irssi_dir."/monitor";
 	my ($net, $n, $k);
-	open FILE, "> $file" or return;
+	open FILE, ">", $file or return;
 	foreach $net (keys %monitorlist) {
 		foreach $n (keys %{$monitorlist{$net}}) {
 			$monitorlist{$net}{$n}{lastseen} = time() if $monitorlist{$net}{$n}{mask_online};
@@ -369,7 +369,7 @@ sub cmd_monitor_load {
 	#my ($data, $server, $item) = @_;
 	my $file = Irssi::get_irssi_dir."/monitor";
 
-	open FILE, "< $file" or return;
+	open FILE, "<", $file or return;
 	%monitorlist = ();
 	while (<FILE>) {
 		chomp;

diff --git a/scripts/mpg123.pl b/scripts/mpg123.pl
@@ -60,7 +60,7 @@ sub cmd_mpg123 {
 			}
 		}
 
-		open (f, $mpg123file) || return;
+		open (f, "<", $mpg123file) || return;
 
 		while ($mpg123linha=<f>) {		
 

diff --git a/scripts/my_beep.pl b/scripts/my_beep.pl
@@ -12,7 +12,8 @@
 #   $/set beep_msg_level HILIGHT
 #   $/set beep_cmd beep 
 
-
+use strict;
+use vars qw($VERSION %IRSSI);
 $VERSION = "0.9";
 %IRSSI = (
     authors	=> "Remco den Breeje",
@@ -26,6 +27,7 @@
 use Irssi;
 
 my $can_I_beep = 1;
+my ($timeout_tag, $autoaway_to_tag);
 
 sub beep_overflow_timeout() {
 	$can_I_beep = 1;

diff --git a/scripts/mysqlurllogger.pl b/scripts/mysqlurllogger.pl
@@ -13,7 +13,7 @@
 #| line      | char(255)     | YES  |     | NULL    |       |
 #+-----------+---------------+------+-----+---------+-------+
 
-
+use strict;
 use DBI;
 use Irssi;
 use Irssi::Irc;
@@ -30,13 +30,13 @@
         url         => "http://nchip.ukkosenjyly.mine.nu/irssiscripts/",
     );
 
-$dsn = 'DBI:mysql:ircurl:localhost';
-$db_user_name = 'tunnus';
-$db_password = 'salakala';
+my $dsn = 'DBI:mysql:ircurl:localhost';
+my $db_user_name = 'tunnus';
+my $db_password = 'salakala';
 
 sub cmd_logurl {
 	my ($server, $data, $nick, $mask, $target) = @_;
-        $d = $data;
+        my $d = $data;
         if (($d =~ /(.{1,2}tp\:\/\/.+)/) or ($d =~ /(www\..+)/)) {
 		db_insert($nick, $target, $1);
         }

diff --git a/scripts/nact.pl b/scripts/nact.pl
@@ -109,7 +109,7 @@ ()
 	my @list;
 	my $ignore = 2;
 
-	open(FID, "/proc/net/dev");
+	open(FID, "<", "/proc/net/dev");
 
 	while (<FID>) {
 		if ($ignore > 0) {
@@ -130,7 +130,7 @@ ()
 sub getBytesOBSD() {
 	my @list;
 
-	open(FID, "/usr/bin/netstat -nib|");
+	open(FID, "-|", "/usr/bin/netstat -nib");
 
 	while (<FID>) {
 		my $line = $_;
@@ -146,7 +146,7 @@ ()
   my @list;
   my $olddev="";
 
-  open(FID, "/usr/bin/netstat -nib|");
+  open(FID, "-|", "/usr/bin/netstat -nib");
   while (<FID>) {
     my $line = $_;
     @list = split(" ", $line);

diff --git a/scripts/nickban.pl b/scripts/nickban.pl
@@ -1,3 +1,5 @@
+use strict;
+use vars qw($VERSION %IRSSI);
 $VERSION = "1.1";
 %IRSSI = (
     authors     =>  "Roeland 'Trancer' Nieuwenhuis",
@@ -7,7 +9,6 @@
     license     =>  "Public Domain"
 );
 
-use strict;
 use Irssi;
 
 # The channels the nicks are banned on (on which this script is active)

diff --git a/scripts/nickcolor.pl b/scripts/nickcolor.pl
@@ -30,7 +30,7 @@ sub load_colors {
 }
 
 sub save_colors {
-  open COLORS, ">$ENV{HOME}/.irssi/saved_colors";
+  open COLORS, ">", "$ENV{HOME}/.irssi/saved_colors";
 
   foreach my $nick (keys %saved_colors) {
     print COLORS "$nick:$saved_colors{$nick}\n";

diff --git a/scripts/nickserv.pl b/scripts/nickserv.pl
@@ -110,7 +110,7 @@ sub load_nickservnet {
 
     if (-e $file) {
         local *F;
-        open(F, "<$file");
+        open(F, "<", $file);
         local $/ = "\n";
 
         while (<F>) {
@@ -134,7 +134,7 @@ sub save_nickservnet {
 
     if (-e $file) {
         local *F;
-        open(F, ">$file");
+        open(F, ">", $file);
 
         for (my $n = 0; $n < @nickservnet; ++$n) {
             print(F join("\t", $nickservnet[$n]->{name}, $nickservnet[$n]->{host}) . "\n");
@@ -151,7 +151,7 @@ sub create_network_file {
 
     my ($file) = @_;
 
-    open(F, ">$file") or die "Can't create $file. Reason: $!";
+    open(F, ">", $file) or die "Can't create $file. Reason: $!";
 }
 
 sub new_nickserv_network {
@@ -172,7 +172,7 @@ sub load_nickservnick {
 
     if (-e $file) {
         local *F;
-        open(F, "<$file");
+        open(F, "<" ,$file);
         local $/ = "\n";
 
         while (<F>) {
@@ -196,7 +196,7 @@ sub save_nickservnick {
 
     if (-e $file) {
         local *F;
-        open(F, ">$file");
+        open(F, ">", $file);
 
         for (my $n = 0; $n < @nickservauth; ++$n) {
             print(F join("\t", $nickservauth[$n]->{ircnet}, $nickservauth[$n]->{nick}, $nickservauth[$n]->{pass}) . "\n");
@@ -214,7 +214,7 @@ sub create_nick_file {
     my ($file) = @_;
 
     my $umask = umask 0077; # save old umask
-    open(F, ">$file") or die "Can't create $file. Reason: $!";
+    open(F, ">", $file) or die "Can't create $file. Reason: $!";
     umask $umask;
 }
 
@@ -231,7 +231,7 @@ sub new_nickserv_nick {
 
 sub add_nickname {
 
-    my ($network, $nickname, $password) = split(" ", @_[0], 3);
+    my ($network, $nickname, $password) = split(" ", $_[0], 3);
     my ($correct_network, $correct_nickname, $correct_password);
 
     if ($network eq "" || $nickname eq "" || $password eq "") {
@@ -267,7 +267,7 @@ sub add_nickname {
 
 sub add_network {
 
-    my ($network, $hostname) = split(" ", @_[0], 2);
+    my ($network, $hostname) = split(" ", $_[0], 2);
     my ($correct_net, $correct_host);
 
     if ($network eq "" || $hostname eq "") {
@@ -471,7 +471,7 @@ sub get_password {
 
 sub del_network {
 
-    my ($ircnet) = split(" ", @_[0], 1);
+    my ($ircnet) = split(" ", $_[0], 1);
     my ($ircnetindex);
 
     if ($ircnet eq "") {
@@ -498,7 +498,7 @@ sub del_network {
 
 sub del_nickname {
 
-    my ($ircnet, $nickname) = split(" ", @_[0], 2);
+    my ($ircnet, $nickname) = split(" ", $_[0], 2);
     my ($nickindex);
 
     if ($ircnet eq "" || $nickname eq "") {

diff --git a/scripts/nm.pl b/scripts/nm.pl
@@ -413,7 +413,7 @@ ()
 
 # load colors from file
 sub load_colors() {
-	open(FID, "<".$ENV{HOME}."/.irssi/saved_colors") || return;
+	open(FID, "<", $ENV{HOME}."/.irssi/saved_colors") || return;
 
 	while (<FID>) {
 		chomp;
@@ -434,7 +434,7 @@ ()
 
 # save colors to file
 sub save_colors() {
-	open(FID, ">".$ENV{HOME}."/.irssi/saved_colors");
+	open(FID, ">", $ENV{HOME}."/.irssi/saved_colors");
 
 	print FID $_.":".$saved_colors{$_}."\n" foreach (keys(%saved_colors));