Changeset 13777 for trunk/ImmediateNotifyPlugin/lib/Foswiki/Plugins/ImmediateNotifyPlugin/XMPP.pm

Timestamp:

01/22/12 15:23:10 (4 months ago)

Author:

GeorgeClark

Message:

Item9551: More updates to ImmediateNotify

Pulled the Twitter and IRC code from TweetOnSavePlugin and IrcPlugin.
Not functional here yet, need converting. Changed the templates to real
templates, so they can be more easily overridden using Topic templates.

Added a beforeSaveHandler and a NewTopic context - so the messages can
more easily show created vs updated topics.

Eliminated the MIME multipart headers from the email template, since a
single part message using multipart headers causes issues in Outlook.

File:

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

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

@@ -105 +105 @@
     my ($template) = Foswiki::Func::readTemplate( 'xmpp', 'immediatenotify' );
 
-    # &$debug("- SMTP:  template read $template");
+    &$debug("- XMPP:  template read $template");
+
+    # Expand Legacy variables - not used in latest templates
     my ($from) = Foswiki::Func::getPreferencesValue("WIKIWEBMASTER");
-
     $template =~ s/%EMAILFROM%/$from/go;
-    $template =~ s/%WEB%/$info->{web}/go;
+    $template =~ s/%USER%/$info->{user}/go;
     $template =~ s/%TOPICNAME%/$info->{topic}/go;
-    $template =~ s/%USER%/$info->{user}/go;
     $template =~ s/%REV%/$info->{version}/go;
 
@@ -125 +125 @@
         &$debug(" processing $user");
 
-        #&$debug(" userref = ".ref($userHash->{$user}));
         my %uHash = %{ $userHash->{$user} };