Don't require servers module unless needed

diff --git a/cluster-copy/cluster-copy-lib.pl b/cluster-copy/cluster-copy-lib.pl
index 21a3040..d05d3c4 100755 (executable)
--- a/cluster-copy/cluster-copy-lib.pl
+++ b/cluster-copy/cluster-copy-lib.pl
@@ -5,7 +5,6 @@ BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
 &foreign_require("cron", "cron-lib.pl");
-&foreign_require("servers", "servers-lib.pl");
 &foreign_require("mailboxes", "mailboxes-lib.pl");
 
 $cron_cmd = "$module_config_directory/copy.pl";
@@ -66,6 +65,7 @@ local @rv;
 local $func = $_[1];
 
 # Work out which servers to run on
+&foreign_require("servers", "servers-lib.pl");
 local @servers = &servers::list_servers_sorted();
 local @groups = &servers::list_all_groups(\@servers);
 local @run;

diff --git a/cluster-copy/edit.cgi b/cluster-copy/edit.cgi
index d1cbdc2..1cd4f25 100755 (executable)
--- a/cluster-copy/edit.cgi
+++ b/cluster-copy/edit.cgi
@@ -3,6 +3,7 @@
 
 require './cluster-copy-lib.pl';
 &ReadParse();
+&foreign_require("servers", "servers-lib.pl");
 
 if (!$in{'new'}) {
        $copy = &get_copy($in{'id'});