From: Axel Beckert Date: Sun, 8 Mar 2009 01:11:15 +0000 (+0000) Subject: Support blog entries with filenames in different encoding than the X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=fd2b772eb0de12656ffe73514a083da6d5d590bd;p=pkg%2Fblosxom.git Support blog entries with filenames in different encoding than the blog's content by URL-escaping all non-standard characters in the URL. URL-escaping done by a regexp so far. Should perhaps be converted to some appropriate function call (doesn't CGI.pm offers URL escaping?) before doing the next release. Example URL generated with this patch: http://noone.org/blog/Deutsch/Musik/Musikalisches-Podcast-St%F6ckchen.futile --- diff --git a/blosxom.cgi b/blosxom.cgi index d2c1c46..5b4ab03 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -2,7 +2,7 @@ # Blosxom # Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2008) -# Version: 2.1.2 ($Id: blosxom.cgi,v 1.91 2009/03/08 00:58:52 xtaran Exp $) +# Version: 2.1.2 ($Id: blosxom.cgi,v 1.92 2009/03/08 01:11:15 xtaran Exp $) # Home/Docs/Licensing: http://blosxom.sourceforge.net/ # Development/Downloads: http://sourceforge.net/projects/blosxom @@ -137,6 +137,11 @@ $static_entries = 0; # this off if they do it themselves) $encode_xml_entities = 1; +# Should I encode 8 bit special characters, e.g. umlauts in URLs, e.g. +# convert an ISO-Latin-1 \"o to %F6? (off by default for now; plugins +# can change this, too) +$encode_8bit_chars = 0; + # -------------------------------- =head1 ENVIRONMENT @@ -187,7 +192,7 @@ development was picked up by a team of dedicated users of blosxom since 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_full $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 $content_type !; + 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_full $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 $encode_8bit_chars $content_type !; use strict; use FileHandle; @@ -822,6 +827,12 @@ sub generate { $fn = blosxom_html_escape($fn); } + 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; + } + $story = &$interpolate($story); $output .= $story;