urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix calls to check_* 

These throw errors, do not have useful return codes.
master
Joey Hess 2008-10-23 18:05:12 -04:00
parent ad9e443f22
commit f349e4ef36
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Receive.pm
View File

@ -22,7 +22,6 @@ sub trusted () { #{{{
sub test () { #{{{
exit 0 if trusted();
IkiWiki::rcs_test_receive();
# Dummy up a cgi environment to use when calling check_canedit
# and friends.
@ -31,20 +30,19 @@ sub test () { #{{{
my $cgi=CGI->new;
require IkiWiki::CGI;
my $session=IkiWiki::cgi_getsession($cgi);
my $user=getuser();
$session->param("name", $user);
$session->param("name", getuser());
$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
lockwiki();
loadindex();
IkiWiki::lockwiki();
IkiWiki::loadindex();
my %newfiles;
foreach my $change (IkiWiki::rcs_receive()) {
# This untaint is safe because we check file_pruned and
# wiki_file_regexp.
my $file=$change->{file}=~/$config{wiki_file_regexp}/;
$file=possibly_foolish_untaint($file);
my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
$file=IkiWiki::possibly_foolish_untaint($file);
if (! defined $file || ! length $file ||
IkiWiki::file_pruned($file, $config{srcdir})) {
error(gettext("bad file name"));