Item14005: Add templattopic to the email template parameters

Doesn't actually change any templates, just make the parameter available for conditional use in the templats.
foswiki · Mar 4, 2016 · 36c5666 · 36c5666
1 parent f040cb1
commit 36c5666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/TopicUserMappingContrib/data/System/ManagingUsers.txt b/TopicUserMappingContrib/data/System/ManagingUsers.txt
@@ -231,9 +231,11 @@ Content-Transfer-Encoding: 8bit
     WIKINAME="%WIKINAME%"
     FIRSTLASTNAME="%FIRSTLASTNAME%"
     EMAILADDRESS="%EMAILADDRESS%"
+    TEMPLATETOPIC="%TEMPLATETOPIC%"
 }%
 </verbatim>
-<div class="foswikiHelp"> %H% *Note* the use of %<nop>WIKINAME%, %<nop>FIRSTLASTNAME%, %<nop>EMAILADDRESS% passed in from the INCLUDE so that the topic below is similar to the original template</div>
+<div class="foswikiHelp"> %H% *Note* the use of %<nop>WIKINAME%, %<nop>FIRSTLASTNAME%, %<nop>EMAILADDRESS%, passed in from the INCLUDE so that the topic below is similar to the original template.
+The %<nop>TEMPLATETOPIC% variable is also available.  It could be used as a "section" name in the include, or directly in the email for tailoring messages for specific types of users.</div>
 
 and then create a topic %NOP%%USERSWEB%.RegisterNotifyEmail:
 <verbatim class="tml">

diff --git a/core/lib/Foswiki/UI/Register.pm b/core/lib/Foswiki/UI/Register.pm
@@ -1565,6 +1565,7 @@ sub _buildConfirmationEmail {
     $templateText =~ s/%FIRSTLASTNAME%/$data->{Name}/g;
     $templateText =~ s/%WIKINAME%/$data->{WikiName}/g;
     $templateText =~ s/%EMAILADDRESS%/$data->{Email}/g;
+    $templateText =~ s/%TEMPLATETOPIC%/$data->{templatetopic}/g;
 
     my $topicObject = Foswiki::Meta->new( $session, $Foswiki::cfg{UsersWebName},
         $data->{WikiName} );