[TWiki-Dev] CVS: twiki/bin register,1.45,1.46 statistics,1.41,1.42 upload,1.51,1.52

[Walter M. <eth...@us...>]

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

Modified Files:
	register statistics upload 
Log Message:
Fixed scripts to access TWiki regexes via %regex hash.

Index: register
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/register,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** register	18 Jan 2004 08:06:25 -0000	1.45
--- register	9 Feb 2004 11:01:50 -0000	1.46
***************
*** 135,139 ****
  
      # check valid email address
!     if( $emailAddress !~ $TWiki::emailAddrRegex ) {
          $url = &TWiki::getOopsUrl( $webName, $topic, "oopsregemail" );
          TWiki::redirect( $query, $url );
--- 135,139 ----
  
      # check valid email address
!     if( $emailAddress !~ $TWiki::regex{emailAddrRegex} ) {
          $url = &TWiki::getOopsUrl( $webName, $topic, "oopsregemail" );
          TWiki::redirect( $query, $url );

Index: statistics
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/statistics,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** statistics	5 Feb 2004 17:33:02 -0000	1.41
--- statistics	9 Feb 2004 11:01:52 -0000	1.42
***************
*** 274,280 ****
  
      # Imported regex objects, supporting I18N
!     my $webNameRegex = $TWiki::webNameRegex;
!     my $wikiWordRegex = $TWiki::wikiWordRegex;
!     my $abbrevRegex = $TWiki::abbrevRegex;
  
      # Script regexes
--- 274,280 ----
  
      # Imported regex objects, supporting I18N
!     my $webNameRegex = $TWiki::regex{webNameRegex};
!     my $wikiWordRegex = $TWiki::regex{wikiWordRegex};
!     my $abbrevRegex = $TWiki::regex{abbrevRegex};
  
      # Script regexes

Index: upload
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/upload,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** upload	8 Feb 2004 23:29:27 -0000	1.51
--- upload	9 Feb 2004 11:01:52 -0000	1.52
***************
*** 415,419 ****
  
  	# Delete unwanted characters from filename, with I18N
! 	my $nonAlphaNum = "[^${TWiki::mixedAlphaNum}" . '\._-]+';
          $fileName =~ s/${nonAlphaNum}//go;
          $fileName =~ s/$TWiki::uploadFilter/$1\.txt/goi;  # apply security filter
--- 415,419 ----
  
  	# Delete unwanted characters from filename, with I18N
! 	my $nonAlphaNum = "[^$TWiki::regex{mixedAlphaNum}" . '\._-]+';
          $fileName =~ s/${nonAlphaNum}//go;
          $fileName =~ s/$TWiki::uploadFilter/$1\.txt/goi;  # apply security filter