Changeset 5821

Timestamp:

12/18/09 11:14:24 (2 years ago)

Author:

CrawfordCurrie

Message:

Item2511: make the new plugin into a micro-module. This allows us to init the plugin without loading the rest of the MailerContrib, which would be an unreasonable thing to do unless we were really going to use it. Note that this approach may not work with pre-1.1 code if it is run with ASSERTs enabled, because of a wayward assert in Plugins.pm

Location:

trunk/MailerContrib

Files:

• data/System/MailerContrib.txt (modified) (1 diff)
• lib/Foswiki/Contrib/MailerContrib.pm (modified) (2 diffs)
• lib/Foswiki/Contrib/MailerContrib/Config.spec (modified) (1 diff)
• lib/Foswiki/Contrib/MailerContrib/MANIFEST (modified) (1 diff)
• lib/Foswiki/Contrib/MailerContribPlugin.pm (added)

trunk/MailerContrib/data/System/MailerContrib.txt

@@ -250 +250 @@
 |  Release: | %$RELEASE% |
 |  Change History: | |
+|  18 Dec 2009 | Foswikitask:Item2511: make a new tiny plugin module, to reduce load time for when the mailer isn't used in a request |
 |  8 Dec 2009 | Foswikitask:Item8316: Added REST handler, Foswikitask:Item2473: Foswikitask:Item2480: doc & dead code tidy-ups |
 |  4 Dec 2009 | Foswikitask:Item8354: Martin Rowe fixed a problem with STARTPUBLISH in newsletters corrupting the template |

trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

@@ -27 +27 @@
 
 our $VERSION = '$Rev$';
-our $RELEASE = '8 Dec 2009';
+our $RELEASE = '18 Dec 2009';
 our $SHORTDESCRIPTION = 'Supports e-mail notification of changes';
 
@@ -38 +38 @@
     $Foswiki::cfg{MailerContrib}{EmailFilterIn} ||=
       $Foswiki::regex{emailAddrRegex};
-}
-
-# Plugin init method, used to initialise handlers
-sub initPlugin {
-    Foswiki::Func::registerRESTHandler('notify', \&_restNotify);
-    return 1;
-}
-
-# Run mailnotify using a rest handler
-sub _restNotify {
-    my ( $session, $plugin, $verb, $response ) = @_;
-
-    if (!Foswiki::Func::isAnAdmin()) {
-        $response->header( -status  => 403, -type => 'text/plain' );
-        $response->print("Only administrators can do that");
-    } else {
-        # Don't use the $response; we want to see things happening
-        local $| = 1; # autoflush on
-        require CGI;
-        print CGI::header( -status => 200, -type => 'text/plain' );
-        my $query = Foswiki::Func::getCgiQuery();
-        my $nonews = $query->param('nonews');
-        my $nochanges = $query->param('nochanges');
-        my @exwebs = split(',', $query->param('excludewebs') || '');
-        my @webs = split(',', $query->param('webs') || '');
-        $verbose = 1; # watchen das blinken lights
-        mailNotify( \@webs, $verbose, \@exwebs, $nonews, $nochanges );
-    }
-    return undef;
 }
 

trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib/Config.spec

@@ -13 +13 @@
 # **STRING EXPERT**
 # Plugin module path for handler registration
-$Foswiki::cfg{Plugins}{MailerContrib}{Module} = 'Foswiki::Contrib::MailerContrib';
+$Foswiki::cfg{Plugins}{MailerContribPlugin}{Module} = 'Foswiki::Contrib::MailerContribPlugin';
 # **BOOLEAN**
 # Enable plugin module for handler registration. You can disable the plugin
 # if you don't want to invoke mail notification from the web.
-$Foswiki::cfg{Plugins}{MailerContrib}{Enabled} = 1;
+$Foswiki::cfg{Plugins}{MailerContribPlugin}{Enabled} = 1;

trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib/MANIFEST

@@ -7 +7 @@
 lib/Foswiki/Contrib/MailerContrib/UpData.pm 0444
 lib/Foswiki/Contrib/MailerContrib.pm 0444
+lib/Foswiki/Contrib/MailerContribPlugin.pm 0444
 data/System/MailerContrib.txt 0644
 tools/mailnotify 0555