X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cbf1c8b810cf782e36bbe87343d5f4a81f5dd52e..52bbdbb1a5ce994c9afac253c1d9bfd94acf4d1d:/IkiWiki/Plugin/rename.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 345cd7324..527ee88bc 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -47,8 +47,9 @@ sub check_canrename ($$$$$$$) { #{{{
 			error(gettext("no change to the file name was specified"));
 		}
 
-		# Must be a legal filename.	
-		if (file_pruned($destfile, $config{srcdir})) {
+		# Must be a legal filename, and not absolute.
+		if (IkiWiki::file_pruned($destfile, $config{srcdir}) || 
+		    $destfile=~/^\//) {
 			error(sprintf(gettext("illegal name")));
 		}
 
@@ -66,23 +67,13 @@ sub check_canrename ($$$$$$$) { #{{{
 		# Must be editable.
 		IkiWiki::check_canedit($dest, $q, $session);
 		if ($attachment) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $destfile);
+			# Note that $srcfile is used here, not $destfile,
+			# because it wants the current file, to check it.
+			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
 		}
 	}
 } #}}}
 
-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;
@@ -111,7 +102,7 @@ sub rename_form ($$$) { #{{{
 	return $f, ["Rename", "Cancel"];
 } #}}}
 
-sub rename_start ($$$$) {
+sub rename_start ($$$$) { #{{{
 	my $q=shift;
 	my $session=shift;
 	my $attachment=shift;
@@ -136,25 +127,40 @@ sub rename_start ($$$$) {
 	
 	IkiWiki::showform($f, $buttons, $session, $q);
 	exit 0;
-}
+} #}}}
 
-sub postrename ($;$) {
+sub postrename ($;$$$) { #{{{
 	my $session=shift;
-	my $newname=shift;
+	my $src=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) {
+		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);
+} #}}}
 
 sub formbuilder (@) { #{{{
 	my %params=@_;
@@ -180,6 +186,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;
 
@@ -210,32 +234,97 @@ sub sessioncgi ($$) { #{{{
 			check_canrename($src, $srcfile, $dest, $destfile,
 				$q, $session, $q->param("attachment"));
 
-			# Do rename, and update the wiki.
+			# Ensures that the dest directory exists and is ok.
+			IkiWiki::prep_writefile($destfile, $config{srcdir});
+
+			# Do rename, update other pages, and refresh site.
+			IkiWiki::disable_commit_hook() if $config{rcs};
 			require IkiWiki::Render;
 			if ($config{rcs}) {
-				IkiWiki::disable_commit_hook();
-				my $token=IkiWiki::rcs_prepedit($srcfile);
 				IkiWiki::rcs_rename($srcfile, $destfile);
-				# TODO commit destfile too
-				IkiWiki::rcs_commit($srcfile, gettext("rename $srcfile to $destfile"),
-					$token, $session->param("name"), $ENV{REMOTE_ADDR});
-				IkiWiki::enable_commit_hook();
-				IkiWiki::rcs_update();
+				IkiWiki::rcs_commit_staged(
+					sprintf(gettext("rename %s to %s"), $src, $dest),
+					$session->param("name"), $ENV{REMOTE_ADDR});
 			}
 			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();
 
-			if ($q->param("attachment")) {
-				postrename($session);
-			}
-			else {
-				postrename($session, $dest);
+			# Scan for any remaining broken links to $src.
+			my @brokenlinks;
+			foreach my $page (keys %links) {
+				my $broken=0;
+				foreach my $link (@{$links{$page}}) {
+					my $bestlink=bestlink($page, $link);
+					if ($bestlink eq $src) {
+						$broken=1;
+						last;
+					}
+				}
+				push @brokenlinks, $page if $broken;
 			}
+
+			# 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(brokenlinks => [
+				map {
+					{
+						page => htmllink($dest, $dest, $_,
+								noimageinline => 1)
+					}
+				} @brokenlinks
+			]);
+			$template->param(fixedlinks => [
+				map {
+					{
+						page => htmllink($dest, $dest, $_,
+								noimageinline => 1)
+					}
+				} @fixedlinks
+			]);
+			$renamesummary=$template->output;
+
+			postrename($session, $src, $dest, $q->param("attachment"));
 		}
 		else {
 			IkiWiki::showform($form, $buttons, $session, $q);
@@ -243,6 +332,21 @@ sub sessioncgi ($$) { #{{{
 
 		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