tag_autocreate fixups

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 480e82804a3beb599df3969d788508dd550bccb6..44fe5514a7cf0017ce3a3f5c1193ed78c2af1108 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -17,6 +17,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1,
                plugin => {
                        safe => 1,
                        rebuild => 1,

+                       section => "core",

                },
 }
 
                },
 }
 


@@ -51,73 +52,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 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{diff}=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->() unless $params{nonfatal};
-                               $ok=0;
-                       }
-                       elsif (defined $ret) {
-                               error($ret) unless $params{nonfatal};
-                               $ok=0;
-                       }
-               }
-
-       });
-       return defined $ok ? $ok : 1;
-}
-

 sub cgi_editpage ($$) {
        my $q=shift;
        my $session=shift;
 sub cgi_editpage ($$) {
        my $q=shift;
        my $session=shift;


@@ -293,8 +230,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 {


@@ -308,8 +246,9 @@ sub cgi_editpage ($$) {
                                        push @page_locs, $dir.$page;
                                }
                        
                                        push @page_locs, $dir.$page;
                                }
                        

-                               push @page_locs, "$config{userdir}/$page"
-                                       if length $config{userdir};
+                               my $userpage=IkiWiki::userpage($page);
+                               push @page_locs, $userpage
+                                       if ! grep { $_ eq $userpage } @page_locs;

                        }
 
                        @page_locs = grep {
                        }
 
                        @page_locs = grep {


@@ -334,15 +273,19 @@ sub cgi_editpage ($$) {
                                check_canedit($_, $q, $session, 1)
                        } @page_locs;
                        if (! @editable_locs) {
                                check_canedit($_, $q, $session, 1)
                        } @page_locs;
                        if (! @editable_locs) {

-                               # let it throw an error this time
-                               map { check_canedit($_, $q, $session) } @page_locs;
+                               # now let it throw an error, or prompt for
+                               # login
+                               map { check_canedit($_, $q, $session) }
+                                       ($best_loc, @page_locs);

                        }
                        
                        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',