Merge branch 'master' into tova

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 126c7ba13b96c6262497bfe983dd3fc63a402dc0..38f703ddd205da0088ab089b73c23764134c8ba4 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -74,18 +74,6 @@ sub check_canrename ($$$$$$$) { #{{{
        }
 } #}}}
 
-sub formbuilder_setup (@) { #{{{
-       my %params=@_;
-       my $form=$params{form};
-       my $q=$params{cgi};
-
-       if (defined $form->field("do") && $form->field("do") eq "edit") {
-               # Rename button for the page, and also for attachments.
-               push @{$params{buttons}}, "Rename";
-               $form->tmpl_param("field-rename" => '<input name="_submit" type="submit" value="Rename Attachment" />');
-       }
-} #}}}
-
 sub rename_form ($$$) { #{{{ 
        my $q=shift;
        my $session=shift;
@@ -141,22 +129,27 @@ sub rename_start ($$$$) {
        exit 0;
 }
 
-sub postrename ($;$) {
+sub postrename ($;$$) {
        my $session=shift;
-       my $newname=shift;
+       my $dest=shift;
+       my $attachment=shift;
 
-       # Load saved form state and return to edit form.
+       # Load saved form state and return to edit page.
        my $postrename=CGI->new($session->param("postrename"));
-       if (defined $newname) {
-               # They renamed the page they were editing.
-               # Tweak the edit form to be editing the new
-               # page name, and redirect back to it.
-               # (Deep evil here.)
-               error("don't know how to redir back!"); ## FIXME
-       }
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
-       IkiWiki::cgi($postrename, $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}));
+       }
+
+       IkiWiki::cgi_editpage($postrename, $session);
 }
 
 sub formbuilder (@) { #{{{
@@ -183,6 +176,24 @@ sub formbuilder (@) { #{{{
        }
 } #}}}
 
+my $renamesummary;
+
+sub formbuilder_setup (@) { #{{{
+       my %params=@_;
+       my $form=$params{form};
+       my $q=$params{cgi};
+
+       if (defined $form->field("do") && $form->field("do") eq "edit") {
+               # Rename button for the page, and also for attachments.
+               push @{$params{buttons}}, "Rename";
+               $form->tmpl_param("field-rename" => '<input name="_submit" type="submit" value="Rename Attachment" />');
+
+               if (defined $renamesummary) {
+                       $form->tmpl_param(message => $renamesummary);
+               }
+       }
+} #}}}
+
 sub sessioncgi ($$) { #{{{
         my $q=shift;
 
@@ -221,7 +232,8 @@ sub sessioncgi ($$) { #{{{
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_rename($srcfile, $destfile);
-                               IkiWiki::rcs_commit_staged(gettext("rename $srcfile to $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();
@@ -234,12 +246,33 @@ sub sessioncgi ($$) { #{{{
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 
-                       if ($q->param("attachment")) {
-                               postrename($session);
-                       }
-                       else {
-                               postrename($session, $dest);
+                       # scan for broken links to $src
+                       my @brokenlinks;
+                       foreach my $page (keys %links) {
+                               foreach my $link (@{$links{$page}}) {
+                                       my $bestlink=bestlink($page, $link);
+                                       if ($bestlink eq $src) {
+                                               push @brokenlinks, $page;
+                                       }
+                               }
                        }
+
+                       # Generate a rename summary, that will be shown at the top
+                       # of the edit template.
+                       my $template=template("renamesummary.tmpl");
+                       $template->param(src => $src);
+                       $template->param(dest => $dest);
+                       $template->param(linklist => [
+                               map {
+                                       {
+                                               page => htmllink($dest, $dest, $_,
+                                                               noimageinline => 1)
+                                       }
+                               } @brokenlinks
+                       ]);
+                       $renamesummary=$template->output;
+
+                       postrename($session, $dest, $q->param("attachment"));
                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);