Changeset 13817 for trunk/ImmediateNotifyPlugin/lib/Foswiki/Plugins/ImmediateNotifyPlugin.pm

Timestamp:

01/24/12 21:16:27 (4 months ago)

Author:

GeorgeClark

Message:

Item9551: Some cleanup

And start to convert the twitter and irc code.

File:

• trunk/ImmediateNotifyPlugin/lib/Foswiki/Plugins/ImmediateNotifyPlugin.pm (modified) (9 diffs)

trunk/ImmediateNotifyPlugin/lib/Foswiki/Plugins/ImmediateNotifyPlugin.pm

@@ -23 +23 @@
 my %methodHandlers;    # Loaded handlers
 my %methodAllowed;     # Methods permitted by config.
-
-=begin TML
-
----+ debug ( $message )
-
-Write debug messages if debug is enabled.
-
-=cut
 
 =begin TML
@@ -81 +73 @@
         next if ( $method eq "Module" );
         next if ( $method eq "Enabled" );
-        next if ( $method eq "Bitly" );
+        next if ( $method eq "Bitly" );     # Bitly is not a notifier plugin
         if ( $Foswiki::cfg{Plugins}{ImmediateNotifyPlugin}{$method}{Enabled} ) {
             debug("Allowing method $method");
@@ -183 +175 @@
 
     debug("- ImmediateNotifyPlugin: Processing name $name");
-    return if exists $users->{$name};    # Already saw this name - skip it.
+    return
+      if ( exists $users->{$name} || exists $groups->{name} )
+      ;    # Already saw this name - skip it.
 
     if ( Foswiki::Func::isGroup($name) ) {
-        return if exists $groups->{$name};    # don't reprocess groups
         $groups->{$name} = $name;
 
@@ -216 +209 @@
                 my ( $method, $parms ) =
                   $methodString =~ m/^(.*?)(?:\((.*?)\))?$/;
-                  $parms |= '';
+                $parms |= '';
                 debug(
 "- ImmediateNotifyPlugin: processName: User $name found method ($method) parms ($parms) "
                 );
                 $users->{$name}{METHOD} = $method || 'SMTP';
-                $users->{$name}{PARMS}  = $parms  || '';
+                $users->{$name}{PARMS} = $parms;
             }
             else {
@@ -238 +231 @@
 }
 
-
 =begin TML
 
@@ -250 +242 @@
     my ( $text, $topic, $web, $meta ) = @_;
 
-    unless ( Foswiki::Func::topicExists($web, $topic) ) {
-      Foswiki::Func::getContext()->{'NewTopic'} = 1;
+    unless ( Foswiki::Func::topicExists( $web, $topic ) ) {
+        Foswiki::Func::getContext()->{'NewTopic'} = 1;
     }
 }
@@ -274 +266 @@
 # This handler is called by Foswiki::Store::saveTopic just after the save action.
 
-    debug("- ImmediateNotifyPlugin::afterSaveHandler( $_[2].$_[1] )");
+    debug("- ImmediateNotifyPlugin::afterSaveHandler( $web.$topic )");
 
     if ($error) {
@@ -285 +277 @@
   # in Item9563 or changes made in the save will be missed.
 
-    my $testSet = $topicObject->getPreference('IMMEDIATENOTIFY');
-    debug("- ImmediateNotifyPlugin: getPreference returned $testSet \n")
-      if $testSet;
-
     my @names;
-
-# NOTE: in this case we DO want to use the Meta::getPreference() function.  If the normal
-# preferences API is used, settings are cached and don't reflect changes just saved in this
-# transaction.  The Meta function uses the raw topic data and not the cached settings.
 
 # Check if the topic contains an IMMEDIATENOTIFY setting and extract names if present
@@ -379 +363 @@
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2011 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2012 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 
-Copyright (C) 2010-2011 George Clark
 Copyright (C) 2003 Walter Mundt, emage@spamcop.net
 Copyright (C) 2003 Akkaya Consulting GmbH, jpabel@akkaya.de