X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c6fc554c549a63ef48e536788302c90698a89143..8cfe428a28b2714c57282566466f4f7bdbdfdffb:/IkiWiki/Plugin/htmlscrubber.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 7ce07ee9a..a249cdf7a 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -3,13 +3,14 @@ package IkiWiki::Plugin::htmlscrubber;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # This regexp matches urls that are in a known safe scheme.
 # Feel free to use it from other plugins.
 our $safe_url_regexp;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "htmlscrubber", call => \&getsetup);
 	hook(type => "sanitize", id => "htmlscrubber", call => \&sanitize);
 
 	# Only known uri schemes are allowed to avoid all the ways of
@@ -31,16 +32,40 @@ sub import { #{{{
 	);
 	# data is a special case. Allow data:image/*, but
 	# disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+$)/i;
-} # }}}
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i;
+}
 
-sub sanitize (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		htmlscrubber_skip => {
+			type => "pagespec",
+			example => "!*/Discussion",
+			description => "PageSpec specifying pages not to scrub",
+			link => "ikiwiki/PageSpec",
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub sanitize (@) {
 	my %params=@_;
+
+	if (exists $config{htmlscrubber_skip} &&
+	    length $config{htmlscrubber_skip} &&
+	    exists $params{destpage} &&
+	    pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+		return $params{content};
+	}
+
 	return scrubber()->scrub($params{content});
-} # }}}
+}
 
 my $_scrubber;
-sub scrubber { #{{{
+sub scrubber {
 	return $_scrubber if defined $_scrubber;
 
 	eval q{use HTML::Scrubber};
@@ -86,6 +111,6 @@ sub scrubber { #{{{
 		}],
 	);
 	return $_scrubber;
-} # }}}
+}
 
 1