strict/warn

Author: swelljoe

acl_security.pl

@@ -1,6 +1,8 @@
+use strict;
+use warnings;
+our (%text, %in);
 
 do 'virtualmin-nginx-lib.pl';
-our (%in);
 
 # acl_security_form(&options)
 # Output HTML for editing security options for the acl module
@@ -56,4 +58,3 @@ sub acl_security_save
 $o->{'user'} = $in{'user'};
 $o->{'stop'} = $in{'stop'};
 }
-

fetch-directives.pl

@@ -1,4 +1,6 @@
 #!/usr/bin/perl
+use strict;
+use warnings;
 
 my @mods;
 my %donemod;
@@ -14,6 +16,7 @@
 	}
 push(@mods, [ "CoreModule", "core" ]);
 
+my @dirs;
 foreach my $m (@mods) {
 	my ($page, $mod) = @$m;
 	my $dir;

php-loop.pl

@@ -1,21 +1,23 @@
 #!/usr/bin/perl
 # Simple script to run a sub-process in a loop
-
+use strict;
+use warnings;
 use POSIX;
 
-$dead = 0;
+my $dead = 0;
+my $childpid;
 
 $SIG{'TERM'} = sub { $dead = 1;
-		     if ($childpid) {
-			kill(TERM, $childpid);
-			sleep(1);	# Give it time to clean up
-			kill(KILL, $childpid);
-		        }
-		     exit(1);
+if ($childpid) {
+	kill('TERM', $childpid);
+	sleep(1);	# Give it time to clean up
+	kill('KILL', $childpid);
+  }
+ exit(1);
 		   };
 
 while(!$dead) {
-	$start = time();
+	my $start = time();
 	$childpid = fork();
 	if ($childpid == 0) {
 		exec(@ARGV);
@@ -27,4 +29,3 @@
 		sleep(5);
 		}
 	}
-

virtual_feature.pl

@@ -204,7 +204,7 @@ sub feature_setup
 		my $temp = &transname();
 		my $fh = "EXTRA";
 		&open_tempfile($fh, ">$temp", 0, 1);
-		&print_tempfile($fh, 
+		&print_tempfile($fh,
 			join("\n", split(/\t+/, $config{'extra_dirs'}))."\n");
 		&close_tempfile($fh);
 		my $econf = &read_config_file($temp);
@@ -735,8 +735,10 @@ sub feature_disable
 		&open_lock_tempfile($fh, ">$dis");
 		&print_tempfile($fh, $msg);
 		&close_tempfile($fh);
+		no warnings "once";
 		&set_ownership_permissions(
 			undef, undef, 0644, $virtual_server::disabled_website);
+		use warnings "once";
 
 		# Add location to force use of it
 		if (!$clash) {
@@ -1218,27 +1220,30 @@ sub feature_bandwidth
 foreach my $l (&unique(@logs)) {
 	foreach my $f (&virtual_server::all_log_files($l, $max_ltime)) {
 		local $_;
+		my $LOG;
 		if ($f =~ /\.gz$/i) {
-			open(LOG, "gunzip -c ".quotemeta($f)." |");
+			open($LOG, "<", "gunzip -c ".quotemeta($f)." |");
 			}
 		elsif ($f =~ /\.Z$/i) {
-			open(LOG, "uncompress -c ".quotemeta($f)." |");
+			open($LOG, "<", "uncompress -c ".quotemeta($f)." |");
 			}
 		else {
-			open(LOG, $f);
+			open($LOG, "<", $f);
 			}
-		while(<LOG>) {
+		while(<$LOG>) {
 			if (/^(\S+)\s+(\S+)\s+(\S+)\s+\[(\d+)\/(\S+)\/(\d+):(\d+):(\d+):(\d+)\s+(\S+)\]\s+"([^"]*)"\s+(\S+)\s+(\S+)/ && $12 ne "206") {
 				# Valid-looking log line .. work out the time
+				no warnings "once";
 				my $ltime = timelocal($9, $8, $7, $4, $virtual_server::apache_mmap{lc($5)}, $6-1900);
+				use warnings "once";
 				if ($ltime > $start) {
 					my $day = int($ltime / (24*60*60));
 					$bwinfo->{"web_".$day} += $13;
 					}
 				$max_ltime = $ltime if ($ltime > $max_ltime);
 				}
 			}
-		close(LOG);
+		close($LOG);
 		}
 	}
 return $max_ltime;
@@ -1869,7 +1874,7 @@ sub feature_backup
 &virtual_server::close_tempfile_as_domain_user($d, $fh);
 if ($server->{'file'} eq &get_add_to_file($d->{'dom'}) &&
     -d $config{'add_to'}) {
-	# Domain has it's own file, so save it completely for use 
+	# Domain has it's own file, so save it completely for use
 	# when restoring
 	&virtual_server::copy_write_as_domain_user(
 		$server->{'file'}, $file."_complete");
@@ -2342,4 +2347,3 @@ sub fix_server_name_line
 }
 
 1;
-

virtualmin-nginx-lib.pl

@@ -502,7 +502,7 @@ sub list_nginx_directives
 			"$module_root_directory/nginx-directives", 1);
 	foreach my $l (@$lref) {
 		my ($module, $name, $default, $context) = split(/\t/, $l);
-		$list_directives_cache{$name} = 
+		$list_directives_cache{$name} =
 			{ 'module' => $module,
 			  'name' => $name,
 			  'default' => $default eq '-' ? undef : $default,
@@ -1607,8 +1607,8 @@ sub start_php_fcgi_server_command
 	close(STDIN); close(STDOUT); close(STDERR);
 	my @u = getpwnam($d->{'user'});
 	&switch_to_unix_user(\@u);
-	open(STDOUT, ">>$log");
-	open(STDERR, ">&STDOUT");
+	open(STDOUT, ">>", "$log");
+	open(STDERR, ">", "&STDOUT");
 	&clean_environment();
 	foreach my $e (keys %$envs_to_set) {
 		$ENV{$e} = $envs_to_set->{$e};
@@ -1887,4 +1887,3 @@ sub recursive_clear_lines
 }
 
 1;
-