projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Raise the year in the copyright to 2009
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index d2c1c46b76d223381e9be3f48fd771656985f781..160d4edebba298e99b97c3685426062e1e2c098d 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
1 2009/03/08 00:58:52
xtaran Exp $)
+# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-200
9
)
+# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
5 2009/03/08 01:28:06
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
@@
-137,6
+137,11
@@
$static_entries = 0;
# this off if they do it themselves)
$encode_xml_entities = 1;
# 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
# --------------------------------
=head1 ENVIRONMENT
@@
-186,8
+191,54
@@
development was picked up by a team of dedicated users of blosxom since
=cut
=cut
-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 !;
+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
+ $encode_8bit_chars
+ $content_type
+!;
use strict;
use FileHandle;
use strict;
use FileHandle;
@@
-666,7
+717,7
@@
sub generate {
package blosxom;
my $template = shift;
# Interpolate scalars, namespaced scalars, and hash/hashref scalars
package blosxom;
my $template = shift;
# Interpolate scalars, namespaced scalars, and hash/hashref scalars
- $template =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{([
'
"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
+ $template =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{([
\'\
"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
return $template;
};
return $template;
};
@@
-822,6
+873,12
@@
sub generate {
$fn = blosxom_html_escape($fn);
}
$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;
$story = &$interpolate($story);
$output .= $story;