move plugin toggles to before config setting again

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 38f703ddd205da0088ab089b73c23764134c8ba4..527ee88bc44908dc5e84a4604506f1f25e50cb31 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -102,7 +102,7 @@ sub rename_form ($$$) { #{{{
        return $f, ["Rename", "Cancel"];
 } #}}}
 
        return $f, ["Rename", "Cancel"];
 } #}}}
 

-sub rename_start ($$$$) {
+sub rename_start ($$$$) { #{{{

        my $q=shift;
        my $session=shift;
        my $attachment=shift;
        my $q=shift;
        my $session=shift;
        my $attachment=shift;


@@ -127,10 +127,11 @@ sub rename_start ($$$$) {
        
        IkiWiki::showform($f, $buttons, $session, $q);
        exit 0;
        
        IkiWiki::showform($f, $buttons, $session, $q);
        exit 0;

-}
+} #}}}

 
 

-sub postrename ($;$$) {
+sub postrename ($;$$$) { #{{{

        my $session=shift;
        my $session=shift;

+       my $src=shift;

        my $dest=shift;
        my $attachment=shift;
 
        my $dest=shift;
        my $attachment=shift;
 


@@ -139,18 +140,27 @@ sub postrename ($;$$) {
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 

-       if (defined $dest && ! $attachment) {
-               # They renamed the page they were editing. This requires
-               # fixups to the edit form state.
-               # Tweak the edit form to be editing the new page.
-               $postrename->param("page", $dest);
-               # Get a new edit token; old one might not be valid for the
-               # renamed file.
-               $postrename->param("rcsinfo", IkiWiki::rcs_prepedit($pagesources{$dest}));
+       if (defined $dest) {
+               if (! $attachment) {
+                       # They renamed the page they were editing. This requires
+                       # fixups to the edit form state.
+                       # Tweak the edit form to be editing the new page.
+                       $postrename->param("page", $dest);
+               }
+
+               # Update edit form content to fix any links present
+               # on it.
+               $postrename->param("editcontent",
+                       renamepage_hook($dest, $src, $dest,
+                                $postrename->param("editcontent")));
+
+               # Get a new edit token; old was likely invalidated.
+               $postrename->param("rcsinfo",
+                       IkiWiki::rcs_prepedit($pagesources{$dest}));

        }
 
        IkiWiki::cgi_editpage($postrename, $session);
        }
 
        IkiWiki::cgi_editpage($postrename, $session);

-}
+} #}}}

 
 sub formbuilder (@) { #{{{
        my %params=@_;
 
 sub formbuilder (@) { #{{{
        my %params=@_;


@@ -227,34 +237,68 @@ sub sessioncgi ($$) { #{{{
                        # Ensures that the dest directory exists and is ok.
                        IkiWiki::prep_writefile($destfile, $config{srcdir});
 
                        # Ensures that the dest directory exists and is ok.
                        IkiWiki::prep_writefile($destfile, $config{srcdir});
 

-                       # Do rename, and update the wiki.
+                       # Do rename, update other pages, and refresh site.
+                       IkiWiki::disable_commit_hook() if $config{rcs};

                        require IkiWiki::Render;
                        if ($config{rcs}) {
                        require IkiWiki::Render;
                        if ($config{rcs}) {

-                               IkiWiki::disable_commit_hook();

                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(
                                        sprintf(gettext("rename %s to %s"), $src, $dest),
                                        $session->param("name"), $ENV{REMOTE_ADDR});
                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(
                                        sprintf(gettext("rename %s to %s"), $src, $dest),
                                        $session->param("name"), $ENV{REMOTE_ADDR});

-                               IkiWiki::enable_commit_hook();
-                               IkiWiki::rcs_update();

                        }
                        else {
                                if (! rename("$config{srcdir}/$srcfile", "$config{srcdir}/$destfile")) {
                                        error("rename: $!");
                                }
                        }
                        }
                        else {
                                if (! rename("$config{srcdir}/$srcfile", "$config{srcdir}/$destfile")) {
                                        error("rename: $!");
                                }
                        }

+                       my @fixedlinks;
+                       foreach my $page (keys %links) {
+                               my $needfix=0;
+                               foreach my $link (@{$links{$page}}) {
+                                       my $bestlink=bestlink($page, $link);
+                                       if ($bestlink eq $src) {
+                                               $needfix=1;
+                                               last;
+                                       }
+                               }
+                               if ($needfix) {
+                                       my $file=$pagesources{$page};
+                                       my $oldcontent=readfile($config{srcdir}."/".$file);
+                                       my $content=renamepage_hook($page, $src, $dest, $oldcontent);
+                                       if ($oldcontent ne $content) {
+                                               my $token=IkiWiki::rcs_prepedit($file);
+                                               eval { writefile($file, $config{srcdir}, $content) };
+                                               next if $@;
+                                               my $conflict=IkiWiki::rcs_commit(
+                                                       $file,
+                                                       sprintf(gettext("update for rename of %s to %s"), $src, $dest),
+                                                       $token,
+                                                       $session->param("name"), 
+                                                       $ENV{REMOTE_ADDR}
+                                               );
+                                               push @fixedlinks, $page if ! defined $conflict;
+                                       }
+                               }
+                       }
+                       if ($config{rcs}) {
+                               IkiWiki::enable_commit_hook();
+                               IkiWiki::rcs_update();
+                       }

                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 

-                       # scan for broken links to $src
+                       # Scan for any remaining broken links to $src.

                        my @brokenlinks;
                        foreach my $page (keys %links) {
                        my @brokenlinks;
                        foreach my $page (keys %links) {

+                               my $broken=0;

                                foreach my $link (@{$links{$page}}) {
                                        my $bestlink=bestlink($page, $link);
                                        if ($bestlink eq $src) {
                                foreach my $link (@{$links{$page}}) {
                                        my $bestlink=bestlink($page, $link);
                                        if ($bestlink eq $src) {

-                                               push @brokenlinks, $page;
+                                               $broken=1;
+                                               last;

                                        }
                                }
                                        }
                                }

+                               push @brokenlinks, $page if $broken;

                        }
 
                        # Generate a rename summary, that will be shown at the top
                        }
 
                        # Generate a rename summary, that will be shown at the top


@@ -262,7 +306,7 @@ sub sessioncgi ($$) { #{{{
                        my $template=template("renamesummary.tmpl");
                        $template->param(src => $src);
                        $template->param(dest => $dest);
                        my $template=template("renamesummary.tmpl");
                        $template->param(src => $src);
                        $template->param(dest => $dest);

-                       $template->param(linklist => [
+                       $template->param(brokenlinks => [

                                map {
                                        {
                                                page => htmllink($dest, $dest, $_,
                                map {
                                        {
                                                page => htmllink($dest, $dest, $_,


@@ -270,9 +314,17 @@ sub sessioncgi ($$) { #{{{
                                        }
                                } @brokenlinks
                        ]);
                                        }
                                } @brokenlinks
                        ]);

+                       $template->param(fixedlinks => [
+                               map {
+                                       {
+                                               page => htmllink($dest, $dest, $_,
+                                                               noimageinline => 1)
+                                       }
+                               } @fixedlinks
+                       ]);

                        $renamesummary=$template->output;
 
                        $renamesummary=$template->output;
 

-                       postrename($session, $dest, $q->param("attachment"));
+                       postrename($session, $src, $dest, $q->param("attachment"));

                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);
                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);


@@ -280,6 +332,21 @@ sub sessioncgi ($$) { #{{{
 
                exit 0;
        }
 
                exit 0;
        }

-}
+} #}}}
+
+sub renamepage_hook ($$$$) { #{{{
+       my ($page, $src, $dest, $content)=@_;
+
+       IkiWiki::run_hooks(renamepage => sub {
+               $content=shift->(
+                       page => $page,
+                       oldpage => $src,
+                       newpage => $dest,
+                       content => $content,
+               );
+       });
+
+       return $content;
+}# }}}

 
 1
 
 1