projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding two backslashes to a single single and a single double quote inside a regexp...
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 492acc880efdf20529757f6be8517716d507a269..1336e8b0a0d0aef4f4350187585945fd055d9fab 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-2,7
+2,7
@@
# Blosxom
# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2008)
# Blosxom
# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2008)
-# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
0 2009/03/08 00:50:5
5 xtaran Exp $)
+# Version: 2.1.2 ($Id: blosxom.cgi,v 1.9
3 2009/03/08 01:14:3
5 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
@@
-75,12
+75,16
@@
$blog_encoding = "UTF-8";
# Where are this blog's entries kept?
$datadir = "/Library/WebServer/Documents/blosxom";
# Where are this blog's entries kept?
$datadir = "/Library/WebServer/Documents/blosxom";
-# What's my preferred base URL for this blog (leave blank for automatic)?
+# What's my preferred base URL for this blog (leave blank for
+# automatic)?
$url = "";
# Should I stick only to the datadir for items or travel down the
# directory hierarchy looking for items? If so, to what depth?
$url = "";
# Should I stick only to the datadir for items or travel down the
# directory hierarchy looking for items? If so, to what depth?
-# 0 = infinite depth (aka grab everything), 1 = datadir only, n = n levels down
+#
+# 0 = infinite depth (aka grab everything), 1 = datadir only,
+# n = n levels down
+
$depth = 0;
# How many entries should I show on the home page?
$depth = 0;
# How many entries should I show on the home page?
@@
-97,8
+101,8
@@
$show_future_entries = 0;
# --- Plugins (Optional) -----
# --- Plugins (Optional) -----
-# File listing plugins blosxom should load
-#
(if empty blosxom will load
all plugins in $plugin_dir and $plugin_path directories)
+# File listing plugins blosxom should load
(if empty blosxom will load
+# all plugins in $plugin_dir and $plugin_path directories)
$plugin_list = "";
# Where are my plugins kept?
$plugin_list = "";
# Where are my plugins kept?
@@
-107,8
+111,8
@@
$plugin_dir = "";
# Where should my plugins keep their state information?
$plugin_state_dir = "$plugin_dir/state";
# Where should my plugins keep their state information?
$plugin_state_dir = "$plugin_dir/state";
-# Additional plugins location
-#
List of directories, separated by ';' on windows, ':' everywhere else
+# Additional plugins location
. A list of directories, separated by ';'
+#
on windows, ':' everywhere else.
$plugin_path = "";
# --- Static Rendering -----
$plugin_path = "";
# --- Static Rendering -----
@@
-116,7
+120,8
@@
$plugin_path = "";
# Where are this blog's static files to be created?
$static_dir = "/Library/WebServer/Documents/blog";
# Where are this blog's static files to be created?
$static_dir = "/Library/WebServer/Documents/blog";
-# What's my administrative password (you must set this for static rendering)?
+# What's my administrative password (you must set this for static
+# rendering)?
$static_password = "";
# What flavours should I generate statically?
$static_password = "";
# What flavours should I generate statically?
@@
-128,9
+133,15
@@
$static_entries = 0;
# --- Advanced Encoding Options -----
# --- Advanced Encoding Options -----
-# Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves)
+# Should I encode entities for xml content-types? (plugins can turn
+# this off if they do it themselves)
$encode_xml_entities = 1;
$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
@@
-181,7
+192,7
@@
development was picked up by a team of dedicated users of blosxom since
use vars
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;
use strict;
use FileHandle;
@@
-660,7
+671,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;
};
@@
-816,6
+827,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;