Changeset 3974 for trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

Timestamp:

05/24/09 12:15:55 (3 years ago)

Author:

CrawfordCurrie

Message:

Item1603: use quotes to protect topic names with odd characters in them

File:

• trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm (modified) (4 diffs)

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

@@ -133 +133 @@
     };
 
-    my $ret = Foswiki::Contrib::MailerContrib::parsePageList( $subscribed, $who,
-        $topicList );
+    my $ret = parsePageList( $subscribed, $who, $topicList );
 
     return ( !defined( $subscribed->{not_subscribed} )
@@ -165 +164 @@
         push( @{ $subscribed->{not_subscribed} }, $stopic );
     }
-    return '';
 }
 
 =pod
+
 ---+++ sub parsePageList ( $object, $who, $spec, $unsubscribe ) => unprocessable remainder of $spec line
-calls the $topicSub (ref to sub) once per identified topic entry.
-   * $object (is a hashref) can be used to set status' and its definition is dependent on $topicSub
-   * $object->{topicSub} _must_ be a sub ref and _must_ return an empty string
-   * $unsubscribe can be set to '-' to force an unsubscription (used by SubscribePlugin)
-   
-   $object is a functor.
+Calls the $object->{topicSub} once per identified topic entry.
+   * $object (a hashref) may be a hashref that has the field, =topicSub=,
+     which _may_ be a sub ref as follows:
+     =&topicSub($object, $who, $unsubscribe, $webTopic, $options, $childDepth)=
+   * =$unsubscribe= can be set to '-' to force an unsubscription
+     (used by SubscribePlugin)
 
 =cut
@@ -184 +183 @@
     #ASSERT(defined($object->{topicSub}));
 
-    return $spec if ( !defined( $object->{topicSub} ) );
+    return $spec if ( !$object || !defined( $object->{topicSub} ) );
 
     $spec =~ s/,/ /g;
 
-    #TODO: refine the $2 regex to be proper web.topic/topic/* style..
+    # $1: + or -, optional
+    # $2: the wildcarded topic specifier (may be quoted)
+    # TODO: refine the $2 regex to be proper web.topic/topic/* style..
+    # $3: options
+    # $4: child depth
     while ( $spec =~
-s/^\s*([+-])?\s*([\w.\*]+)([!?]?)\s*(?:\((\d+)\))?/&{$object->{topicSub}}($object, $who, $unsubscribe||$1, $2, $3, $4)/e
-      )
-    {
-
+              s/^\s*([+-])?\s*([*\w.]+|'.*?'|".*?")([!?]?)\s*(?:\((\d+)\))?//) {
+        my ( $us, $webTopic, $options, $childDepth ) = (
+            $unsubscribe||$1||'+', $2, $3, $4||0 );
+        $webTopic =~ s/^(['"])(.*)\1$/$2/; # remove quotes
+        &{$object->{topicSub}}(
+            $object, $who, $us, $webTopic, $options, $childDepth);
         #go
     }
@@ -205 +210 @@
     if ( !Foswiki::Func::webExists($web) ) {
 
-        #        print STDERR "**** ERROR mailnotifier cannot find web $web\n";
+        # print STDERR "**** ERROR mailnotifier cannot find web $web\n";
         return '';
     }