projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring usage of $url_escape_re into a function named url_escape_url_path_and_fn.
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 86166f4449d2dca7b2011adcb31ef80ac60b7467..590e0f2b4adfd76dc2f0220daecd96449266bfb7 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-2,7
+2,7
@@
# Blosxom
# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2009)
# Blosxom
# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2009)
-# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
6 2009/07/19 12:21:09
xtaran Exp $)
+# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
8 2009/07/19 17:18:37
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
@@
-858,14
+858,20
@@
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
- $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_escape_url_path_and_fn();
# Escape <, >, and &, and to produce valid RSS
$title = blosxom_html_escape($title);
# Escape <, >, and &, and to produce valid RSS
$title = blosxom_html_escape($title);
@@
-875,10
+881,9
@@
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_escape_url_path_and_fn();
}
$story = &$interpolate($story);
}
$story = &$interpolate($story);
@@
-938,6
+943,12
@@
sub nice_date {
return ( $dw, $mo, $mo_num, $da, $ti, $yr, $utc_offset );
}
return ( $dw, $mo, $mo_num, $da, $ti, $yr, $utc_offset );
}
+sub url_escape_url_path_and_fn {
+ $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;
+}
+
# Default HTML and RSS template bits
__DATA__
html content_type text/html; charset=$blog_encoding
# Default HTML and RSS template bits
__DATA__
html content_type text/html; charset=$blog_encoding