X-Git-Url: https://git.deb.at/?p=pkg%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=eef5b113ae7ce0965b9c8cb0a4e20589d5d8d961;hp=642a2bf31cf3cc66c433836eca986755fb22eb27;hb=c82629ad386ed5242e126d7e146d1c3bc97cc634;hpb=fae8966333a61c57f4181cd5c6a4d3ffa42774f9 diff --git a/blosxom.cgi b/blosxom.cgi index 642a2bf..eef5b11 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -2,8 +2,9 @@ # Blosxom # Author: Rael Dornfest -# Version: 2.0 -# Home/Docs/Licensing: http://www.raelity.org/apps/blosxom/ +# Version: 2.0.2 +# Home/Docs/Licensing: http://blosxom.sourceforge.net/ +# Development/Downloads: http://sourceforge.net/projects/blosxom package blosxom; @@ -18,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"; @@ -43,6 +47,9 @@ $show_future_entries = 0; # --- Plugins (Optional) ----- +# File listing plugins blosxom should load (if empty blosxom will walk $plugin_dir) +$plugin_list = ""; + # Where are my plugins kept? $plugin_dir = ""; @@ -66,16 +73,43 @@ $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 $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; use File::Find; use File::stat; use Time::localtime; +use Time::Local; use CGI qw/:standard :netscape/; -$version = "2.0"; +$version = "2.0.2"; + +# Load configuration from $ENV{BLOSXOM_CONFIG_DIR}/blosxom.conf, if it exists +my $blosxom_config; +if ($ENV{BLOSXOM_CONFIG_FILE} && -r $ENV{BLOSXOM_CONFIG_FILE}) { + $blosxom_config = $ENV{BLOSXOM_CONFIG_FILE}; + ($config_dir = $blosxom_config) =~ s! / [^/]* $ !!x; +} +else { + for my $blosxom_config_dir ($ENV{BLOSXOM_CONFIG_DIR}, '/etc/blosxom', '/etc') { + if (-r "$blosxom_config_dir/blosxom.conf") { + $config_dir = $blosxom_config_dir; + $blosxom_config = "$blosxom_config_dir/blosxom.conf"; + last; + } + } +} +# Load $blosxom_config +if ($blosxom_config) { + if (-r $blosxom_config) { + eval { require $blosxom_config } or + warn "Error reading blosxom config file '$blosxom_config'" . ($@ ? ": $@" : ''); + } + else { + warn "Cannot find or read blosxom config file '$blosxom_config'"; + } +} my $fh = new FileHandle; @@ -83,8 +117,17 @@ my $fh = new FileHandle; @num2month = sort { $month2num{$a} <=> $month2num{$b} } keys %month2num; # Use the stated preferred URL or figure it out automatically -$url ||= url(); -$url =~ s/^included:/http:/; # Fix for Server Side Includes (SSI) +$url ||= url(-path_info => 1); +$url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED'; + +# NOTE: Since v3.12, it looks as if CGI.pm misbehaves for SSIs and +# always appends path_info to the url. To fix this, we always +# request an url with path_info, and always remove it from the end of the +# string. +my $pi_len = length $ENV{PATH_INFO}; +my $might_be_pi = substr($url, -$pi_len); +substr($url, -length $ENV{PATH_INFO}) = '' if $might_be_pi eq $ENV{PATH_INFO}; + $url =~ s!/$!!; # Drop ending any / from dir settings @@ -133,28 +176,57 @@ $template = return join '', <$fh> if $fh->open("< $datadir/$path/$chunk.$flavour"); } while ($path =~ s/(\/*[^\/]*)$// and $1); - return join '', ($template{$flavour}{$chunk} || $template{error}{$chunk} || ''); + # Check for definedness, since flavour can be the empty string + if (defined $template{$flavour}{$chunk}) { + return $template{$flavour}{$chunk}; + } elsif (defined $template{error}{$chunk}) { + return $template{error}{$chunk} + } else { + return ''; + } }; # Bring in the templates %template = (); while () { - last if /^(__END__)?$/; - my($ct, $comp, $txt) = /^(\S+)\s(\S+)\s(.*)$/; + last if /^(__END__)$/; + my($ct, $comp, $txt) = /^(\S+)\s(\S+)(?:\s(.*))?$/ or next; $txt =~ s/\\n/\n/mg; - $template{$ct}{$comp} = $txt; + $template{$ct}{$comp} .= $txt . "\n"; } # Plugins: Start -if ( $plugin_dir and opendir PLUGINS, $plugin_dir ) { - foreach my $plugin ( grep { /^\w+$/ && -f "$plugin_dir/$_" } sort readdir(PLUGINS) ) { - my($plugin_name, $off) = $plugin =~ /^\d*(\w+?)(_?)$/; - my $on_off = $off eq '_' ? -1 : 1; - require "$plugin_dir/$plugin"; - $plugin_name->start() and ( $plugins{$plugin_name} = $on_off ) and push @plugins, $plugin_name; - } +my @plugin_list = (); + +# If $plugin_list is set, read plugins to use from that file +$plugin_list = "$config_dir/$plugin_list" + if $plugin_list && $plugin_list !~ m!^\s*/!; +if ( $plugin_list and -r $plugin_list and $fh->open("< $plugin_list") ) { + @plugin_list = map { chomp $_; $_ } grep { /\S/ && ! /^#/ } <$fh>; + $fh->close; +} +# Otherwise walk $plugin_dir to get list of plugins to use +elsif ( $plugin_dir and opendir PLUGINS, $plugin_dir ) { + @plugin_list = grep { /^[\w:]+$/ && ! /~$/ && -f "$plugin_dir/$_" } sort readdir(PLUGINS); closedir PLUGINS; } +unshift @INC, $plugin_dir; +foreach my $plugin ( @plugin_list ) { + my($plugin_name, $off) = $plugin =~ /^\d*([\w:]+?)(_?)$/; + my $on_off = $off eq '_' ? -1 : 1; + # Allow perl module plugins + if ($plugin =~ m/::/ && -z "$plugin_dir/$plugin") { + # For Blosxom::Plugin::Foo style plugins, we need to use a string require + eval "require $plugin_name"; + } + else { + eval { require $plugin }; + } + $@ and warn "error finding or loading blosxom plugin $plugin_name - skipping\n" and next; + $plugin_name->start() and ( $plugins{$plugin_name} = $on_off ) and push @plugins, $plugin_name; +} +shift @INC; + # Plugins: Template # Allow for the first encountered plugin::template subroutine to override the # default built-in template subroutine @@ -165,7 +237,7 @@ sub load_template { return &$template(@_); } -# Define default find subroutine +# Define default entries subroutine $entries = sub { my(%files, %indexes, %others); @@ -219,10 +291,7 @@ $entries = my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('entries') and defined($tmp = $plugin->entries()) and $entries = $tmp and last; } my ($files, $indexes, $others) = &$entries(); -%files = %$files; %indexes = %$indexes; %others = ref $others ? %$others : (); - -# Plugins: Filter -foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('filter') and $entries = $plugin->filter(\%files, \%others) } +%indexes = %$indexes; # Static if (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and param('-password') eq $static_password) { @@ -236,7 +305,6 @@ if (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and par foreach ( ('', split /\//, $path) ) { $p .= "/$_"; $p =~ s!^/!!; - $path_info = $p; $done{$p}++ and next; (-d "$static_dir/$p" or $p =~ /\.$file_extension$/) or mkdir "$static_dir/$p", 0755; foreach $flavour ( @static_flavours ) { @@ -246,10 +314,19 @@ if (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and par param('-quiet') or print "$fn.$flavour\n"; my $fh_w = new FileHandle "> $static_dir/$fn.$flavour" or die "Couldn't open $static_dir/$p for writing: $!"; $output = ''; - print $fh_w - $indexes{$path} == 1 - ? &generate('static', $p, '', $flavour, $content_type) - : &generate('static', '', $p, $flavour, $content_type); + if ($indexes{$path} == 1) { + # category + $path_info = $p; + # individual story + $path_info =~ s!\.$file_extension$!\.$flavour!; + print $fh_w &generate('static', $path_info, '', $flavour, $content_type); + } else { + # date + local ($path_info_yr,$path_info_mo,$path_info_da, $path_info) = + split /\//, $p, 4; + unless (defined $path_info) {$path_info = ""}; + print $fh_w &generate('static', '', $p, $flavour, $content_type); + } $fh_w->close; } } @@ -261,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); } @@ -273,6 +348,11 @@ foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('end') sub generate { my($static_or_dynamic, $currentdir, $date, $flavour, $content_type) = @_; + %files = %$files; %others = ref $others ? %$others : (); + + # Plugins: Filter + foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('filter') and $entries = $plugin->filter(\%files, \%others) } + my %f = %files; # Plugins: Skip @@ -296,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)); @@ -341,8 +425,8 @@ sub generate { $path &&= "/$path"; # Date fiddling for by-{year,month,day} archive views - use vars qw/ $dw $mo $mo_num $da $ti $yr $hr $min $hr12 $ampm /; - ($dw,$mo,$mo_num,$da,$ti,$yr) = nice_date($files{"$path_file"}); + use vars qw/ $dw $mo $mo_num $da $ti $yr $hr $min $hr12 $ampm $utc_offset/; + ($dw,$mo,$mo_num,$da,$ti,$yr,$utc_offset) = nice_date($files{"$path_file"}); ($hr,$min) = split /:/, $ti; ($hr12, $ampm) = $hr >= 12 ? ($hr - 12,'pm') : ($hr, 'am'); $hr12 =~ s/^0//; $hr12 == 0 and $hr12 = 12; @@ -375,7 +459,7 @@ sub generate { # Plugins: Story foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('story') and $entries = $plugin->story($path, $fn, \$story, \$title, \$body) } - if ($content_type =~ m{\Wxml$}) { + if ($content_type =~ m{\bxml\b}) { # Escape <, >, and &, and to produce valid RSS my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); my $escape_re = join '|' => keys %escape; @@ -416,29 +500,91 @@ sub nice_date { my($unixtime) = @_; my $c_time = ctime($unixtime); - my($dw,$mo,$da,$ti,$yr) = ( $c_time =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}:\d{2}):\d{2} +(\d{4})$/ ); + my($dw,$mo,$da,$hr,$min,$yr) = ( $c_time =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}):(\d{2}):\d{2} +(\d{4})$/ ); + $ti="$hr:$min"; $da = sprintf("%02d", $da); my $mo_num = $month2num{$mo}; - - return ($dw,$mo,$mo_num,$da,$ti,$yr); + + my $offset = timegm(00, $min, $hr, $da, $mo_num-1, $yr-1900)-$unixtime; + my $utc_offset = sprintf("%+03d", int($offset / 3600)).sprintf("%02d", ($offset % 3600)/60) ; + + return ($dw,$mo,$mo_num,$da,$ti,$yr,$utc_offset); } # Default HTML and RSS template bits __DATA__ -html content_type text/html -html head $blog_title $path_info_da $path_info_mo $path_info_yr
$blog_title
$path_info_da $path_info_mo $path_info_yr

