From a09b1a665df7cbbf01b63b477bde04cc19a3ea5c Mon Sep 17 00:00:00 2001 From: Laurent Declercq Date: Sun, 31 Jul 2016 09:18:11 +0200 Subject: [PATCH] Fixed: Global symbol "$host" requires explicit package name [ci skip] --- engine/PerlLib/Package/PhpMyAdmin/Uninstaller.pm | 4 +--- engine/PerlLib/Package/Webmail/RainLoop/Uninstaller.pm | 2 +- engine/PerlLib/Servers/po/courier/uninstaller.pm | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/engine/PerlLib/Package/PhpMyAdmin/Uninstaller.pm b/engine/PerlLib/Package/PhpMyAdmin/Uninstaller.pm index 6a065e7728..567ba8da9b 100644 --- a/engine/PerlLib/Package/PhpMyAdmin/Uninstaller.pm +++ b/engine/PerlLib/Package/PhpMyAdmin/Uninstaller.pm @@ -101,9 +101,7 @@ sub _removeSqlUser my $self = shift; return 0 unless $self->{'config'}->{'DATABASE_USER'} && $main::imscpConfig{'DATABASE_USER_HOST'}; - Servers::sqld->factory()->dropUser( - $self->{'config'}->{'DATABASE_USER'}, $main::imscpConfig{'DATABASE_USER_HOST'} - ); + Servers::sqld->factory()->dropUser( $self->{'config'}->{'DATABASE_USER'}, $main::imscpConfig{'DATABASE_USER_HOST'} ); } =item _removeSqlDatabase() diff --git a/engine/PerlLib/Package/Webmail/RainLoop/Uninstaller.pm b/engine/PerlLib/Package/Webmail/RainLoop/Uninstaller.pm index d8e4ea056e..bd2c4489c7 100644 --- a/engine/PerlLib/Package/Webmail/RainLoop/Uninstaller.pm +++ b/engine/PerlLib/Package/Webmail/RainLoop/Uninstaller.pm @@ -102,7 +102,7 @@ sub _removeSqlUser for ( $main::imscpConfig{'DATABASE_USER_HOST'}, $main::imscpConfig{'BASE_SERVER_IP'}, 'localhost', '127.0.0.1', '%' ) { - next unless $host; + next unless $_; $sqlServer->dropUser( $self->{'rainloop'}->{'config'}->{'DATABASE_USER'}, $_ ); } diff --git a/engine/PerlLib/Servers/po/courier/uninstaller.pm b/engine/PerlLib/Servers/po/courier/uninstaller.pm index 8bfc96c757..813797e028 100644 --- a/engine/PerlLib/Servers/po/courier/uninstaller.pm +++ b/engine/PerlLib/Servers/po/courier/uninstaller.pm @@ -55,9 +55,7 @@ sub _removeSqlUser my $sqlServer = Servers::sqld->factory(); - for ( - $main::imscpConfig{'DATABASE_USER_HOST'}, $main::imscpConfig{'BASE_SERVER_IP'}, 'localhost', '127.0.0.1', '%' - ) { + for ($main::imscpConfig{'DATABASE_USER_HOST'}, $main::imscpConfig{'BASE_SERVER_IP'}, 'localhost', '127.0.0.1', '%') { next unless $_; if ($self->{'config'}->{'AUTHDAEMON_DATABASE_USER'}) {