X-Git-Url: https://git.deb.at/?p=pkg%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=ad19c9a196b65ba0f7b73000b98bad4104c4f126;hp=48ee5c1f7668cf7bd136522e887a29d9934f0a2f;hb=e509ddebed9fa275039288325945dce70833194e;hpb=011c1f0a1750d2ff913302a3e5768de9287f0b0c diff --git a/blosxom.cgi b/blosxom.cgi index 48ee5c1..ad19c9a 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -2,8 +2,8 @@ # Blosxom # Author: Rael Dornfest -# Version: 2.0.1 -# Home/Docs/Licensing: http://www.blosxom.com/ +# Version: 2.0.2 +# Home/Docs/Licensing: http://blosxom.sourceforge.net/ # Development/Downloads: http://sourceforge.net/projects/blosxom package blosxom; @@ -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"; @@ -44,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 = ""; @@ -67,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; @@ -162,17 +195,38 @@ while () { } # Plugins: Start -if ( $plugin_dir and opendir PLUGINS, $plugin_dir ) { - foreach my $plugin ( grep { /^\w+$/ && -f "$plugin_dir/$_" } sort readdir(PLUGINS) ) { - next if ($plugin =~ /~$/); # Ignore emacs backups - 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 @@ -363,14 +417,14 @@ sub generate { ($path,$fn) = $path_file =~ m!^$datadir/(?:(.*)/)?(.*)\.$file_extension!; # Only stories in the right hierarchy - $path =~ /^$currentdir(?=$|/)/ or $path_file eq "$datadir/$currentdir" or next; + $path =~ /^$currentdir/ or $path_file eq "$datadir/$currentdir" or next; # Prepend a slash for use in templates only if a path exists $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; @@ -444,11 +498,15 @@ 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); } @@ -458,6 +516,7 @@ html content_type text/html html head html head +html head html head html head $blog_title $path_info_da $path_info_mo $path_info_yr html head @@ -481,27 +540,29 @@ html date

$dw, $da $mo $yr

html foot html foot

html foot

-html foot +html foot html foot
html foot html foot rss content_type text/xml -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 @@ -514,7 +575,7 @@ error content_type text/html 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 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