# 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
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;
+
+ 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 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 {
# 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
);
# 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;
}
# 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 {
%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;
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\..+$!!;
($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;
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")) {
$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;
}
projects / matthijs / upstream / blosxom.git / blobdiff