Changeset 5269 for branches/Release01x00/MailerContrib/lib/Foswiki/Contrib/MailerContrib/TopicContext.pm

Timestamp:

10/15/09 19:28:59 (3 years ago)

Author:

KennethLavrsen

Message:

Item2260: MailerContrib cannot find email templates based on skin or web
The checkin does the following

• It makes a tiny little fix in MailerContrib.pm where I pushTopicContext before loading mail template and pop it again afterwards
• Updates the the documentation to show by example how to tailor the mail message
• Merge over the code from trunk. This introduces a bug fix from Item1603 which for some reason was only applied to trunk
• And with this merge also merge over a lot of perl tinying.

It was too difficult to separate the two once I was this far. Look at next checkin in trunk to see only the actual code changes

File:

• branches/Release01x00/MailerContrib/lib/Foswiki/Contrib/MailerContrib/TopicContext.pm (modified) (1 diff)

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

@@ -2 +2 @@
 # by MailerContrib.
 
+use strict;
+
 sub Foswiki::Func::pushTopicContext {
-    my( $web, $topic ) = @_;
+    my ( $web, $topic ) = @_;
     my $session = $Foswiki::Plugins::SESSION;
-    my( $web, $topic ) = $session->normalizeWebTopicName( @_ );
+    my ( $web, $topic ) = $session->normalizeWebTopicName(@_);
     my $old = {
-        web => $session->{webName},
+        web   => $session->{webName},
         topic => $session->{topicName},
-        mark => $session->{prefs}->mark() };
+        mark  => $session->{prefs}->mark()
+    };
 
-    push( @{$session->{_FUNC_PREFS_STACK}}, $old );
-    $session->{webName} = $web;
+    push( @{ $session->{_FUNC_PREFS_STACK} }, $old );
+    $session->{webName}   = $web;
     $session->{topicName} = $topic;
-    $session->{prefs}->pushWebPreferences( $web );
+    $session->{prefs}->pushWebPreferences($web);
     $session->{prefs}->pushPreferences( $web, $topic, 'TOPIC' );
-    $session->{prefs}->pushPreferenceValues(
-        'SESSION', $session->{loginManager}->getSessionValues() );
+    $session->{prefs}->pushPreferenceValues( 'SESSION',
+        $session->{loginManager}->getSessionValues() );
 }
 
 sub Foswiki::Func::popTopicContext {
     my $session = $Foswiki::Plugins::SESSION;
-    my $old = pop( @{$session->{_FUNC_PREFS_STACK}} );
-    $session->{prefs}->restore( $old->{mark});
-    $session->{webName} = $old->{web};
+    my $old     = pop( @{ $session->{_FUNC_PREFS_STACK} } );
+    $session->{prefs}->restore( $old->{mark} );
+    $session->{webName}   = $old->{web};
     $session->{topicName} = $old->{topic};
 }