[TWiki-Dev] CVS: twiki/bin edit,1.64,1.65 register,1.35,1.36

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv11373

Modified Files:
	edit register 
Log Message:
Codev.ExpandVariablesInNewUserTemplate feature

Index: edit
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/edit,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** edit	5 Jan 2003 02:38:11 -0000	1.64
--- edit	12 Mar 2003 06:42:32 -0000	1.65
***************
*** 158,163 ****
          }
  
!         my $foo = &TWiki::getGmDate();
!         $text =~ s/%DATE%/$foo/go;
          $text =~ s/%WIKIUSERNAME%/$wikiUserName/go;
          $text =~ s/%URLPARAM{(.*?)}%/TWiki::handleUrlParam($1)/geo;  # expand URL parameters
--- 158,164 ----
          }
  
!         # expand limited set of variables (keep it in sync with the register script)
!         my $today = &TWiki::getGmDate();
!         $text =~ s/%DATE%/$today/go;
          $text =~ s/%WIKIUSERNAME%/$wikiUserName/go;
          $text =~ s/%URLPARAM{(.*?)}%/TWiki::handleUrlParam($1)/geo;  # expand URL parameters

Index: register
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/register,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** register	5 Jan 2003 02:38:11 -0000	1.35
--- register	12 Mar 2003 06:42:32 -0000	1.36
***************
*** 190,193 ****
--- 190,202 ----
          }
          $text = "$before$after";
+ 
+         # expand limited set of variables (keep it in sync with the edit script)
+         my $today = &TWiki::getGmDate();
+         $text =~ s/%DATE%/$today/go;
+         $text =~ s/%WIKIUSERNAME%/$webName.$wikiName/go;
+         $text =~ s/%URLPARAM{(.*?)}%/TWiki::handleUrlParam($1)/geo;  # expand URL parameters
+         $text =~ s/%NOP{.*?}%//gos;  # Remove filler: Use it to remove access control at time of
+         $text =~ s/%NOP%//go;        # topic instantiation or to prevent search from hitting a template
+ 
          $meta->put( "TOPICPARENT", ( "name" => $TWiki::wikiUsersTopicname ) );
          &TWiki::Store::saveTopic( $webName, $wikiName, $text, $meta, "", 1 );