X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=eef5b113ae7ce0965b9c8cb0a4e20589d5d8d961;hp=13cf0f9302d7f6d7f19090034c4d3f367300b57b;hb=c82629ad386ed5242e126d7e146d1c3bc97cc634;hpb=bf867cbe9f9ab1a6e9473cf61f1c54f3da621359
diff --git a/blosxom.cgi b/blosxom.cgi
index 13cf0f9..eef5b11 100755
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -19,6 +19,9 @@ $blog_description = "Yet another Blosxom weblog.";
# What's this blog's primary language (for outgoing RSS feed)?
$blog_language = "en";
+# What's this blog's text encoding ?
+$blog_encoding = "UTF-8";
+
# Where are this blog's entries kept?
$datadir = "/Library/WebServer/Documents/blosxom";
@@ -70,7 +73,7 @@ $static_entries = 0;
# --------------------------------
-use vars qw! $version $blog_title $blog_description $blog_language $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $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 !;
+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_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 !;
use strict;
use FileHandle;
@@ -335,8 +338,6 @@ else {
my $content_type = (&$template($path_info,'content_type',$flavour));
$content_type =~ s!\n.*!!s;
- $header = {-type=>$content_type};
-
print generate('dynamic', $path_info, "$path_info_yr/$path_info_mo_num/$path_info_da", $flavour, $content_type);
}
@@ -375,6 +376,10 @@ sub generate {
# override the default built-in interpolate subroutine
my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('interpolate') and defined($tmp = $plugin->interpolate()) and $interpolate = $tmp and last; }
+ # Content_type
+ $content_type=&$interpolate($content_type);
+ $header = {-type=>$content_type};
+
# Head
my $head = (&$template($currentdir,'head',$flavour));
@@ -509,10 +514,11 @@ sub nice_date {
# Default HTML and RSS template bits
__DATA__
-html content_type text/html
+html content_type text/html; charset=$blog_encoding
html head
html head
+html head
html head
html head $blog_title $path_info_da $path_info_mo $path_info_yr
html head
@@ -541,22 +547,24 @@ html foot
html foot
html foot
-rss content_type text/xml
+rss content_type text/xml ; charset=$blog_encoding
-rss head
-rss head
-rss head
-rss head
-rss head
+rss head
+rss head
rss head
-rss head $blog_title $path_info_da $path_info_mo $path_info_yr
-rss head $url
+rss head $blog_title
+rss head $url/$path_info
rss head $blog_description
rss head $blog_language
+rss head http://blogs.law.harvard.edu/tech/rss
+rss head blosxom/$version
rss story -
rss story $title
+rss story $dw, $da $mo $yr $ti:00 $utc_offset
rss story $url/$yr/$mo_num/$da#$fn
+rss story $path
+rss story $path/$fn
rss story $body
rss story