Changeset 5288 for branches/Release01x00/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

Timestamp:

10/17/09 11:44:14 (3 years ago)

Author:

KennethLavrsen

Message:

Item1302: mailnotify ignores -news operand
It is a bug that goes back to TWiki 4.0. The -news was documented but never implemented
Fixing it as speced would cause trouble for people.
And the spec is bad. It would not work well. So instead of implenting a bad spec I decided to implement -nonews and -nochanges which will give people the flexibility AND maintain status quo for those already using the mailnotify with or without a -news switch on the cronjob.

File:

• branches/Release01x00/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm (modified) (5 diffs)

branches/Release01x00/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

@@ -27 +27 @@
 
 our $VERSION = '$Rev$';
-our $RELEASE = '15 Oct 2009';
+our $RELEASE = '17 Oct 2009';
 our $SHORTDESCRIPTION = 'Supports e-mail notification of changes';
 
 our $verbose = 0;
+our $nonews = 0;
+our $nochanges = 0;
 
 # PROTECTED STATIC ensure the contrib is initernally initialised
@@ -40 +42 @@
 =pod
 
----++ StaticMethod mailNotify($webs, $session, $verbose, $exwebs)
+---++ StaticMethod mailNotify($webs, $session, $verbose, $exwebs, $nonewsmode, $nochangesmode)
    * =$webs= - filter list of names webs to process. Wildcards (*) may be used.
    * =$session= - optional session object. If not given, will use a local object.
    * =$verbose= - true to get verbose (debug) output.
    * =$exwebs = - filter list of webs to exclude.
+   * =$nonewsmode = the notify script was called with the -nonews option so we skip news mode
+   * =$nochangesmode = the notify script was called with the -nochanges option
 
 Main entry point.
@@ -55 +59 @@
 
 sub mailNotify {
-    my ( $webs, $twiki, $noisy, $exwebs ) = @_;
+    my ( $webs, $twiki, $noisy, $exwebs, $nonewsmode, $nochangesmode ) = @_;
 
     $verbose = $noisy;
+    $nonews = $nonewsmode || 0;
+    $nochanges = $nochangesmode || 0;
 
     my $webstr;
@@ -208 +214 @@
 # PRIVATE: Read the webnotify, and notify changes
 sub _processWeb {
-    my ( $twiki, $web ) = @_;
+    my ( $twiki, $web, $nonews, $nochanges ) = @_;
 
     if ( !Foswiki::Func::webExists($web) ) {
@@ -315 +321 @@
 
     # Now generate emails for each recipient
-    my $report =
-      _sendChangesMails( $twiki, $web, \%changeset,
-        Foswiki::Time::formatTime($timeOfLastNotify) );
-
-    $report .= _sendNewsletterMails( $twiki, $web, \%allSet );
-
+    my $report = '';
+    
+    if ( !$nochanges ) {
+        $report .= _sendChangesMails( $twiki, $web, \%changeset,
+          Foswiki::Time::formatTime($timeOfLastNotify) );
+    }
+
+    if ( !$nonews ) {
+        $report .= _sendNewsletterMails( $twiki, $web, \%allSet );
+    }
+    
     if ( $timeOfLastChange != 0 ) {
         if ( open( F, '>', $notmeta ) ) {