X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=fd8124a60f853f4740d7173e952d83b5a5bdb842;hp=48a79b57bd32ab341a9bfb3b9a5a35faa909903a;hb=48935bf37d13ca37f80234b3183f056eb5be7c57;hpb=c9626e1f75bba2015a0522f907ca2a2155cd0cf6 diff --git a/blosxom.cgi b/blosxom.cgi index 48a79b5..fd8124a 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,11 +47,17 @@ $show_future_entries = 0; # --- Plugins (Optional) ----- -# Where are my plugins kept? -$plugin_dir = ""; +# File listing plugins blosxom should load +# (if empty blosxom will load all plugins in $plugin_path directories) +$plugin_list = ""; + +# Where are my plugins kept? +# List of directories, separated by ';' on windows, ':' everywhere else +$plugin_path = ""; -# Where should my modules keep their state information? -$plugin_state_dir = "$plugin_dir/state"; +# Where should my plugins keep their state information? +$plugin_state_dir = ""; +#$plugin_state_dir = "/var/lib/blosxom/state"; # --- Static Rendering ----- @@ -67,16 +76,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_path $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; @@ -101,13 +137,22 @@ $url =~ s!/$!!; $datadir =~ s!/$!!; $plugin_dir =~ s!/$!!; $static_dir =~ s!/$!!; # Fix depth to take into account datadir's path -$depth and $depth += ($datadir =~ tr[/][]) - 1; +$depth += ($datadir =~ tr[/][]) - 1 if $depth; # Global variable to be used in head/foot.{flavour} templates $path_info = ''; -$static_or_dynamic = (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and param('-password') eq $static_password) ? 'static' : 'dynamic'; -$static_or_dynamic eq 'dynamic' and param(-name=>'-quiet', -value=>1); +if ( !$ENV{GATEWAY_INTERFACE} + and param('-password') + and $static_password + and param('-password') eq $static_password ) +{ + $static_or_dynamic = 'static'; +} +else { + $static_or_dynamic = 'dynamic'; + param( -name => '-quiet', -value => 1 ); +} # Path Info Magic # Take a gander at HTTP's PATH_INFO for optional blog name, archive yr/mo/day @@ -121,7 +166,7 @@ $flavour = ''; if ( $path_info[$#path_info] =~ /(.+)\.(.+)$/ ) { $flavour = $2; - $1 ne 'index' and $path_info .= "/$1.$2"; + $path_info .= "/$1.$2" if $1 ne 'index'; pop @path_info; } else { $flavour = param('flav') || $default_flavour; @@ -162,28 +207,72 @@ 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 $path_sep = $^O eq 'MSWin32' ? ';' : ':'; +my @plugin_dirs = split /$path_sep/, ($plugin_path || $plugin_dir); +my @plugin_list = (); +my %plugin_hash = (); + +# 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_dirs to get list of plugins to use +elsif ( @plugin_dirs ) { + for my $plugin_dir ( @plugin_dirs ) { + next unless -d $plugin_dir; + if ( opendir PLUGINS, $plugin_dir ) { + for my $plugin ( grep { /^[\w:]+$/ && ! /~$/ && -f "$plugin_dir/$_" } readdir(PLUGINS) ) { + # Ignore duplicates + next if $plugin_hash{ $plugin }; + # Add to @plugin_list and %plugin_hash + $plugin_hash{ $plugin } = "$plugin_dir/$plugin"; + push @plugin_list, $plugin; + } + closedir PLUGINS; + } + } + @plugin_list = sort @plugin_list; +} + +# Load all plugins in @plugin_list +unshift @INC, @plugin_dirs; +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_hash{ $plugin }) { + # For Blosxom::Plugin::Foo style plugins, we need to use a string require + eval "require $plugin_name"; + } + else { + eval { require $plugin }; } - closedir PLUGINS; + $@ 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 foreach @plugin_dirs; # Plugins: Template # Allow for the first encountered plugin::template subroutine to override the # default built-in template subroutine -my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('template') and defined($tmp = $plugin->template()) and $template = $tmp and last; } +foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('template') ) { + if ( my $tmp = $plugin->template() ) { + $template = $tmp; + last; + } + } +} # Provide backward compatibility for Blosxom < 2.0rc1 plug-ins sub load_template { return &$template(@_); } -# Define default find subroutine +# Define default entries subroutine $entries = sub { my(%files, %indexes, %others); @@ -199,32 +288,33 @@ $entries = # not an index, .file, and is readable and $2 ne 'index' and $2 !~ /^\./ and (-r $File::Find::name) ) { + # read modification time + my $mtime = stat($File::Find::name)->mtime or return; + # to show or not to show future entries - ( - $show_future_entries - or stat($File::Find::name)->mtime < time - ) + return unless ($show_future_entries or $mtime < time); # add the file and its associated mtime to the list of files - and $files{$File::Find::name} = stat($File::Find::name)->mtime + $files{$File::Find::name} = $mtime; # static rendering bits - and ( - param('-all') - or !-f "$static_dir/$1/index." . $static_flavours[0] - or stat("$static_dir/$1/index." . $static_flavours[0])->mtime < stat($File::Find::name)->mtime - ) - and $indexes{$1} = 1 - and $d = join('/', (nice_date($files{$File::Find::name}))[5,2,3]) - - and $indexes{$d} = $d - and $static_entries and $indexes{ ($1 ? "$1/" : '') . "$2.$file_extension" } = 1 - - } - else { - !-d $File::Find::name and -r $File::Find::name and $others{$File::Find::name} = stat($File::Find::name)->mtime - } + my $static_file = "$static_dir/$1/index." . $static_flavours[0]; + if (param('-all') + or !-f $static_file + or stat($static_file)->mtime < $mtime) + { + $indexes{$1} = 1; + $d = join('/', (nice_date($mtime))[5,2,3]); + $indexes{$d} = $d; + $indexes{ ($1 ? "$1/" : '') . "$2.$file_extension" } = 1 if $static_entries; + } + } + # not an entries match + elsif (!-d $File::Find::name and -r $File::Find::name) + { + $others{$File::Find::name} = stat($File::Find::name)->mtime; + } }, $datadir ); @@ -234,7 +324,14 @@ $entries = # Plugins: Entries # Allow for the first encountered plugin::entries subroutine to override the # default built-in entries subroutine -my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('entries') and defined($tmp = $plugin->entries()) and $entries = $tmp and last; } +foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('entries') ) { + if ( my $tmp = $plugin->entries() ) { + $entries = $tmp; + last; + } + } +} my ($files, $indexes, $others) = &$entries(); %indexes = %$indexes; @@ -251,8 +348,8 @@ if (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and par foreach ( ('', split /\//, $path) ) { $p .= "/$_"; $p =~ s!^/!!; - $done{$p}++ and next; - (-d "$static_dir/$p" or $p =~ /\.$file_extension$/) or mkdir "$static_dir/$p", 0755; + next if $done{$p}++; + mkdir "$static_dir/$p", 0755 unless (-d "$static_dir/$p" or $p =~ /\.$file_extension$/); foreach $flavour ( @static_flavours ) { my $content_type = (&$template($p,'content_type',$flavour)); $content_type =~ s!\n.*!!s; @@ -284,13 +381,18 @@ else { my $content_type = (&$template($path_info,'content_type',$flavour)); $content_type =~ s!\n.*!!s; + $content_type =~ s/(\$\w+(?:::)?\w*)/"defined $1 ? $1 : ''"/gee; $header = {-type=>$content_type}; print generate('dynamic', $path_info, "$path_info_yr/$path_info_mo_num/$path_info_da", $flavour, $content_type); } # Plugins: End -foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('end') and $entries = $plugin->end() } +foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('end') ) { + $entries = $plugin->end(); + } +} # Generate sub generate { @@ -299,13 +401,24 @@ sub generate { %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) } + foreach my $plugin ( @plugins ) { + if ($plugins{$plugin} > 0 and $plugin->can('filter')){ $entries = $plugin->filter(\%files, \%others); } + } my %f = %files; # Plugins: Skip # Allow plugins to decide if we can cut short story generation - my $skip; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('skip') and defined($tmp = $plugin->skip()) and $skip = $tmp and last; } + my $skip; + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('skip') ) { + if ( my $tmp = $plugin->skip() ) { + $skip = $tmp; + last; + } + } + } + # Define default interpolation subroutine $interpolate = @@ -322,13 +435,24 @@ sub generate { # Plugins: Interpolate # Allow for the first encountered plugin::interpolate subroutine to # 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; } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('interpolate') ) { + if ( my $tmp = $plugin->interpolate() ) { + $interpolate = $tmp; + last; + } + } + } # Head my $head = (&$template($currentdir,'head',$flavour)); # Plugins: Head - foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('head') and $entries = $plugin->head($currentdir, \$head) } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('head') ) { + $entries = $plugin->head( $currentdir, \$head ); + } + } $head = &$interpolate($head); @@ -340,7 +464,7 @@ sub generate { if ( $currentdir =~ /(.*?)([^\/]+)\.(.+)$/ and $2 ne 'index' ) { $currentdir = "$1$2.$file_extension"; - $files{"$datadir/$1$2.$file_extension"} and %f = ( "$datadir/$1$2.$file_extension" => $files{"$datadir/$1$2.$file_extension"} ); + %f = ( "$datadir/$currentdir" => $files{"$datadir/$currentdir"} ) if $files{"$datadir/$currentdir"}; } else { $currentdir =~ s!/index\..+$!!; @@ -355,7 +479,14 @@ sub generate { # Plugins: Sort # Allow for the first encountered plugin::sort subroutine to override the # default built-in sort subroutine - my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('sort') and defined($tmp = $plugin->sort()) and $sort = $tmp and last; } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('sort') ) { + if ( my $tmp = $plugin->sort() ) { + $sort = $tmp; + last; + } + } + } foreach my $path_file ( &$sort(\%f, \%others) ) { last if $ne <= 0 && $date !~ /\d/; @@ -369,11 +500,11 @@ 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; + $hr12 =~ s/^0//; if ($hr12 == 0) {$hr12 = 12}; # Only stories from the right date my($path_info_yr,$path_info_mo_num, $path_info_da) = split /\//, $date; @@ -385,11 +516,20 @@ sub generate { my $date = (&$template($path,'date',$flavour)); # Plugins: Date - foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('date') and $entries = $plugin->date($currentdir, \$date, $files{$path_file}, $dw,$mo,$mo_num,$da,$ti,$yr) } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('date') ) { + $entries + = $plugin->date( $currentdir, \$date, $files{$path_file}, $dw, + $mo, $mo_num, $da, $ti, $yr ); + } + } $date = &$interpolate($date); - $curdate ne $date and $curdate = $date and $output .= $date; + if ( $date && $curdate ne $date ) { + $curdate = $date; + $output .= $date; + } use vars qw/ $title $body $raw /; if (-f "$path_file" && $fh->open("< $path_file")) { @@ -401,7 +541,11 @@ sub generate { my $story = (&$template($path,'story',$flavour)); # Plugins: Story - foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('story') and $entries = $plugin->story($path, $fn, \$story, \$title, \$body) } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('story') ) { + $entries = $plugin->story( $path, $fn, \$story, \$title, \$body ); + } + } if ($content_type =~ m{\bxml\b}) { # Escape <, >, and &, and to produce valid RSS @@ -423,18 +567,26 @@ sub generate { my $foot = (&$template($currentdir,'foot',$flavour)); # Plugins: Foot - foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('foot') and $entries = $plugin->foot($currentdir, \$foot) } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('foot') ) { + $entries = $plugin->foot( $currentdir, \$foot ); + } + } $foot = &$interpolate($foot); $output .= $foot; # Plugins: Last - foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('last') and $entries = $plugin->last() } + foreach my $plugin (@plugins) { + if ( $plugins{$plugin} > 0 and $plugin->can('last') ) { + $entries = $plugin->last(); + } + } } # End skip # Finally, add the header, if any and running dynamically - $static_or_dynamic eq 'dynamic' and $header and $output = header($header) . $output; + $output = header($header) . $output if ($static_or_dynamic eq 'dynamic' and $header); $output; } @@ -444,20 +596,25 @@ 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 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 @@ -481,27 +638,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 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 @@ -514,7 +673,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