-html story

$title
$body

posted at: $ti | path: $path | permanent link to this entry

\n -html date

$dw, $da $mo $yr

\n -html foot

-rss content_type text/xml -rss head \n\n\n\n\n \n $blog_title $path_info_da $path_info_mo $path_info_yr\n $url\n $blog_description\n $blog_language\n -rss story \n $title\n $url/$yr/$mo_num/$da#$fn\n $body\n \n -rss date \n -rss foot \n +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 +html head +html head +html head
+html head $blog_title
+html head $path_info_da $path_info_mo $path_info_yr +html head
+html head

+ +html story

+html story $title
+html story $body
+html story
+html story posted at: $ti | path: $path | permanent link to this entry +html story

+ +html date

$dw, $da $mo $yr

+ +html foot +html foot

+html foot

+html foot +html foot
+html foot +html foot + +rss content_type text/xml ; charset=$blog_encoding + +rss head +rss head +rss head +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 + +rss date + +rss foot +rss foot + error content_type text/html -error head

Error: I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.\n\n -error story

$title
$body #

\n -error date

$dw, $da $mo $yr

\n -error foot + +error head +error head +error head

Error: I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.

+ + +error story

$title
+error story $body #

+ +error date

$dw, $da $mo $yr

+ +error foot +error foot __END__