projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support also unescaped versions of $url, $path and $fn in case $encode_xml_entities...
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index b3c3ef08b997405069631edc990d8edbe2b7335c..c079ab257a6a53a511ec8f264d0a71ca16929886 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-1,8
+1,8
@@
#!/usr/bin/perl
# Blosxom
#!/usr/bin/perl
# Blosxom
-# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-200
8
)
-# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
4 2009/03/08 01:18:11
xtaran Exp $)
+# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-200
9
)
+# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
7 2009/07/19 17:14:20
xtaran Exp $)
# Home/Docs/Licensing: http://blosxom.sourceforge.net/
# Development/Downloads: http://sourceforge.net/projects/blosxom
# Home/Docs/Licensing: http://blosxom.sourceforge.net/
# Development/Downloads: http://sourceforge.net/projects/blosxom
@@
-142,6
+142,11
@@
$encode_xml_entities = 1;
# can change this, too)
$encode_8bit_chars = 0;
# can change this, too)
$encode_8bit_chars = 0;
+# RegExp matching all characters which should be URL encoded in links.
+# Defaults to anything but numbers, letters, slash, colon, dash,
+# underscore and dot.
+$url_escape_re = qr([^-/a-zA-Z0-9:._]);
+
# --------------------------------
=head1 ENVIRONMENT
# --------------------------------
=head1 ENVIRONMENT
@@
-237,6
+242,7
@@
use vars qw!
%others
$encode_xml_entities
$encode_8bit_chars
%others
$encode_xml_entities
$encode_8bit_chars
+ $url_escape_re
$content_type
!;
$content_type
!;
@@
-852,15
+858,19
@@
sub generate {
}
}
}
}
+ # Save unescaped versions and allow them to be used in
+ # flavour templates.
+ use vars qw/$url_unesc $path_unesc $fn_unesc/;
+ $url_unesc = $url;
+ $path_unesc = $path;
+ $fn_unesc = $fn;
+
+ # Fix special characters in links inside XML content
if ( $encode_xml_entities &&
$content_type =~ m{\bxml\b} &&
$content_type !~ m{\bxhtml\b} ) {
# Escape special characters inside the <link> container
if ( $encode_xml_entities &&
$content_type =~ m{\bxml\b} &&
$content_type !~ m{\bxhtml\b} ) {
# Escape special characters inside the <link> container
- # The following line should be moved more towards to top for
- # performance reasons -- Axel Beckert, 2008-07-22
- my $url_escape_re = qr([^-/a-zA-Z0-9:._]);
-
$url =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
$path =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
$fn =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
$url =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
$path =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
$fn =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
@@
-873,10
+883,11
@@
sub generate {
$fn = blosxom_html_escape($fn);
}
$fn = blosxom_html_escape($fn);
}
+ # Fix special characters in links inside XML content
if ($encode_8bit_chars) {
if ($encode_8bit_chars) {
- $url =~ s(
[^-a-zA-Z0-9_./:]
)(sprintf('%%%02X', ord($&)))ge;
- $path =~ s(
[^-a-zA-Z0-9_./:]
)(sprintf('%%%02X', ord($&)))ge;
- $fn =~ s(
[^-a-zA-Z0-9_./:]
)(sprintf('%%%02X', ord($&)))ge;
+ $url =~ s(
$url_escape_re
)(sprintf('%%%02X', ord($&)))ge;
+ $path =~ s(
$url_escape_re
)(sprintf('%%%02X', ord($&)))ge;
+ $fn =~ s(
$url_escape_re
)(sprintf('%%%02X', ord($&)))ge;
}
$story = &$interpolate($story);
}
$story = &$interpolate($story);