Skip to content

Commit

Permalink
ServerDefaultPage: Enhancement: Only trigger listener if status is en…
Browse files Browse the repository at this point in the history
…abled
  • Loading branch information
Ninos Ego committed Mar 19, 2016
1 parent ca3d4f8 commit c555e0b
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 5 deletions.
6 changes: 6 additions & 0 deletions incubator/ServerDefaultPage/CHANGELOG
@@ -1,6 +1,12 @@
ServerDefaultPage - ChangeLog
=============================

------------------------------------------------------------------------------------------------------------------------
Version 1.2.3
------------------------------------------------------------------------------------------------------------------------

Enhancement: Only trigger listener if status is enabled

------------------------------------------------------------------------------------------------------------------------
Version 1.2.2
------------------------------------------------------------------------------------------------------------------------
Expand Down
35 changes: 32 additions & 3 deletions incubator/ServerDefaultPage/backend/ServerDefaultPage.pm
Expand Up @@ -177,6 +177,21 @@ sub disable
0;
}

=item run()
Process plugin tasks
Return int 0 on success, other on failure
=cut

sub run
{
my $self = shift;

$self->_registerListeners();
}

=item onAddIps()
Process onAddIps tasks
Expand Down Expand Up @@ -216,12 +231,26 @@ sub _init
$self->{'httpd'} = Servers::httpd->factory();
}

my $eventManager = iMSCP::EventManager->getInstance();
$eventManager->register('afterHttpdAddIps', \&onAddIps);

$self;
}

=item _registerListeners()
Register required event listeners
Return int 0
=cut

sub _registerListeners
{
my $self = shift;

$self->{'eventManager'}->register('afterHttpdAddIps', \&onAddIps);

0

This comment has been minimized.

Copy link
@nuxwin

nuxwin Mar 19, 2016

Member

@Ninos

No need to return 0 here. Expression result from above line will return 0 on success, other on failure. By returning 0 explicitely here, any error occurring during listener regisration would be hidden...

This comment has been minimized.

Copy link
@Ninos

Ninos Mar 20, 2016

Author Contributor

Ok I'll fix that, thx

}

=item _createConfig($vhostTplFile, $directives)
Create httpd configs
Expand Down
4 changes: 2 additions & 2 deletions incubator/ServerDefaultPage/info.php
Expand Up @@ -22,8 +22,8 @@
'author' => 'Ninos Ego',
'email' => 'me@ninosego.de',
'version' => '1.2.2',
'require_api' => '1.0.3',
'date' => '2016-03-12',
'require_api' => '1.0.4',
'date' => '2016-03-19',
'name' => 'ServerDefaultPage',
'desc' => 'Plugin which allows to set a server default page.',
'url' => 'http://wiki.i-mscp.net/doku.php?id=plugins:serverdefaultpage'
Expand Down

0 comments on commit c555e0b

Please sign in to comment.