changelog

[git.ikiwiki.info.git] / IkiWiki / Plugin / htmlscrubber.pm

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 505a6f14293c7a35c4e2846e8ca0964dc0822066..b22d3aa9e25d6ee6843d3b4ca6a523bea06766d7 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -28,11 +28,11 @@ sub import {
                "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
                "irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
                "msnim", "notes", "rsync", "secondlife", "skype", "ssh",
                "aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
                "irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
                "msnim", "notes", "rsync", "secondlife", "skype", "ssh",

-               "sftp", "smb", "sms", "snews", "webcal", "ymsgr",
+               "sftp", "smb", "sms", "snews", "webcal", "ymsgr", "bitcoin"

        );
        # data is a special case. Allow a few data:image/ types,
        # but disallow data:text/javascript and everything else.
        );
        # data is a special case. Allow a few data:image/ types,
        # but disallow data:text/javascript and everything else.

-       $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
+       $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i;

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -57,8 +57,8 @@ sub sanitize (@) {
 
        if (exists $config{htmlscrubber_skip} &&
            length $config{htmlscrubber_skip} &&
 
        if (exists $config{htmlscrubber_skip} &&
            length $config{htmlscrubber_skip} &&

-           exists $params{destpage} &&
-           pagespec_match($params{destpage}, $config{htmlscrubber_skip})) {
+           exists $params{page} &&
+           pagespec_match($params{page}, $config{htmlscrubber_skip})) {

                return $params{content};
        }
 
                return $params{content};
        }
 


@@ -107,7 +107,7 @@ sub scrubber {
                                placeholder min max step low high optimum
                                form required autocomplete novalidate pattern
                                list formenctype formmethod formnovalidate
                                placeholder min max step low high optimum
                                form required autocomplete novalidate pattern
                                list formenctype formmethod formnovalidate

-                               formtarget reversed spellcheck open
+                               formtarget reversed spellcheck open hidden

                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        href => $safe_url_regexp,
                        } ),
                        "/" => 1, # emit proper <hr /> XHTML
                        href => $safe_url_regexp,