Changeset 811 for trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib/Subscriber.pm

Timestamp:

11/19/08 15:00:00 (4 years ago)

Author:

CrawfordCurrie

Message:

Item175: port a subset of the standard extensions over to the new namespace to make a working system with mixed TWiki and Foswiki plugins

Location:

trunk/MailerContrib/lib/Foswiki

Files:

• . (moved) (moved from trunk/MailerContrib/lib/TWiki)
• Contrib/MailerContrib/Subscriber.pm (modified) (7 diffs)

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

@@ -2 +2 @@
 #
 # Copyright (C) 2004 Wind River Systems Inc.
-# Copyright (C) 1999-2006 TWiki Contributors.
-# All Rights Reserved. TWiki Contributors
+# Copyright (C) 1999-2006 Foswiki Contributors.
+# All Rights Reserved. Foswiki Contributors
 # are listed in the AUTHORS file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.
@@ -23 +23 @@
 =pod
 
----+ package TWiki::Contrib::MailerContrib::Subscriber
+---+ package Foswiki::Contrib::MailerContrib::Subscriber
 Object that represents a subscriber to notification. A subscriber is
 a name (which may be a wikiName or an email address) and a list of
@@ -33 +33 @@
 =cut
 
-package TWiki::Contrib::MailerContrib::Subscriber;
-
-use TWiki;
-use TWiki::Plugins;
+package Foswiki::Contrib::MailerContrib::Subscriber;
+
+use Foswiki;
+use Foswiki::Plugins;
 use Assert;
 
-require TWiki::Contrib::MailerContrib::WebNotify;
+require Foswiki::Contrib::MailerContrib::WebNotify;
 
 =pod
@@ -87 +87 @@
     return $emails unless $name;
 
-    if ( $name =~ /^$TWiki::cfg{MailerContrib}{EmailFilterIn}$/ ) {
+    if ( $name =~ /^$Foswiki::cfg{MailerContrib}{EmailFilterIn}$/ ) {
         push( @{$emails}, $name );
     } else {
-        my $users = $TWiki::Plugins::SESSION->{users};
+        my $users = $Foswiki::Plugins::SESSION->{users};
         if ($users->can('findUserByWikiName')) {
             # User is represented by a wikiname. Map to a canonical
@@ -210 +210 @@
 ---++ isSubscribedTo($topic, $db) -> $subscription
    * =$topic= - Topic object we are checking
-   * =$db= - TWiki::Contrib::MailerContrib::UpData database of parents
+   * =$db= - Foswiki::Contrib::MailerContrib::UpData database of parents
 Check if we have a subscription to the given topic. Return the subscription
 that matches if we do, undef otherwise.
@@ -232 +232 @@
 ---++ isUnsubscribedFrom($topic) -> $subscription
    * =$topic= - Topic object we are checking
-   * =$db= - TWiki::Contrib::MailerContrib::UpData database of parents
+   * =$db= - Foswiki::Contrib::MailerContrib::UpData database of parents
 Check if we have an unsubscription from the given topic. Return the subscription that matches if we do, undef otherwise.
 
@@ -267 +267 @@
 
     my $name = $this->{name};
-    if ($name =~ /^$TWiki::regex{wikiWordRegex}$/) {
+    if ($name =~ /^$Foswiki::regex{wikiWordRegex}$/) {
         $name = '%USERSWEB%.'.$name;
-    } elsif ($name !~ /^$TWiki::cfg{MailerContrib}{EmailFilterIn})$/) {
+    } elsif ($name !~ /^$Foswiki::cfg{MailerContrib}{EmailFilterIn})$/) {
         $name = $name =~ /'/ ? '"'.$name.'"' : "'$name'";
     }