[TWiki-Dev] CVS: twiki/bin edit,1.74,1.75 register,1.48,1.49

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

Update of /cvsroot/twiki/twiki/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5847

Modified Files:
	edit register 
Log Message:
Codev.RefactorVariableExpansion code cleanup

Index: edit
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/edit,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** edit	26 Feb 2004 08:26:14 -0000	1.74
--- edit	10 Mar 2004 08:53:53 -0000	1.75
***************
*** 3,7 ****
  # TWiki Collaboration Platform, http://TWiki.org/
  #
! # Copyright (C) 1999-2003 Peter Thoeny, pe...@th...
  #
  # Based on parts of Ward Cunninghams original Wiki and JosWiki.
--- 3,7 ----
  # TWiki Collaboration Platform, http://TWiki.org/
  #
! # Copyright (C) 1999-2004 Peter Thoeny, pe...@th...
  #
  # Based on parts of Ward Cunninghams original Wiki and JosWiki.
***************
*** 176,190 ****
          }
  
!         # expand limited set of variables
!         # NOTE: Keep it in sync with the register script (FIXME: Put in function)
!         my $today = &TWiki::formatTime(time(), "\$day \$mon \$year", "gmtime");
!         my $wikiName = TWiki::userToWikiName( $userName, 1 );
!         $text =~ s/%DATE%/$today/go;
!         $text =~ s/%USERNAME%/$userName/go;          # "jdoe"
!         $text =~ s/%WIKINAME%/$wikiName/go;          # "JonDoe"
!         $text =~ s/%WIKIUSERNAME%/$wikiUserName/go;  # "Main.JonDoe"
!         $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
      }
  
--- 176,180 ----
          }
  
!        $text = TWiki::expandVariablesOnTopicCreation( $text, $userName );
      }
  

Index: register
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/register,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** register	26 Feb 2004 08:26:14 -0000	1.48
--- register	10 Mar 2004 08:53:59 -0000	1.49
***************
*** 3,7 ****
  # TWiki Collaboration Platform, http://TWiki.org/
  #
! # Copyright (C) 1999-2003 Peter Thoeny, pe...@th...
  #
  # For licensing info read license.txt file in the TWiki root.
--- 3,7 ----
  # TWiki Collaboration Platform, http://TWiki.org/
  #
! # Copyright (C) 1999-2004 Peter Thoeny, pe...@th...
  #
  # For licensing info read license.txt file in the TWiki root.
***************
*** 198,212 ****
          $text = "$before$after";
  
!         # expand limited set of variables
!         # NOTE: Keep it in sync with the edit script (FIXME: Put in function)
!         my $today = &TWiki::formatTime(time(), "\$day \$mon \$year", "gmtime");
!         my $userName = $remoteUser || $wikiName;
!         $text =~ s/%DATE%/$today/go;
!         $text =~ s/%USERNAME%/$userName/go;               # "jdoe"
!         $text =~ s/%WIKINAME%/$wikiName/go;               # "JonDoe"
!         $text =~ s/%WIKIUSERNAME%/$webName.$wikiName/go;  # "Main.JonDoe"
!         $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 ) );
--- 198,203 ----
          $text = "$before$after";
  
!        my $userName = $remoteUser || $wikiName;
!        $text = TWiki::expandVariablesOnTopicCreation( $text, $userName, $wikiName, "$webName.$wikiName" );
  
          $meta->put( "TOPICPARENT", ( "name" => $TWiki::wikiUsersTopicname ) );