X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=IkiWiki%2FPlugin%2Frecentchanges.pm;h=65044080fe78d835d1d4b57e627ec0a9c8052661;hp=ef108b3f00d4f031ef3ca3b0f1bab228f0dce279;hb=5a4c95cc352d6895c11542245981c62a5c003370;hpb=ffec6806087981420eaf83c8d83cc4523a46d0de

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index ef108b3f0..65044080f 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,9 +11,11 @@ sub import {
 	hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 	hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
 	hook(type => "refresh", id => "recentchanges", call => \&refresh);
+	hook(type => "pageactions", id => "recentchanges", call => \&pageactions);
 	hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
 	hook(type => "htmlize", id => "_change", call => \&htmlize);
-	hook(type => "cgi", id => "recentchanges", call => \&cgi);
+	# Load goto to fix up links from recentchanges
+	IkiWiki::loadplugin("goto");
 }
 
 sub getsetup () {
@@ -60,14 +62,27 @@ sub refresh ($) {
 }
 
 # Enable the recentchanges link on wiki pages.
+sub pageactions (@) {
+	my %params=@_;
+	my $page=$params{page};
+
+	if (defined $config{recentchangespage} && $config{rcs} &&
+	    $page ne $config{recentchangespage}) {
+		return htmllink($page, $page, $config{recentchangespage},
+			gettext("RecentChanges"));
+	}
+}
+
+# Backwards compatability for templates still using
+# RECENTCHANGESURL.
 sub pagetemplate (@) {
 	my %params=@_;
 	my $template=$params{template};
 	my $page=$params{page};
 
 	if (defined $config{recentchangespage} && $config{rcs} &&
-	    $page ne $config{recentchangespage} &&
-	    $template->query(name => "recentchangesurl")) {
+	    $template->query(name => "recentchangesurl") &&
+	    $page ne $config{recentchangespage}) {
 		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
 		$template->param(have_actions => 1);
 	}
@@ -79,48 +94,6 @@ sub htmlize (@) {
 	return $params{content};
 }
 
-sub cgi ($) {
-	my $cgi=shift;
-	if (defined $cgi->param('do') && $cgi->param('do') eq "recentchanges_link") {
-		# This is a link from a change page to some
-		# other page. Since the change pages are only generated
-		# once, statically, links on them won't be updated if the
-		# page they link to is deleted, or newly created, or
-		# changes for whatever reason. So this CGI handles that
-		# dynamic linking stuff.
-		my $page=decode_utf8($cgi->param("page"));
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-
-		IkiWiki::loadindex();
-
-		# If the page is internal (like a comment), see if it has a
-		# permalink. Comments do.
-		if (IkiWiki::isinternal($page) &&
-		    defined $pagestate{$page}{meta}{permalink}) {
-			IkiWiki::redirect($cgi,
-			                  $pagestate{$page}{meta}{permalink});
-			exit;
-		}
-
-		my $link=bestlink("", $page);
-		if (! length $link) {
-			print "Content-type: text/html\n\n";
-			print IkiWiki::misctemplate(gettext(gettext("missing page")),
-				"<p>".
-				sprintf(gettext("The page %s does not exist."),
-					htmllink("", "", $page)).
-				"</p>");
-		}
-		else {
-			IkiWiki::redirect($cgi, urlto($link, undef, 1));
-		}
-
-		exit;
-	}
-}
-
 sub store ($$$) {
 	my $change=shift;
 
@@ -138,7 +111,7 @@ sub store ($$$) {
 			if (length $config{cgiurl}) {
 				$_->{link} = "<a href=\"".
 					IkiWiki::cgiurl(
-						do => "recentchanges_link",
+						do => "goto",
 						page => $_->{page}
 					).
 					"\" rel=\"nofollow\">".
@@ -164,8 +137,8 @@ sub store ($$$) {
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
-			do => "recentchanges_link",
-			page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author},
+			do => "goto",
+			page => IkiWiki::userpage($change->{author}),
 		);
 	}