X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/39195de96e6f705e4a5741254d6d01d14127005c..11550f95937c51d49dced7dba17b940be2500386:/IkiWiki/Plugin/rename.pm

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 5dcd4e936..f90a3b7b7 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -52,7 +52,7 @@ sub check_canrename ($$$$$$$) { #{{{
 	
 	# Dest checks can be omitted by passing undef.
 	if (defined $dest) {
-		if ($src eq $dest || $srcfile eq $destfile) {
+		if ($srcfile eq $destfile) {
 			error(gettext("no change to the file name was specified"));
 		}
 
@@ -63,7 +63,7 @@ sub check_canrename ($$$$$$$) { #{{{
 		}
 
 		# Must not be a known source file.
-		if (exists $pagesources{$dest}) {
+		if ($src ne $dest && exists $pagesources{$dest}) {
 			error(sprintf(gettext("%s already exists"),
 				htmllink("", "", $dest, noimageinline => 1)));
 		}
@@ -106,6 +106,24 @@ sub rename_form ($$$) { #{{{
 	$f->field(name => "do", type => "hidden", value => "rename", force => 1);
 	$f->field(name => "page", type => "hidden", value => $page, force => 1);
 	$f->field(name => "new_name", value => IkiWiki::pagetitle($page), size => 60);
+	if (!$q->param("attachment")) {
+		# insert the standard extensions
+		my @page_types;
+		if (exists $IkiWiki::hooks{htmlize}) {
+			@page_types=grep { !/^_/ }
+				keys %{$IkiWiki::hooks{htmlize}};
+		}
+	
+		# make sure the current extension is in the list
+		my ($ext) = $pagesources{$page}=~/\.([^.]+)$/;
+		if (! $IkiWiki::hooks{htmlize}{$ext}) {
+			unshift(@page_types, $ext);
+		}
+	
+		$f->field(name => "type", type => 'select',
+			options => \@page_types,
+			value => $ext, force => 1);
+	}
 	$f->field(name => "attachment", type => "hidden");
 
 	return $f, ["Rename", "Cancel"];
@@ -231,13 +249,17 @@ sub sessioncgi ($$) { #{{{
 			my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src});
 			my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name")));
 
-			# The extension of dest is the same as src if it's
-			# a page. If it's an extension, the extension is
-			# already included.
 			my $destfile=$dest;
 			if (! $q->param("attachment")) {
-				my ($ext)=$srcfile=~/(\.[^.]+)$/;
-				$destfile.=$ext;
+				my $type=$q->param('type');
+				if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
+					$type=IkiWiki::possibly_foolish_untaint($type);
+				} else {
+					my ($ext)=$srcfile=~/\.([^.]+)$/;
+					$type=$ext;
+				}
+				
+				$destfile.=".".$type;
 			}
 
 			check_canrename($src, $srcfile, $dest, $destfile,
@@ -261,31 +283,33 @@ sub sessioncgi ($$) { #{{{
 				}
 			}
 			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 ($src ne $dest) {
+				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 ($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;
+						}
 					}
 				}
 			}
@@ -298,39 +322,44 @@ sub sessioncgi ($$) { #{{{
 
 			# 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;
+			if ($src ne $dest) {
+				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;
 				}
-				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
-			]);
+			$template->param(src => $srcfile);
+			$template->param(dest => $destfile);
+			if ($src ne $dest) {
+				$template->param(brokenlinks_checked => 1);
+				$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"));