X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3b0fce93e40e5457b63ceda9692901539eb4fc82..cda8592a5fd5595d12f0503bfcd2e0640e0afc86:/IkiWiki/Plugin/orphans.pm?ds=inline

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index bd3c6b8b9..711226772 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,38 +4,54 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
-	IkiWiki::register_plugin("preprocess", "orphans", \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "orphans", call => \&getsetup);
+	hook(type => "preprocess", id => "orphans", call => \&preprocess);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
 	# Needs to update whenever a page is added or removed, so
 	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
-	
-	my %linkedto;
-	foreach my $p (keys %IkiWiki::links) {
-		map { $linkedto{IkiWiki::bestlink($p, $_)}=1 if length $_ }
-			@{$IkiWiki::links{$p}};
-	}
+	add_depends($params{page}, $params{pages});
 	
 	my @orphans;
-	foreach my $page (keys %IkiWiki::renderedfiles) {
-		next if $linkedto{$page};
-		next unless IkiWiki::globlist_match($page, $params{pages});
+	foreach my $page (pagespec_match_list(
+			[ grep { ! IkiWiki::backlink_pages($_) && $_ ne 'index' }
+				keys %pagesources ],
+			$params{pages}, location => $params{page})) {
 		# If the page has a link to some other page, it's
 		# indirectly linked to a page via that page's backlinks.
-		next if grep { length $_ && $_ !~/\/Discussion$/i && IkiWiki::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}};
+		next if grep { 
+			length $_ &&
+			($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
+			bestlink($page, $_) !~ /^(\Q$page\E|)$/ 
+		} @{$links{$page}};
 		push @orphans, $page;
 	}
 	
-	return "All pages are linked to by other pages." unless @orphans;
-	return "<ul>\n".join("\n", map { "<li>".IkiWiki::htmllink($params{page}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
-} # }}}
+	return gettext("All pages have other pages linking to them.") unless @orphans;
+	return "<ul>\n".
+		join("\n",
+			map {
+				"<li>".
+				htmllink($params{page}, $params{destpage}, $_,
+					 noimageinline => 1).
+				"</li>"
+			} sort @orphans).
+		"</ul>\n";
+}
 
 1