X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/832d4d31d177d5d5f848250496048a00e9d70e2f..d622da057be3fcd3c55ebf8f3651966f7dec668b:/IkiWiki/Plugin/editpage.pm diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index 658d664af..0068a6b11 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -51,99 +51,9 @@ sub refresh () { # Back to ikiwiki namespace for the rest, this code is very much # internal to ikiwiki even though it's separated into a plugin, -# and other plugins use the functions below. +# and other plugins use the function below. package IkiWiki; -sub check_canedit ($$$;$) { - my $page=shift; - my $q=shift; - my $session=shift; - my $nonfatal=shift; - - my $canedit; - run_hooks(canedit => sub { - return if defined $canedit; - my $ret=shift->($page, $q, $session); - if (defined $ret) { - if ($ret eq "") { - $canedit=1; - } - elsif (ref $ret eq 'CODE') { - $ret->() unless $nonfatal; - $canedit=0; - } - elsif (defined $ret) { - error($ret) unless $nonfatal; - $canedit=0; - } - } - }); - return defined $canedit ? $canedit : 1; -} - -sub check_content (@) { - my %params=@_; - - return 1 if ! exists $hooks{checkcontent}; # optimisation - - if (exists $pagesources{$params{page}}) { - my @diff; - my %old=map { $_ => 1 } - split("\n", readfile(srcfile($pagesources{$params{page}}))); - foreach my $line (split("\n", $params{content})) { - push @diff, $line if ! exists $old{$_}; - } - $params{content}=join("\n", @diff); - } - - my $ok; - run_hooks(checkcontent => sub { - return if defined $ok; - my $ret=shift->(%params); - if (defined $ret) { - if ($ret eq "") { - $ok=1; - } - elsif (ref $ret eq 'CODE') { - $ret->(); - $ok=0; - } - elsif (defined $ret) { - error($ret); - } - } - - }); - return defined $ok ? $ok : 1; -} - -sub check_cansave ($$$$) { - my $page=shift; - my $content=shift; - my $q=shift; - my $session=shift; - - my $cansave; - run_hooks(cansave => sub { - return if defined $cansave; - my $ret=shift->($page, $content, $q, $session); - if (defined $ret) { - if ($ret eq "") { - $cansave=1; - } - elsif (ref $ret eq 'CODE') { - $ret->(); - $cansave=0; - } - else { - error($ret); - $cansave=0; - } - } - }); - return $cansave; -} - sub cgi_editpage ($$) { my $q=shift; my $session=shift; @@ -439,7 +349,6 @@ sub cgi_editpage ($$) { } my $content=$form->field('editcontent'); - check_cansave($page, $content, $q, $session); check_content(content => $content, page => $page, cgi => $q, session => $session, subject => $message);