Pass total into constructor properly

virtualmin · Jul 28, 2017 · 3315e17 · 3315e17
1 parent e5fdeb8
commit 3315e17
Show file tree

Hide file tree

Showing 31 changed files with 61 additions and 61 deletions.
diff --git a/lib/Virtualmin/Config.pm b/lib/Virtualmin/Config.pm
@@ -53,12 +53,12 @@ sub run {
 
   my @plugins = $self->_gather_plugins();
   @plugins = $self->_order_plugins(@plugins);
-  my $total = $#plugins;
+  my $total = scalar @plugins;
   $log->info("Total plugins to be run: $total");
   for (@plugins) {
     my $pkg = "Virtualmin::Config::Plugin::$_";
     load $pkg || die "Loading Plugin failed: $_";
-    my $plugin = $pkg->new({$total => $total});
+    my $plugin = $pkg->new({total => $total});
     $plugin->actions();
     if ($self->{test} && $plugin->can('tests')) {
       $plugin->tests();

diff --git a/lib/Virtualmin/Config/Plugin/AWStats.pm b/lib/Virtualmin/Config/Plugin/AWStats.pm
@@ -10,7 +10,7 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
   my $self = $class->SUPER::new(name => 'AWStats', depends => ['Apache']);

diff --git a/lib/Virtualmin/Config/Plugin/Apache.pm b/lib/Virtualmin/Config/Plugin/Apache.pm
@@ -10,10 +10,10 @@ our $trust_unknown_referers = 1;
 my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Apache');
+  my $self = $class->SUPER::new(name => 'Apache', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Bind.pm b/lib/Virtualmin/Config/Plugin/Bind.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Bind');
+  my $self = $class->SUPER::new(name => 'Bind', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/ClamAV.pm b/lib/Virtualmin/Config/Plugin/ClamAV.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'ClamAV');
+  my $self = $class->SUPER::new(name => 'ClamAV', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Dovecot.pm b/lib/Virtualmin/Config/Plugin/Dovecot.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Dovecot');
+  my $self = $class->SUPER::new(name => 'Dovecot', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Fail2ban.pm b/lib/Virtualmin/Config/Plugin/Fail2ban.pm
@@ -11,10 +11,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Fail2ban', depends => ['Firewall']);
+  my $self = $class->SUPER::new(name => 'Fail2ban', depends => ['Firewall'], %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Fail2banFirewalld.pm b/lib/Virtualmin/Config/Plugin/Fail2banFirewalld.pm
@@ -14,10 +14,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Fail2banFirewalld', depends => ['Firewalld']);
+  my $self = $class->SUPER::new(name => 'Fail2banFirewalld', depends => ['Firewalld'], %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Firewall.pm b/lib/Virtualmin/Config/Plugin/Firewall.pm
@@ -11,10 +11,10 @@ our $trust_unknown_referers = 1;
 my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Firewall');
+  my $self = $class->SUPER::new(name => 'Firewall', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Firewalld.pm b/lib/Virtualmin/Config/Plugin/Firewalld.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Firewalld');
+  my $self = $class->SUPER::new(name => 'Firewalld', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/MySQL.pm b/lib/Virtualmin/Config/Plugin/MySQL.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'MySQL');
+  my $self = $class->SUPER::new(name => 'MySQL', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/NTP.pm b/lib/Virtualmin/Config/Plugin/NTP.pm
@@ -7,10 +7,10 @@ use Time::HiRes qw( sleep );
 my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'NTP');
+  my $self = $class->SUPER::new(name => 'NTP', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Net.pm b/lib/Virtualmin/Config/Plugin/Net.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Net');
+  my $self = $class->SUPER::new(name => 'Net', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Nginx.pm b/lib/Virtualmin/Config/Plugin/Nginx.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Nginx');
+  my $self = $class->SUPER::new(name => 'Nginx', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Postfix.pm b/lib/Virtualmin/Config/Plugin/Postfix.pm
@@ -11,10 +11,10 @@ our $trust_unknown_referers = 1;
 my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Postfix', depends => ['Net']);
+  my $self = $class->SUPER::new(name => 'Postfix', depends => ['Net'], %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/PostgreSQL.pm b/lib/Virtualmin/Config/Plugin/PostgreSQL.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'PostgreSQL');
+  my $self = $class->SUPER::new(name => 'PostgreSQL', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/ProFTPd.pm b/lib/Virtualmin/Config/Plugin/ProFTPd.pm
@@ -11,10 +11,10 @@ our $trust_unknown_referers = 1;
 my $log = Log::Log4perl->get_logger("virtualmin-config-system");
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'ProFTPd');
+  my $self = $class->SUPER::new(name => 'ProFTPd', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Procmail.pm b/lib/Virtualmin/Config/Plugin/Procmail.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Procmail');
+  my $self = $class->SUPER::new(name => 'Procmail', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Quotas.pm b/lib/Virtualmin/Config/Plugin/Quotas.pm
@@ -11,10 +11,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Quotas');
+  my $self = $class->SUPER::new(name => 'Quotas', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/SASL.pm b/lib/Virtualmin/Config/Plugin/SASL.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'SASL');
+  my $self = $class->SUPER::new(name => 'SASL', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/SELinux.pm b/lib/Virtualmin/Config/Plugin/SELinux.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'SELinux');
+  my $self = $class->SUPER::new(name => 'SELinux', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Shells.pm b/lib/Virtualmin/Config/Plugin/Shells.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Shells');
+  my $self = $class->SUPER::new(name => 'Shells', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/SpamAssassin.pm b/lib/Virtualmin/Config/Plugin/SpamAssassin.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'SpamAssassin');
+  my $self = $class->SUPER::new(name => 'SpamAssassin', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Status.pm b/lib/Virtualmin/Config/Plugin/Status.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Status');
+  my $self = $class->SUPER::new(name => 'Status', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Test.pm b/lib/Virtualmin/Config/Plugin/Test.pm
@@ -7,10 +7,10 @@ use parent 'Virtualmin::Config::Plugin';
 use Log::Log4perl;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Test');
+  my $self = $class->SUPER::new(name => 'Test', %args);
   return $self;
 }
 

diff --git a/lib/Virtualmin/Config/Plugin/Test2.pm b/lib/Virtualmin/Config/Plugin/Test2.pm
@@ -5,10 +5,10 @@ use 5.010;
 use parent qw(Virtualmin::Config::Plugin);
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Test2', depends => ['Test']);
+  my $self = $class->SUPER::new(name => 'Test2', depends => ['Test'], %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Upgrade.pm b/lib/Virtualmin/Config/Plugin/Upgrade.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Upgrade');
+  my $self = $class->SUPER::new(name => 'Upgrade', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Usermin.pm b/lib/Virtualmin/Config/Plugin/Usermin.pm
@@ -9,10 +9,10 @@ our (%gconfig, %uconfig, %uminiserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Usermin');
+  my $self = $class->SUPER::new(name => 'Usermin', %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Virtualmin.pm b/lib/Virtualmin/Config/Plugin/Virtualmin.pm
@@ -9,10 +9,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Virtualmin', depends => ['Usermin']);
+  my $self = $class->SUPER::new(name => 'Virtualmin', depends => ['Usermin'], %args);
 
   return $self;
 }

diff --git a/lib/Virtualmin/Config/Plugin/Webalizer.pm b/lib/Virtualmin/Config/Plugin/Webalizer.pm
@@ -10,10 +10,10 @@ our (%gconfig, %miniserv);
 our $trust_unknown_referers = 1;
 
 sub new {
-  my $class = shift;
+  my ($class, %args) = @_;
 
   # inherit from Plugin
-  my $self = $class->SUPER::new(name => 'Webalizer');
+  my $self = $class->SUPER::new(name => 'Webalizer', %args);
 
   return $self;
 }