Prep for testing, add compile.t

backup.pl

@@ -2,6 +2,9 @@
 # Do a scheduled virtual server backup
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 $main::no_acl_check++;
 require './virtual-server-lib.pl';
 $host = &get_system_hostname();
@@ -338,6 +341,8 @@ package virtual_server;
 	      'failed' => !$ok,
 	      'sched' => $id, });
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # Override print functions to capture output
 sub first_save_print
 {

bwgraph.cgi

@@ -2,6 +2,8 @@
 # bwgraph.cgi
 # Show current bandwidth usage graphs
 
+unless (caller) {
+
 require './virtual-server-lib.pl';
 &ReadParse();
 
@@ -404,6 +406,8 @@ if (&can_edit_templates() && $in{'dom'}) {
 push(@rets, "", $text{'index_return'});
 &ui_print_footer(@rets);
 
+} # end of unless (caller)
+
 # usage_colours(&domain, &usage)
 sub usage_colours
 {

check-scripts.pl

@@ -11,6 +11,9 @@ =head1 check-scripts.pl
 =cut
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 if (!$module_name) {
 	$main::no_acl_check++;
 	$ENV{'WEBMIN_CONFIG'} ||= "/etc/webmin";
@@ -246,6 +249,8 @@ package virtual_server;
 		}
 	}
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 sub patch_file
 {
 my ($script_file, $script_name, $ver_curr, $ver_new) = @_;

downgrade-licence.pl

@@ -11,6 +11,9 @@ =head1 downgrade-licence.pl
 =cut
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 if (!$module_name) {
 	$main::no_acl_check++;
 	$ENV{'WEBMIN_CONFIG'} ||= "/etc/webmin";
@@ -167,6 +170,8 @@ package virtual_server;
 	&$first_print($text{'downgrade_gpl_all_done'});
 	}
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # lock_all_resellers()
 # Lock all reseller accounts
 sub lock_all_resellers

functional-test.pl

@@ -2,6 +2,9 @@
 # Runs all Virtualmin tests
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 if (!$module_name) {
 	$main::no_acl_check++;
 	$ENV{'WEBMIN_CONFIG'} ||= "/etc/webmin";
@@ -13320,6 +13323,8 @@ package virtual_server;
 	}
 exit($total_failed);
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 sub run_test
 {
 local ($t) = @_;

info.pl

@@ -25,6 +25,9 @@ =head1 info.pl
 =cut
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 if (!$module_name) {
 	$main::no_acl_check++;
 	$ENV{'WEBMIN_CONFIG'} ||= "/etc/webmin";
@@ -90,6 +93,8 @@ package virtual_server;
 	}
 &recursive_info_dump($info, "");
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 sub recursive_info_dump
 {
 local ($info, $indent) = @_;

link.cgi

@@ -321,6 +321,8 @@ if (!$$injected_ref) {
 return $chunk;
 }
 
+unless (caller) {
+
 &init_config();
 delete($ENV{'HTTP_REFERER'});
 $| = 1;
@@ -369,3 +371,5 @@ else {
 	}
 &close_http_connection($con);
 
+} # end of unless (caller)
+

list-config-revisions.pl

@@ -71,6 +71,13 @@ =head2 Options
 
 package virtual_server;
 
+# File-scope lexicals shared between the main body and the subs below.
+# Kept outside the VIRTUALMIN_NO_MAIN guard so subs see them when the
+# script is `require`d for testing without the main body running.
+my ($etcdir, $depth, $git_repo);
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 # If not loaded by Webmin, do standard Virtualmin environment prep
 if (!$module_name) {
 	$main::no_acl_check++;
@@ -88,7 +95,7 @@ package virtual_server;
 	}
 
 # Get /etc from environment
-my $etcdir = $ENV{'WEBMIN_CONFIG'};
+$etcdir = $ENV{'WEBMIN_CONFIG'};
 $etcdir =~ s/\/[^\/]+$//;
 
 # Disable HTML output
@@ -97,10 +104,10 @@ package virtual_server;
 # Parse command-line args
 &parse_common_cli_flags(\@ARGV);
 
-my $depth = 1;
+$depth = 1;
 my @module_files;
 my $module;
-my $git_repo = "$etcdir/.git";
+$git_repo = "$etcdir/.git";
 
 while(@ARGV > 0) {
 	my $a = shift(@ARGV);
@@ -162,6 +169,8 @@ package virtual_server;
 &do_list(\@source_paths, $depth, $git_repo);
 exit(0);
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # usage(msg)
 # Print usage message and exit
 sub usage

lookup-domain-daemon.pl

@@ -20,6 +20,11 @@ =head1 lookup-domain-daemon.pl
 =cut
 
 package virtual_server;
+use POSIX;
+use Socket;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 $main::no_acl_check++;
 $ENV{'WEBMIN_CONFIG'} ||= "/etc/webmin";
 $ENV{'WEBMIN_VAR'} ||= "/var/webmin";
@@ -33,8 +38,6 @@ package virtual_server;
 $no_virtualmin_plugins = 1;
 require './virtual-server-lib.pl';
 $< == 0 || die "lookup-domain-daemon.pl must be run as root";
-use POSIX;
-use Socket;
 
 # Parse command line
 $port = $config{'lookup_domain_port'} || $lookup_domain_port;
@@ -136,6 +139,8 @@ package virtual_server;
 		}
 	}
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 sub handle_one_request
 {
 # Read the username

quotas.pl

@@ -3,6 +3,9 @@
 # the admin for those that are over.
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 $main::no_acl_check++;
 $no_virtualmin_plugins = 1;
 require './virtual-server-lib.pl';
@@ -111,6 +114,8 @@ package virtual_server;
 		}
 	}
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # send_domain_quota_email(&message, address)
 # Converts a list of domain over-quota notifications into a message, and send it
 sub send_domain_quota_email

restore-config-revision.pl

@@ -93,6 +93,13 @@ =head2 Options
 
 package virtual_server;
 
+# File-scope lexical shared between the main body and the subs below.
+# Kept outside the VIRTUALMIN_NO_MAIN guard so subs see it when the
+# script is `require`d for testing without the main body running.
+my ($etcdir);
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 # If not loaded by Webmin, do standard Virtualmin environment prep
 if (!$module_name) {
 	$main::no_acl_check++;
@@ -110,7 +117,7 @@ package virtual_server;
 	}
 
 # Get /etc from environment
-my $etcdir = $ENV{'WEBMIN_CONFIG'};
+$etcdir = $ENV{'WEBMIN_CONFIG'};
 $etcdir =~ s/\/[^\/]+$//;
 
 # Disable HTML output
@@ -119,12 +126,10 @@ package virtual_server;
 # Parse command-line args
 &parse_common_cli_flags(\@ARGV);
 
-my $target_dir;
-my $dry_run;
-my $depth = 1;
+$depth = 1;
 my @module_files;
 my $module;
-my $git_repo = "$etcdir/.git";
+$git_repo = "$etcdir/.git";
 
 while(@ARGV > 0) {
 	my $a = shift(@ARGV);
@@ -199,6 +204,8 @@ package virtual_server;
 &do_restore(\@source_paths, $depth, $git_repo, $target_dir, $dry_run);
 exit(0);
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # usage(msg)
 # Print usage message and exit
 sub usage

spamtrap.pl

@@ -3,6 +3,9 @@
 # domains with spam emailed.
 
 package virtual_server;
+
+unless ($ENV{VIRTUALMIN_NO_MAIN}) {
+
 $main::no_acl_check++;
 $no_virtualmin_plugins = 1;
 require './virtual-server-lib.pl';
@@ -246,6 +249,8 @@ package virtual_server;
 	&clear_index_file($hamf->{'file'});
 	}
 
+} # end of unless ($ENV{VIRTUALMIN_NO_MAIN})
+
 # find_user_by_email(email, &users, &aliases)
 sub find_user_by_email
 {