X-Git-Url: https://git.deb.at/?p=pkg%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=b23f210137c5d135b361e385ef03cd0c4dc2d181;hp=ad19c9a196b65ba0f7b73000b98bad4104c4f126;hb=30c91513a0925872ec1e6e759d9615a83c411021;hpb=88501601fb05f3dda12473c6d3849f089da229a9 diff --git a/blosxom.cgi b/blosxom.cgi index ad19c9a..b23f210 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -47,14 +47,18 @@ $show_future_entries = 0; # --- Plugins (Optional) ----- -# File listing plugins blosxom should load (if empty blosxom will walk $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? -$plugin_dir = ""; +# 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 ----- @@ -73,7 +77,8 @@ $static_entries = 0; # -------------------------------- -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 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; @@ -87,37 +92,55 @@ $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; +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; + 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'"; - } +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; -%month2num = (nil=>'00', Jan=>'01', Feb=>'02', Mar=>'03', Apr=>'04', May=>'05', Jun=>'06', Jul=>'07', Aug=>'08', Sep=>'09', Oct=>'10', Nov=>'11', Dec=>'12'); +%month2num = ( + nil => '00', + Jan => '01', + Feb => '02', + Mar => '03', + Apr => '04', + May => '05', + Jun => '06', + Jul => '07', + Aug => '08', + Sep => '09', + Oct => '10', + Nov => '11', + Dec => '12' +); @num2month = sort { $month2num{$a} <=> $month2num{$b} } keys %month2num; # Use the stated preferred URL or figure it out automatically -$url ||= url(-path_info => 1); +$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 @@ -125,226 +148,326 @@ $url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED'; # 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}; +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 -$datadir =~ s!/$!!; $plugin_dir =~ s!/$!!; $static_dir =~ 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 -my @path_info = split m{/}, path_info() || param('path'); +my @path_info = split m{/}, path_info() || param('path'); shift @path_info; -while ($path_info[0] and $path_info[0] =~ /^[a-zA-Z].*$/ and $path_info[0] !~ /(.*)\.(.*)/) { $path_info .= '/' . shift @path_info; } +while ( $path_info[0] + and $path_info[0] =~ /^[a-zA-Z].*$/ + and $path_info[0] !~ /(.*)\.(.*)/ ) +{ + $path_info .= '/' . shift @path_info; +} # Flavour specified by ?flav={flav} or index.{flav} $flavour = ''; if ( $path_info[$#path_info] =~ /(.+)\.(.+)$/ ) { - $flavour = $2; - $1 ne 'index' and $path_info .= "/$1.$2"; - pop @path_info; -} else { - $flavour = param('flav') || $default_flavour; + $flavour = $2; + $path_info .= "/$1.$2" if $1 ne 'index'; + pop @path_info; +} +else { + $flavour = param('flav') || $default_flavour; } # Strip spurious slashes $path_info =~ s!(^/*)|(/*$)!!g; # Date fiddling -($path_info_yr,$path_info_mo,$path_info_da) = @path_info; -$path_info_mo_num = $path_info_mo ? ( $path_info_mo =~ /\d{2}/ ? $path_info_mo : ($month2num{ucfirst(lc $path_info_mo)} || undef) ) : undef; +( $path_info_yr, $path_info_mo, $path_info_da ) = @path_info; +$path_info_mo_num + = $path_info_mo + ? ( $path_info_mo =~ /\d{2}/ + ? $path_info_mo + : ( $month2num{ ucfirst( lc $path_info_mo ) } || undef ) ) + : undef; # Define standard template subroutine, plugin-overridable at Plugins: Template -$template = - sub { - my ($path, $chunk, $flavour) = @_; +$template = sub { + my ( $path, $chunk, $flavour ) = @_; do { - return join '', <$fh> if $fh->open("< $datadir/$path/$chunk.$flavour"); - } while ($path =~ s/(\/*[^\/]*)$// and $1); + return join '', <$fh> + if $fh->open("< $datadir/$path/$chunk.$flavour"); + } while ( $path =~ s/(\/*[^\/]*)$// and $1 ); # 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 ''; + 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(.*))?$/ or next; - $txt =~ s/\\n/\n/mg; - $template{$ct}{$comp} .= $txt . "\n"; + last if /^(__END__)$/; + my ( $ct, $comp, $txt ) = /^(\S+)\s(\S+)(?:\s(.*))?$/ or next; + $txt =~ s/\\n/\n/mg; + $template{$ct}{$comp} .= $txt . "\n"; } # Plugins: Start +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 && $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; + @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; + +# 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; } -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; +# 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 }; + } + + if ($@) { + warn "error finding or loading blosxom plugin '$plugin_name': $@"; + next; + } + if ( $plugin_name->start() and ( $plugins{$plugin_name} = $on_off ) ) { + push @plugins, $plugin_name; + } + } -shift @INC; +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(@_); + return &$template(@_); } # Define default entries subroutine -$entries = - sub { - my(%files, %indexes, %others); +$entries = sub { + my ( %files, %indexes, %others ); find( - sub { - my $d; - my $curr_depth = $File::Find::dir =~ tr[/][]; - return if $depth and $curr_depth > $depth; - - if ( - # a match - $File::Find::name =~ m!^$datadir/(?:(.*)/)?(.+)\.$file_extension$! - # not an index, .file, and is readable - and $2 ne 'index' and $2 !~ /^\./ and (-r $File::Find::name) - ) { - - # to show or not to show future entries - ( - $show_future_entries - or stat($File::Find::name)->mtime < time - ) - - # add the file and its associated mtime to the list of files - and $files{$File::Find::name} = stat($File::Find::name)->mtime + sub { + my $d; + my $curr_depth = $File::Find::dir =~ tr[/][]; + return if $depth and $curr_depth > $depth; - # 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 + if ( + + # a match + $File::Find::name + =~ m!^$datadir/(?:(.*)/)?(.+)\.$file_extension$! + + # not an index, .file, and is readable + and $2 ne 'index' and $2 !~ /^\./ and ( -r $File::Find::name ) ) - 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 + { + + # read modification time + my $mtime = stat($File::Find::name)->mtime or return; + + # to show or not to show future entries + return unless ( $show_future_entries or $mtime < time ); + + # add the file and its associated mtime to the list of files + $files{$File::Find::name} = $mtime; + + # static rendering bits + 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; + } + } - } - else { - !-d $File::Find::name and -r $File::Find::name and $others{$File::Find::name} = stat($File::Find::name)->mtime + # not an entries match + elsif ( !-d $File::Find::name and -r $File::Find::name ) { + $others{$File::Find::name} = stat($File::Find::name)->mtime; } - }, $datadir + }, + $datadir ); - return (\%files, \%indexes, \%others); - }; + return ( \%files, \%indexes, \%others ); +}; # 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(); +my ( $files, $indexes, $others ) = &$entries(); %indexes = %$indexes; # Static -if (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and param('-password') eq $static_password) { - - param('-quiet') or print "Blosxom is generating static index pages...\n"; - - # Home Page and Directory Indexes - my %done; - foreach my $path ( sort keys %indexes) { - my $p = ''; - foreach ( ('', split /\//, $path) ) { - $p .= "/$_"; - $p =~ s!^/!!; - $done{$p}++ and next; - (-d "$static_dir/$p" or $p =~ /\.$file_extension$/) or mkdir "$static_dir/$p", 0755; - foreach $flavour ( @static_flavours ) { - my $content_type = (&$template($p,'content_type',$flavour)); - $content_type =~ s!\n.*!!s; - my $fn = $p =~ m!^(.+)\.$file_extension$! ? $1 : "$p/index"; - 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 = ''; - 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); +if ( !$ENV{GATEWAY_INTERFACE} + and param('-password') + and $static_password + and param('-password') eq $static_password ) +{ + + param('-quiet') or print "Blosxom is generating static index pages...\n"; + + # Home Page and Directory Indexes + my %done; + foreach my $path ( sort keys %indexes ) { + my $p = ''; + foreach ( ( '', split /\//, $path ) ) { + $p .= "/$_"; + $p =~ s!^/!!; + 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; + my $fn = $p =~ m!^(.+)\.$file_extension$! ? $1 : "$p/index"; + 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 = ''; + 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; + } } - $fh_w->close; - } } - } } # Dynamic else { - my $content_type = (&$template($path_info,'content_type',$flavour)); - $content_type =~ s!\n.*!!s; + my $content_type = ( &$template( $path_info, 'content_type', $flavour ) ); + $content_type =~ s!\n.*!!s; - $header = {-type=>$content_type}; + $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); + 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 { @@ -353,13 +476,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 = @@ -376,13 +510,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); @@ -394,7 +539,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\..+$!!; @@ -409,7 +554,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/; @@ -427,7 +579,7 @@ sub generate { ($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; @@ -439,11 +591,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")) { @@ -455,7 +616,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 @@ -477,18 +642,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; } @@ -512,7 +685,7 @@ 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 @@ -545,7 +718,7 @@ html foot html foot html foot -rss content_type text/xml +rss content_type text/xml; charset=$blog_encoding rss head rss head