X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=blosxom.cgi;h=5b4ab039a6c55e51deeaba0085fba2fa0852566c;hb=fd2b772eb0de12656ffe73514a083da6d5d590bd;hp=ff6bd665233727b600ea96997e8e65c1de3fc374;hpb=cf8524c9718dd6ac31c92ff8742a59a80d7284b9;p=pkg%2Fblosxom.git
diff --git a/blosxom.cgi b/blosxom.cgi
index ff6bd66..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.87 2008/11/13 16:39:59 alfie 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
@@ -50,7 +50,7 @@ like this:
I have successfully installed blosxom on this system. For more
information on blosxom, see the author's blosxom site.
+ href="http://blosxom.sourceforge.net/">blosxom site.
Place the file in the directory under the I<$datadir> points to. Be
sure to change the default location to be somewhere accessable by the
@@ -75,12 +75,16 @@ $blog_encoding = "UTF-8";
# 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?
-# 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?
@@ -97,8 +101,8 @@ $show_future_entries = 0;
# --- 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?
@@ -107,8 +111,8 @@ $plugin_dir = "";
# 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 -----
@@ -116,7 +120,8 @@ $plugin_path = "";
# 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?
@@ -126,13 +131,68 @@ $static_password = "";
# 0 = no, 1 = yes
$static_entries = 0;
-# Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves)
+# --- Advanced Encoding Options -----
+
+# Should I encode entities for xml content-types? (plugins can turn
+# 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
+
+=over
+
+=item B
+
+Points to the location of the configuration file. This will be
+considered as first option, if it's set.
+
+
+=item B
+
+The here named directory will be tried unless the above mentioned
+environment variable is set and tested for a contained blosxom.conf
+file.
+
+
+=back
+
+
+=head1 FILES
+
+=over
+
+=item B
+
+The CGI script itself. Please note that the location might depend on
+your installation.
+
+=item B
+
+The default configuration file location. This is rather taken as last
+ressort if no other configuration location is set through environment
+variables.
+
+=back
+
+
+=head1 AUTHOR
+
+Rael Dornfest was the original author of blosxom. The
+development was picked up by a team of dedicated users of blosxom since
+2005. See > for more information.
+
+=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 !;
+ 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;
@@ -141,7 +201,7 @@ use File::stat;
use Time::Local;
use CGI qw/:standard :netscape/;
-$version = "2.1.2";
+$version = "2.1.2+dev";
# Load configuration from $ENV{BLOSXOM_CONFIG_DIR}/blosxom.conf, if it exists
my $blosxom_config;
@@ -767,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;