strict/warn

Author: swelljoe

add.cgi

@@ -1,5 +1,9 @@
 #!/usr/local/bin/perl
 # Add a new mailing list, and record it
+use strict;
+use warnings;
+our (%access, %text, %in);
+our $remote_user;
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
@@ -11,22 +15,22 @@ $in{'list'} =~ /^[a-z0-9\.\-\_]+$/i || &error($text{'add_ename'});
 if ($in{'list'} ne 'mailman') {
 	$in{'dom'} =~ /^[a-z0-9\.\-]+$/i || &error($text{'add_edom'});
 	}
-@lists = &list_lists();
-($clash) = grep { $_->{'list'} eq $in{'list'} } @lists;
+my @lists = &list_lists();
+my ($clash) = grep { $_->{'list'} eq $in{'list'} } @lists;
 $clash && &error($text{'add_eclash'});
 $in{'email_def'} || $in{'email'} =~ /^\S+\@\S+$/ || &error($text{'add_eemail'});
 $in{'pass_def'} || $in{'pass'} =~ /\S/ || &error($text{'add_epass'});
 
 # Check limit on lists
-@alllists = &list_lists();
+my @alllists = &list_lists();
 @lists = grep { &can_edit_list($_) } @alllists;
 if ($access{'max'} && @lists >= $access{'max'}) {
 	&error($text{'index_max'});
 	}
 
 if ($in{'list'} eq 'mailman') {
 	# The special 'mailman' list has no domain
-	$err = &create_list($in{'list'}, $in{'dom'},
+	my $err = &create_list($in{'list'}, $in{'dom'},
 			    "Mailman administration list",
 			    undef, $in{'email'}, $in{'pass'});
 	&error($err) if ($err);
@@ -36,30 +40,31 @@ if ($in{'list'} eq 'mailman') {
 	if (&init::action_status("mailman")) {
 		&init::enable_at_boot("mailman");
 		&init::stop_action("mailman");
-		($ok, $err) = &init::start_action("mailman");
-		&error(&text('add_einit', "<pre>".&html_escape($out)."</pre>"))
+		my ($ok, $err) = &init::start_action("mailman");
+		&error(&text('add_einit', "<pre>".&html_escape($err)."</pre>"))
 			if (!$ok);
 		}
 	}
 else {
 	# Get the Virtualmin domain
-	$vdom = &virtual_server::get_domain_by("dom", $in{'dom'});
+	my $vdom = &virtual_server::get_domain_by("dom", $in{'dom'});
+	my $parentdom;
 	$vdom || &error($text{'add_evdom'});
 	if ($vdom->{'parent'}) {
 		$parentdom = &virtual_server::get_domain($vdom->{'parent'});
 		}
 
 	# Check for a clash on aliases or users
-	@aliases = &virtual_server::list_virtusers();
-	@clash = grep {
+	my @aliases = &virtual_server::list_virtusers();
+	my @clash = grep {
 		$_->{'from'} eq $in{'list'}.'@'.$vdom->{'dom'} ||
 		$_->{'from'} =~ /^\Q$in{'list'}\E\-.*\@\Q$vdom->{'dom'}\E/
 		      } @aliases;
 	if (@clash) {
 		&error(&text('add_ealiases',
 			join(" ", map { $_->{'from'} } @clash)));
 		}
-	@users = &virtual_server::list_domain_users($vdom);
+	my @users = &virtual_server::list_domain_users($vdom);
 	@clash = grep {
 		$_->{'email'} eq $in{'list'}.'@'.$vdom->{'dom'} ||
 		$_->{'email'} =~ /^\Q$in{'list'}\E\-.*\@\Q$vdom->{'dom'}\E/
@@ -70,10 +75,10 @@ else {
 		}
 
 	# Create the list
-	$pass = $in{'pass_def'} && $parentdom ? $parentdom->{'pass'} :
+	my $pass = $in{'pass_def'} && $parentdom ? $parentdom->{'pass'} :
 		$in{'pass_def'} ? $vdom->{'pass'} : $in{'pass'};
 	$pass || &error(&text('add_epass2', $vdom->{'dom'}));
-	$err = &create_list($in{'list'}, $in{'dom'}, $in{'desc'}, $in{'lang'},
+	my $err = &create_list($in{'list'}, $in{'dom'}, $in{'desc'}, $in{'lang'},
 		    $in{'email_def'} && $vdom->{'emailto'} ? $vdom->{'emailto'}:
 		    $in{'email_def'} ? "$remote_user\@$in{'dom'}" :
 				       $in{'email'},
@@ -82,4 +87,3 @@ else {
 	}
 
 &redirect("index.cgi?show=$in{'show'}");
-

add_member.cgi

@@ -1,20 +1,22 @@
 #!/usr/local/bin/perl
 # Add one list member
+use strict;
+use warnings;
+our (%text, %in);
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
 &error_setup($text{'addmem_err'});
-@lists = &list_lists();
-($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
+my @lists = &list_lists();
+my ($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
 &can_edit_list($list) || &error($text{'mems_ecannot'});
 
 # Validate and store inputs
 $in{'email'} =~ /^\S+$/ || &error($text{'addmem_eemail'});
-$mem = { 'email' => $in{'email'},
+my $mem = { 'email' => $in{'email'},
 	 'digest' => $in{'digest'},
 	 'welcome' => $in{'welcome'},
 	 'admin' => $in{'admin'} };
-$err = &add_member($mem, $list);
+my $err = &add_member($mem, $list);
 &error($err) if ($err);
 &redirect("list_mems.cgi?list=$in{'list'}&show=$in{'show'}");
-

admin.cgi

@@ -1,7 +1,14 @@
 #!/usr/local/bin/perl
 # Run a mailman CGI program, and display output with Webmin header
+use strict;
+use warnings;
+our (%text, %config);
+our $module_name;
+our $mailman_dir;
+our $doneheaders; # XXX I'm not sure about this one.
 
 require './virtualmin-mailman-lib.pl';
+my $lname;
 if ($ENV{'PATH_INFO'} =~ /^\/([^\/]+)(.*)/) {
 	$lname = $1;
 	}
@@ -12,20 +19,21 @@ elsif ($ENV{'PATH_INFO'} eq '' || $ENV{'PATH_INFO'} eq '/') {
 else {
 	&error($text{'edit_eurl'});
 	}
-$prog = $ENV{'SCRIPT_NAME'};
+my $prog = $ENV{'SCRIPT_NAME'};
 $prog =~ s/^.*\///;
 $prog =~ s/\.cgi$//;
 
-@lists = &list_lists();
+my @lists = &list_lists();
+my $d;
 if ($lname) {
 	# Get the list, and from it the domain
-	($list) = grep { $_->{'list'} eq $lname } @lists;
+	my ($list) = grep { $_->{'list'} eq $lname } @lists;
 	&can_edit_list($list) || &error($text{'edit_ecannot'});
 	$d = &virtual_server::get_domain_by("dom", $list->{'dom'});
 	}
 else {
 	# Get the domain from the URL
-	$dname = $ENV{'HTTP_HOST'};
+	my $dname = $ENV{'HTTP_HOST'};
 	$dname =~ s/:\d+$//;
 	$d = &virtual_server::get_domain_by("dom", $dname);
 	if (!$d) {
@@ -35,10 +43,11 @@ else {
 	$dname || &error(&text('edit_edname', &html_escape($dname)));
 	}
 
-$cgiuser = &get_mailman_apache_user($d);
+my $cgiuser = &get_mailman_apache_user($d);
+my ($prot, $httphost);
 if ($config{'rewriteurl'}) {
 	# Custom URL for Mailman, perhaps if behind proxy
-	($httphost, $httpport, $httppage, $httpssl) =
+	my ($httphost, $httpport, $httppage, $httpssl) =
 		&parse_http_url($config{'rewriteurl'});
 	$httphost .= ":".$httpport if ($httpport != ($httpssl ? 443 : 80));
 	$prot = $httpssl ? "https" : "http";
@@ -54,27 +63,29 @@ else {
 	}
 
 # Work out possible hostnames for URLs
-@realhosts = ( &get_system_hostname(),
+my @realhosts = ( &get_system_hostname(),
 	       $httphost,
 	       (map { $_->{'dom'} } grep { $_->{$module_name} }
 			&virtual_server::list_domains()) );
 
 # Read posted data
-$temp = &transname();
-open(TEMP, ">$temp");
+my $temp = &transname();
+open(my $TEMP, ">", "$temp");
+my $qs;
 if (defined(&read_fully)) {
-	&read_fully(STDIN, \$qs, $ENV{'CONTENT_LENGTH'});
+	&read_fully($STDIN, \$qs, $ENV{'CONTENT_LENGTH'});
 	}
 else {
 	read(STDIN, $qs, $ENV{'CONTENT_LENGTH'});
 	}
-print TEMP $qs;
-close(TEMP);
+print $TEMP $qs;
+close($TEMP);
 
 # Run the real command, and fix up output
-$cmd = &command_as_user($cgiuser, 0, "$mailman_dir/cgi-bin/$prog");
-$textarea = 0;
-open(CGI, "$cmd <$temp |");
+my $cmd = &command_as_user($cgiuser, 0, "$mailman_dir/cgi-bin/$prog");
+my $textarea = 0;
+my ($headers, $body);
+open(my $CGI, "<", "$cmd <$temp |");
 while(<CGI>) {
 	# Check if we are in a textarea
 	if (/<textarea/i) { $textarea = 1; }
@@ -86,7 +97,7 @@ while(<CGI>) {
 			s/\/(cgi-bin\/)?mailman\/([^\/ "']+)\.cgi/\/$module_name\/$2.cgi/g || s/\/(cgi-bin\/)?mailman\/([^\/ "']+)([\/ "'])/\/$module_name\/$2.cgi$3/g;
 			}
                 if (!/pipermail/) {
-			foreach $realhost (@realhosts) {
+			foreach my $realhost (@realhosts) {
 				s/(http|https):\/\/$realhost\//$prot:\/\/$httphost\//g && last;
 				}
 			s/(http|https):\/\/(lists\.)?$d->{'dom'}\//$prot:\/\/$httphost\//g;
@@ -109,6 +120,7 @@ while(<CGI>) {
 close(CGI);
 
 print $headers;
+my $title;
 if ($body =~ /<title>([^>]*)<\/title>/i) {
 	$title = $1;
 	}
@@ -117,5 +129,3 @@ $body =~ s/<\/body[^>]*>[\000-\377]*//i;
 &ui_print_header(undef, $title, "");
 print $body;
 &ui_print_footer("", $text{'index_return'});
-
-

cgi_args.pl

@@ -1,3 +1,6 @@
+use strict;
+use warnings;
+our $module_name;
 
 do 'virtualmin-mailman-lib.pl';
 

delete.cgi

@@ -1,12 +1,15 @@
 #!/usr/local/bin/perl
 # Remove one mailing list
+use strict;
+use warnings;
+our (%text, %in, %config);
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
 &error_setup($text{'delete_err'});
 
-@lists = &list_lists();
-($listname) = grep { $_ ne "confirm" && $_ ne "show" } keys %in;
+my @lists = &list_lists();
+my ($listname) = grep { $_ ne "confirm" && $_ ne "show" } keys %in;
 
 if ($listname =~ /^mems_(\S+)$/) {
 	# Actually editing members .. redirect
@@ -17,8 +20,8 @@ elsif ($listname =~ /^man_(\S+)$/) {
 	# Actually managing list .. redirect
 	if ($config{'manage_url'}) {
 		# Custom URL
-		($list) = grep { $_->{'list'} eq $1 } @lists;
-		$d = &virtual_server::get_domain_by("dom", $list->{'dom'});
+		my ($list) = grep { $_->{'list'} eq $1 } @lists;
+		my $d = &virtual_server::get_domain_by("dom", $list->{'dom'});
 		&redirect(&virtual_server::substitute_domain_template(
 				$config{'manage_url'}, $d));
 		}
@@ -36,9 +39,9 @@ elsif ($listname =~ /^reset_(\S+)$/) {
 
 # Get the list
 $listname eq "mailman" && &error($text{'delete_emailman'});
-($list) = grep { $_->{'list'} eq $listname } @lists;
+my ($list) = grep { $_->{'list'} eq $listname } @lists;
 &can_edit_list($list) || &error($text{'delete_ecannot'});
-$d = &virtual_server::get_domain_by("dom", $list->{'dom'});
+my $d = &virtual_server::get_domain_by("dom", $list->{'dom'});
 $d || &error($text{'delete_edon'});
 
 if (!$in{'confirm'}) {
@@ -53,9 +56,8 @@ if (!$in{'confirm'}) {
 	}
 else {
 	# Do it
-	$err = &delete_list($listname, $list->{'dom'});
+	my $err = &delete_list($listname, $list->{'dom'});
 	&error($err) if ($err);
 
 	&redirect("");
 	}
-

delete_member.cgi

@@ -1,18 +1,21 @@
 #!/usr/local/bin/perl
 # Delete one list member
+use strict;
+use warnings;
+our (%text, %in);
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
 &error_setup($text{'deletemem_err'});
-@lists = &list_lists();
-($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
+my @lists = &list_lists();
+my ($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
 &can_edit_list($list) || &error($text{'mems_ecannot'});
 
-@mems = &list_members($list);
-($email) = grep { $_ ne "list" && $_ ne "show" } (keys %in);
-($mem) = grep { $_->{'email'} eq $email } @mems;
+my @mems = &list_members($list);
+my ($email) = grep { $_ ne "list" && $_ ne "show" } (keys %in);
+my ($mem) = grep { $_->{'email'} eq $email } @mems;
 $mem || &error($text{'deletemem_emem'});
 
-$err = &remove_member($mem, $list);
+my $err = &remove_member($mem, $list);
 &error($err) if ($err);
 &redirect("list_mems.cgi?list=$in{'list'}&show=$in{'show'}");

export_mems.cgi

@@ -1,14 +1,16 @@
 #!/usr/local/bin/perl
 # Output text list of members
+use strict;
+use warnings;
+our (%text, %in);
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
-@lists = &list_lists();
-($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
+my @lists = &list_lists();
+my ($list) = grep { $_->{'list'} eq $in{'list'} } @lists;
 &can_edit_list($list) || &error($text{'mems_ecannot'});
 
 print "Content-type: text/plain\n\n";
-foreach $m (&list_members($list)) {
+foreach my $m (&list_members($list)) {
 	print $m->{'email'},"\n";
 	}
-

fixurls.cgi

@@ -1,13 +1,17 @@
 #!/usr/local/bin/perl
 # Fix Webmin redirect URLs on a list of domains
+use strict;
+use warnings;
+our (%text, %in);
+our $module_name;
 
 require './virtualmin-mailman-lib.pl';
 &ReadParse();
 
 # Get all the domains
-@doms = ( );
-foreach $id (split(/\0/, $in{'d'})) {
-	$d = &virtual_server::get_domain($id);
+my @doms = ( );
+foreach my $id (split(/\0/, $in{'d'})) {
+	my $d = &virtual_server::get_domain($id);
 	if ($d && &virtual_server::can_edit_domain($d) && $d->{$module_name}) {
 		push(@doms, $d);
 		}
@@ -16,11 +20,11 @@ foreach $id (split(/\0/, $in{'d'})) {
 # Fix them, showing progress
 &ui_print_header(undef, $text{'fixurls_title'}, "");
 
-foreach $d (@doms) {
+foreach my $d (@doms) {
 	print &text('fixurls_fixing', $d->{'dom'},
 		    &get_mailman_webmin_url($d)),"<br>\n";
 	&virtual_server::obtain_lock_web($d);
-	$err = &fix_webmin_mailman_urls($d);
+	my $err = &fix_webmin_mailman_urls($d);
 	if ($err) {
 		print &text('fixurls_failed', $err),"<p>\n";
 		}
@@ -34,4 +38,3 @@ foreach $d (@doms) {
 &webmin_log("fixurls");
 
 &ui_print_footer("", $text{'index_return'});
-