403 response may be a "not found" too

[git.ikiwiki.info.git] / IkiWiki / Plugin / editpage.pm

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 91d125a5ca1ca30e836706a6e5e2aa43df6eced2..fca970c60be3a13199298ddf736c70d14dd2528d 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -51,63 +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,
 
 # 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;
 
 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 $canedit;
-}
-
-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;
 sub cgi_editpage ($$) {
        my $q=shift;
        my $session=shift;


@@ -283,8 +229,9 @@ sub cgi_editpage ($$) {
                                my $dir=$from."/";
                                $dir=~s![^/]+/+$!!;
                                
                                my $dir=$from."/";
                                $dir=~s![^/]+/+$!!;
                                

-                               if ((defined $form->field('subpage') && length $form->field('subpage')) ||
-                                   $page eq gettext('discussion')) {
+                               if ((defined $form->field('subpage') &&
+                                    length $form->field('subpage')) ||
+                                   $page eq lc($config{discussionpage})) {

                                        $best_loc="$from/$page";
                                }
                                else {
                                        $best_loc="$from/$page";
                                }
                                else {


@@ -330,9 +277,11 @@ sub cgi_editpage ($$) {
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {

-                               @page_types=grep { !/^_/ }
-                                       keys %{$hooks{htmlize}};
+                               foreach my $key (grep { !/^_/ } keys %{$hooks{htmlize}}) {
+                                       push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
+                               }

                        }
                        }

+                       @page_types=sort @page_types;

                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',


@@ -395,9 +344,17 @@ sub cgi_editpage ($$) {
                        showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
                        exit;
                }
                        showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
                        exit;
                }

+                       
+               my $message="";
+               if (defined $form->field('comments') &&
+                   length $form->field('comments')) {
+                       $message=$form->field('comments');
+               }

                
                my $content=$form->field('editcontent');
                
                my $content=$form->field('editcontent');

-               check_cansave($page, $content, $q, $session);
+               check_content(content => $content, page => $page,
+                       cgi => $q, session => $session,
+                       subject => $message);

                run_hooks(editcontent => sub {
                        $content=shift->(
                                content => $content,
                run_hooks(editcontent => sub {
                        $content=shift->(
                                content => $content,


@@ -431,12 +388,6 @@ sub cgi_editpage ($$) {
                
                my $conflict;
                if ($config{rcs}) {
                
                my $conflict;
                if ($config{rcs}) {

-                       my $message="";
-                       if (defined $form->field('comments') &&
-                           length $form->field('comments')) {
-                               $message=$form->field('comments');
-                       }
-                       

                        if (! $exists) {
                                rcs_add($file);
                        }
                        if (! $exists) {
                                rcs_add($file);
                        }