Index: wiki.pm =================================================================== RCS file: /cvsroot/TWiki/twiki/bin/wiki.pm,v retrieving revision 1.3 diff -c -r1.3 wiki.pm *** wiki.pm 2000/05/22 03:02:42 1.3 --- wiki.pm 2000/05/23 12:21:46 *************** *** 586,603 **** if( ! $theWebName ) { $theWebName = $webName; } ! my $tmp= $revHistCmd; ! my $fileName = "$dataDir/$theWebName/$theTopic.txt"; ! $tmp =~ s/%FILENAME%/$fileName/; ! $tmp =~ /(.*)/; ! $tmp = $1; # now safe, so untaint variable ! $tmp = `$tmp`; ! $tmp =~ /head: (.*?)\n/; ! if( ( $tmp ) && ( $1 ) ) { ! return $1; ! } else { ! return "1.1"; ! } } # ========================= --- 586,602 ---- if( ! $theWebName ) { $theWebName = $webName; } ! ! open ( TOPIC , "$dataDir/$theWebName/$theTopic.txt,v" ) or return ""; ! my $rev; ! while () { ! if (/^head\s+([\d\.]+);$/) { ! $rev = $1; ! last; ! } ! } ! close TOPIC; ! return $rev || ""; } # ========================= *************** *** 636,663 **** if( ! $theRev ) { $theRev = getRevisionNumber( $theTopic, $theWebName ); } ! my $tmp= $revInfoCmd; $theRev =~ s/$securityFilter//go; ! $tmp =~ s/%REVISION%/$theRev/; ! my $fileName = "$dataDir/$theWebName/$theTopic.txt"; ! $fileName =~ s/$securityFilter//go; ! $tmp =~ s/%FILENAME%/$fileName/; ! $tmp =~ /(.*)/; ! $tmp = $1; # now safe, so untaint variable ! $tmp = `$tmp`; ! $tmp =~ /date: (.*?); author: (.*?);/; my $date = $1; my $user = $2; if( ! $user ) { return ( "", "" ); } if( $changeToIsoDate ) { # change date to ISO format $tmp = $1; ! $tmp =~ /(.*?)\/(.*?)\/(.*?) (.*?):[0-9][0-9]$/; ! if( $4 ) { ! $date = "$3 $isoMonth[$2-1] $1 - $4"; ! } } return ( $date, $user ); } --- 635,665 ---- if( ! $theRev ) { $theRev = getRevisionNumber( $theTopic, $theWebName ); } ! ! my $tmp; $theRev =~ s/$securityFilter//go; ! ! open ( TOPIC , "$dataDir/$theWebName/$theTopic.txt,v" ) or return ""; ! ! while () { ! last if (/^$theRev/); ! } ! $tmp = ; # What can I say? Hacky Hacky. ! close TOPIC; ! $tmp =~ /date\s*([\d\.]+);\s+author\s+(.*);.*;/; ! my $date = $1; my $user = $2; + if( ! $user ) { return ( "", "" ); } if( $changeToIsoDate ) { # change date to ISO format $tmp = $1; ! $tmp =~ /(.*?)\.(.*?)\.(.*?)\.(.*?)\.[0-9][0-9]$/; ! $date = "$3 $isoMonth[$2-1] $1 - $4" if $4; ! $date =~ s/\./:/; } return ( $date, $user ); } Index: wikicfg.pm =================================================================== RCS file: /cvsroot/TWiki/twiki/bin/wikicfg.pm,v retrieving revision 1.1.1.20 diff -c -r1.1.1.20 wikicfg.pm *** wikicfg.pm 2000/05/06 10:40:20 1.1.1.20 --- wikicfg.pm 2000/05/23 12:21:46 *************** *** 87,93 **** # RCS check out command : $revCoCmd = "$rcsDir/co -q -p%REVISION% %FILENAME%"; # RCS history command : ! $revHistCmd = "$rcsDir/rlog -h %FILENAME%"; # RCS history on revision command : $revInfoCmd = "$rcsDir/rlog -r%REVISION% %FILENAME%"; # RCS revision diff command : --- 87,93 ---- # RCS check out command : $revCoCmd = "$rcsDir/co -q -p%REVISION% %FILENAME%"; # RCS history command : ! #$revHistCmd = "$rcsDir/rlog -h %FILENAME%"; # RCS history on revision command : $revInfoCmd = "$rcsDir/rlog -r%REVISION% %FILENAME%"; # RCS revision diff command :