[TWiki-Dev] [SVN] SvenDowideit r17703 - in twiki/trunk: TWikiUserMappingContrib/data/TWiki core/lib/TWiki/UI

[<de...@de...>]

Author: SvenDowideit
Date: 2008-10-27 03:44:44 -0500 (Mon, 27 Oct 2008)
New Revision: 17703
Trac url: http://develop.twiki.org/trac/changeset/17703

Modified:
   twiki/trunk/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt
   twiki/trunk/core/lib/TWiki/UI/Register.pm
Log:
Item6108: more specific info, and make the handleCOmmonTags happen early enough that it works

Modified: twiki/trunk/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt
===================================================================
--- twiki/trunk/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt	2008-10-27 07:45:12 UTC (rev 17702)
+++ twiki/trunk/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt	2008-10-27 08:44:44 UTC (rev 17703)
@@ -107,8 +107,8 @@
 
 From this point on, your myskin templates will be used for the registration emails.
 
-To make it possible for TWikiUsers to modify the email contents, you could use an =%<nop>INCLUDE%=
-statement in your customized version. (remember to secure the topic appropriately to prevent attackers from getting emailed sensitive passwords.) eg:
+To make it possible for TWikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
+statement in your customized version. eg:
 
 <verbatim>
 From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%>
@@ -118,8 +118,38 @@
 Content-Type: text/plain; charset=%CHARSET%
 Content-Transfer-Encoding: 8bit
 
-%INCLUDE{"%MAINWEB%.RegisterNotifyEmail"}%
+%INCLUDE{
+    "Main.RegistrationNotification"
+    WIKINAME="%WIKINAME%"
+    FIRSTLASTNAME="%FIRSTLASTNAME%"
+    EMAILADDRESS="%EMAILADDRESS%"
+}%
 </verbatim>
+   * __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__
 
+and then create a topic %NOP%%MAINWEB%.RegisterNotifyEmail:
+<verbatim>
+Welcome to %WIKITOOLNAME%.
 
+%MAKETEXT{"Your personal [_1] topic is located at [_2]. You can customize it as you like:" args="%WIKITOOLNAME%, %SCRIPTURL{"view"}%/%USERSWEB%/%WIKINAME%"}%
+
+   * %MAKETEXT{"Some people turn it into a personal portal with favorite links, what they work on, what help they'd like, etc."}%
+   * %MAKETEXT{"Some add schedule information and vacation notice."}%
+
+Regards
+%WIKIWEBMASTERNAME%
+Your TWiki Admin
+
+
+%MAKETEXT{"Note:"}%
+   2 %MAKETEXT{"You can change your password at via [_1]" args="%SCRIPTURL{"view"}%/%SYSTEMWEB%/ChangePassword"}%
+   3 %MAKETEXT{"If you haven't set a password yet or you want to reset it, go to: [_1]" args="%SCRIPTURL{"view"}%/%SYSTEMWEB%/ResetPassword"}%
+
+%MAKETEXT{"Submitted content:"}%
+%FORMDATA%
+
+%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="Main.TWikiAdminGroup"}%
+</verbatim>
+   * __remember to secure the topic appropriately to prevent attackers from getting emailed sensitive passwords.__
+
 __Related Topics:__ AdminDocumentationCategory

Modified: twiki/trunk/core/lib/TWiki/UI/Register.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/UI/Register.pm	2008-10-27 07:45:12 UTC (rev 17702)
+++ twiki/trunk/core/lib/TWiki/UI/Register.pm	2008-10-27 08:44:44 UTC (rev 17703)
@@ -1006,10 +1006,16 @@
     $templateText =~ s/%WIKINAME%/$data->{WikiName}/go;
     $templateText =~ s/%EMAILADDRESS%/$data->{Email}/go;
     
+    $templateText = $session->handleCommonTags(
+        $templateText, $TWiki::cfg{UsersWebName}, $data->{WikiName} );
+
     #add LoginName to make it clear to new users
     my $loginName = $b1.' LoginName: '.$data->{LoginName}."\n";
 
+    #SMELL: this means we fail hard if there are 2 FORMDATA vars -
+    #       like in multi-part mime - txt & html
     my ( $before, $after ) = split( /%FORMDATA%/, $templateText );
+    $before .= $loginName;
     foreach my $fd ( @{ $data->{form} } ) {
         my $name  = $fd->{name};
         my $value = $fd->{value};
@@ -1023,10 +1029,7 @@
             $loginName = '';
         }
     }
-    $before .= $loginName;
     $templateText = $before.($after||'');
-    $templateText = $session->handleCommonTags(
-        $templateText, $TWiki::cfg{UsersWebName}, $data->{WikiName} );
     $templateText =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois;
     # remove <nop> and <noautolink> tags