X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=37480ba3cb53f0508f1d36a852a13820b700e1f6;hp=3bd3ae9a1510a91caba0f6c4f5e4dc7988631dda;hb=df025f9dccc0ec3fef6d733af450ad252d36e107;hpb=86608a808dd5465a2f186b51c46f8aa786679bd6
diff --git a/blosxom.cgi b/blosxom.cgi
index 3bd3ae9..37480ba 100755
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -79,7 +79,7 @@ $static_entries = 0;
# --------------------------------
use vars
- qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others !;
+ qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others $encode_xml_entities !;
use strict;
use FileHandle;
@@ -90,6 +90,9 @@ use CGI qw/:standard :netscape/;
$version = "2.0.2";
+# Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves)
+$encode_xml_entities = 1;
+
# Load configuration from $ENV{BLOSXOM_CONFIG_DIR}/blosxom.conf, if it exists
my $blosxom_config;
if ( $ENV{BLOSXOM_CONFIG_FILE} && -r $ENV{BLOSXOM_CONFIG_FILE} ) {
@@ -293,6 +296,8 @@ foreach my $plugin (@plugin_list) {
my $on_off = $off eq '_' ? -1 : 1;
# Allow perl module plugins
+ # The -z test is a hack to allow a zero-length placeholder file in a
+ # $plugin_path directory to indicate an @INC module should be loaded
if ( $plugin =~ m/::/ && ( $plugin_list || -z $plugin_hash{$plugin} ) ) {
# For Blosxom::Plugin::Foo style plugins, we need to use a string require
@@ -508,10 +513,10 @@ sub generate {
# Define default interpolation subroutine
$interpolate = sub {
-
package blosxom;
my $template = shift;
- $template =~ s/(\$\w+(?:::\w+)*)/"defined $1 ? $1 : ''"/gee;
+ # Interpolate scalars, namespaced scalars, and hash/hashref scalars
+ $template =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{(['"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
return $template;
};
@@ -646,7 +651,7 @@ sub generate {
}
}
- if ( $content_type =~ m{\bxml\b} ) {
+ if ( $encode_xml_entities && $content_type =~ m{\bxml\b} ) {
# Escape <, >, and &, and to produce valid RSS
my %escape = (
@@ -724,7 +729,7 @@ html content_type text/html; charset=$blog_encoding
html head
html head
html head
-html head
+html head
html head $blog_title $path_info_da $path_info_mo $path_info_yr
html head
html head