git: write proposed attachment to temp file without going via system()

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index aa108175667fce0e23493a45c14d3ec2542819b1..4b2d1c4a93bf62ace9389787c5f1526c72c10850 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -184,7 +184,7 @@ sub rename_start ($$$$) {
        my $held=$attachment &&
                IkiWiki::Plugin::attachment->can("is_held_attachment") &&
                IkiWiki::Plugin::attachment::is_held_attachment($page);
        my $held=$attachment &&
                IkiWiki::Plugin::attachment->can("is_held_attachment") &&
                IkiWiki::Plugin::attachment::is_held_attachment($page);

-       if (! defined $held) {
+       if (! $held) {

                check_canrename($page, $pagesources{$page}, undef, undef,
                        $q, $session);
        }
                check_canrename($page, $pagesources{$page}, undef, undef,
                        $q, $session);
        }


@@ -206,14 +206,22 @@ sub rename_start ($$$$) {
        exit 0;
 }
 
        exit 0;
 }
 

-sub postrename ($;$$$) {
+sub postrename ($$$;$$) {
+       my $cgi=shift;

        my $session=shift;
        my $src=shift;
        my $dest=shift;
        my $attachment=shift;
 
        my $session=shift;
        my $src=shift;
        my $dest=shift;
        my $attachment=shift;
 

-       # Load saved form state and return to edit page.
-       my $postrename=CGI->new($session->param("postrename"));
+       # Load saved form state and return to edit page, using stored old
+       # cgi state. Or, if the rename was not started on the edit page, 
+       # return to the renamed page.
+       my $postrename=$session->param("postrename");
+       if (! defined $postrename) {
+               IkiWiki::redirect($cgi, urlto(defined $dest ? $dest : $src));
+               exit;
+       }
+       my $oldcgi=CGI->new($postrename);

        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 


@@ -222,21 +230,21 @@ sub postrename ($;$$$) {
                        # 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.
                        # 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);
+                       $oldcgi->param("page", $dest);

                }
 
                # Update edit form content to fix any links present
                # on it.
                }
 
                # Update edit form content to fix any links present
                # on it.

-               $postrename->param("editcontent",
+               $oldcgi->param("editcontent",

                        renamepage_hook($dest, $src, $dest,
                        renamepage_hook($dest, $src, $dest,

-                                $postrename->param("editcontent")));
+                                $oldcgi->param("editcontent")));

 
                # Get a new edit token; old was likely invalidated.
 
                # Get a new edit token; old was likely invalidated.

-               $postrename->param("rcsinfo",
+               $oldcgi->param("rcsinfo",

                        IkiWiki::rcs_prepedit($pagesources{$dest}));
        }
 
                        IkiWiki::rcs_prepedit($pagesources{$dest}));
        }
 

-       IkiWiki::cgi_editpage($postrename, $session);
+       IkiWiki::cgi_editpage($oldcgi, $session);

 }
 
 sub formbuilder (@) {
 }
 
 sub formbuilder (@) {


@@ -250,7 +258,7 @@ sub formbuilder (@) {
                my $session=$params{session};
 
                if ($form->submitted eq "Rename" && $form->field("do") eq "edit") {
                my $session=$params{session};
 
                if ($form->submitted eq "Rename" && $form->field("do") eq "edit") {

-                       rename_start($q, $session, 0, $form->field("page"));
+                       rename_start($q, $session, 0, scalar $form->field("page"));

                }
                elsif ($form->submitted eq "Rename Attachment") {
                        my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");
                }
                elsif ($form->submitted eq "Rename Attachment") {
                        my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select");


@@ -291,19 +299,19 @@ sub sessioncgi ($$) {
                my $session=shift;
                my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8($q->param("page")));
                IkiWiki::decode_form_utf8($form);
                my $session=shift;
                my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8($q->param("page")));
                IkiWiki::decode_form_utf8($form);

+               my $src=$form->field("page");

 
                if ($form->submitted eq 'Cancel') {
 
                if ($form->submitted eq 'Cancel') {

-                       postrename($session);
+                       postrename($q, $session, $src);

                }
                elsif ($form->submitted eq 'Rename' && $form->validate) {
                        IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
 
                        # These untaints are safe because of the checks
                        # performed in check_canrename later.
                }
                elsif ($form->submitted eq 'Rename' && $form->validate) {
                        IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
 
                        # These untaints are safe because of the checks
                        # performed in check_canrename later.

-                       my $src=$form->field("page");

                        my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src})
                                if exists $pagesources{$src};
                        my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src})
                                if exists $pagesources{$src};

-                       my $dest=IkiWiki::possibly_foolish_untaint(titlepage($form->field("new_name")));
+                       my $dest=IkiWiki::possibly_foolish_untaint(titlepage(scalar $form->field("new_name")));

                        my $destfile=$dest;
                        if (! $q->param("attachment")) {
                                my $type=$q->param('type');
                        my $destfile=$dest;
                        if (! $q->param("attachment")) {
                                my $type=$q->param('type');


@@ -322,9 +330,9 @@ sub sessioncgi ($$) {
                        my $held=$q->param("attachment") &&
                                IkiWiki::Plugin::attachment->can("is_held_attachment") &&
                                IkiWiki::Plugin::attachment::is_held_attachment($src);
                        my $held=$q->param("attachment") &&
                                IkiWiki::Plugin::attachment->can("is_held_attachment") &&
                                IkiWiki::Plugin::attachment::is_held_attachment($src);

-                       if (defined $held) {
+                       if ($held) {

                                rename($held, IkiWiki::Plugin::attachment::attachment_holding_location($dest));
                                rename($held, IkiWiki::Plugin::attachment::attachment_holding_location($dest));

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

                                        unless defined $srcfile;
                        }
                        
                                        unless defined $srcfile;
                        }
                        


@@ -430,7 +438,7 @@ sub sessioncgi ($$) {
                                $renamesummary.=$template->output;
                        }
 
                                $renamesummary.=$template->output;
                        }
 

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

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