projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix plugin filename bug with decorated plugins in $plugin_list.
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 1506f94443e0eabb079bd210cae7066a661d393b..3bd3ae9a1510a91caba0f6c4f5e4dc7988631dda 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-48,17
+48,18
@@
$show_future_entries = 0;
# --- Plugins (Optional) -----
# File listing plugins blosxom should load
# --- Plugins (Optional) -----
# File listing plugins blosxom should load
-# (if empty blosxom will load all plugins in $plugin_path directories)
+# (if empty blosxom will load all plugins in $plugin_
dir and $plugin_
path directories)
$plugin_list = "";
# Where are my plugins kept?
$plugin_list = "";
# Where are my plugins kept?
-# List of directories, separated by ';' on windows, ':' everywhere else
-$plugin_path = "";
+$plugin_dir = "";
# Where should my plugins keep their state information?
# Where should my plugins keep their state information?
-$plugin_state_dir = "";
+$plugin_state_dir = "
$plugin_dir/state
";
-#$plugin_state_dir = "/var/lib/blosxom/state";
+# Additional plugins location
+# List of directories, separated by ';' on windows, ':' everywhere else
+$plugin_path = "";
# --- Static Rendering -----
# --- Static Rendering -----
@@
-84,7
+85,6
@@
use strict;
use FileHandle;
use File::Find;
use File::stat;
use FileHandle;
use File::Find;
use File::stat;
-use Time::localtime;
use Time::Local;
use CGI qw/:standard :netscape/;
use Time::Local;
use CGI qw/:standard :netscape/;
@@
-245,20
+245,25
@@
while (<DATA>) {
# Plugins: Start
my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
# Plugins: Start
my $path_sep = $^O eq 'MSWin32' ? ';' : ':';
-my @plugin_dirs = split /$path_sep/, ( $plugin_path || $plugin_dir );
+my @plugin_dirs = split /$path_sep/, $plugin_path;
+unshift @plugin_dirs, $plugin_dir;
my @plugin_list = ();
my %plugin_hash = ();
# If $plugin_list is set, read plugins to use from that file
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;
+if ( $plugin_list ) {
+ if ( -r $plugin_list and $fh->open("< $plugin_list") ) {
+ @plugin_list = map { chomp $_; $_ } grep { /\S/ && !/^#/ } <$fh>;
+ $fh->close;
+ }
+ else {
+ warn "unable to read or open plugin_list '$plugin_list': $!";
+ $plugin_list = '';
+ }
}
# Otherwise walk @plugin_dirs to get list of plugins to use
}
# Otherwise walk @plugin_dirs to get list of plugins to use
-
elsif (@plugin_dirs
) {
+
if ( ! @plugin_list && @plugin_dirs
) {
for my $plugin_dir (@plugin_dirs) {
next unless -d $plugin_dir;
if ( opendir PLUGINS, $plugin_dir ) {
for my $plugin_dir (@plugin_dirs) {
next unless -d $plugin_dir;
if ( opendir PLUGINS, $plugin_dir ) {
@@
-284,16
+289,19
@@
elsif (@plugin_dirs) {
unshift @INC, @plugin_dirs;
foreach my $plugin (@plugin_list) {
my ( $plugin_name, $off ) = $plugin =~ /^\d*([\w:]+?)(_?)$/;
unshift @INC, @plugin_dirs;
foreach my $plugin (@plugin_list) {
my ( $plugin_name, $off ) = $plugin =~ /^\d*([\w:]+?)(_?)$/;
+ my $plugin_file = $plugin_list ? $plugin_name : $plugin;
my $on_off = $off eq '_' ? -1 : 1;
# Allow perl module plugins
my $on_off = $off eq '_' ? -1 : 1;
# Allow perl module plugins
- if ( $plugin =~ m/::/ &&
-z $plugin_hash{$plugin}
) {
+ if ( $plugin =~ m/::/ &&
( $plugin_list || -z $plugin_hash{$plugin} )
) {
# For Blosxom::Plugin::Foo style plugins, we need to use a string require
# For Blosxom::Plugin::Foo style plugins, we need to use a string require
- eval "require $plugin_
nam
e";
+ eval "require $plugin_
fil
e";
}
}
- else {
- eval { require $plugin };
+ else
+ { # we try first to load from $plugin_dir before attempting from $plugin_path
+ eval { require "$plugin_dir/$plugin_file" }
+ or eval { require $plugin_file };
}
if ($@) {
}
if ($@) {
@@
-454,7
+462,7
@@
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;
- $content_type =~ s/(\$\w+(?:::
)?\w
*)/"defined $1 ? $1 : ''"/gee;
+ $content_type =~ s/(\$\w+(?:::
\w+)
*)/"defined $1 ? $1 : ''"/gee;
$header = { -type => $content_type };
print generate( 'dynamic', $path_info,
$header = { -type => $content_type };
print generate( 'dynamic', $path_info,
@@
-503,7
+511,7
@@
sub generate {
package blosxom;
my $template = shift;
package blosxom;
my $template = shift;
- $template =~ s/(\$\w+(?:::
)?\w
*)/"defined $1 ? $1 : ''"/gee;
+ $template =~ s/(\$\w+(?:::
\w+)
*)/"defined $1 ? $1 : ''"/gee;
return $template;
};
return $template;
};
@@
-692,17
+700,17
@@
sub generate {
sub nice_date {
my ($unixtime) = @_;
sub nice_date {
my ($unixtime) = @_;
- my $c_time =
c
time($unixtime);
- my ( $dw, $mo, $da, $hr, $min, $yr )
+ my $c_time =
CORE::local
time($unixtime);
+ my ( $dw, $mo, $da, $hr, $min, $
sec, $
yr )
= ( $c_time
= ( $c_time
- =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}):(\d{2}):
\d{2}
+(\d{4})$/
+ =~ /(\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};
my $offset
);
$ti = "$hr:$min";
$da = sprintf( "%02d", $da );
my $mo_num = $month2num{$mo};
my $offset
- = timegm(
00
, $min, $hr, $da, $mo_num - 1, $yr - 1900 ) - $unixtime;
+ = timegm(
$sec
, $min, $hr, $da, $mo_num - 1, $yr - 1900 ) - $unixtime;
my $utc_offset = sprintf( "%+03d", int( $offset / 3600 ) )
. sprintf( "%02d", ( $offset % 3600 ) / 60 );
my $utc_offset = sprintf( "%+03d", int( $offset / 3600 ) )
. sprintf( "%02d", ( $offset % 3600 ) / 60 );