Allows default interpolate routine to handle multiple :: in variable names.

[matthijs/upstream/blosxom.git] / blosxom.cgi

diff --git a/blosxom.cgi b/blosxom.cgi
index 1506f94443e0eabb079bd210cae7066a661d393b..78ad2ffcac7160a5cc41a5a1f62fc9c250ad19a3 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -48,17 +48,18 @@ $show_future_entries = 0;
 # --- 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?
-# List of directories, separated by ';' on windows, ':' everywhere else
-$plugin_path = "";
+$plugin_dir = "";
 
 # 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 -----
 
@@ -84,7 +85,6 @@ use strict;
 use FileHandle;
 use File::Find;
 use File::stat;
-use Time::localtime;
 use Time::Local;
 use CGI qw/:standard :netscape/;
 
@@ -245,7 +245,8 @@ while (<DATA>) {
 
 # 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 = ();
 
@@ -292,8 +293,10 @@ foreach my $plugin (@plugin_list) {
      # For Blosxom::Plugin::Foo style plugins, we need to use a string require
         eval "require $plugin_name";
     }
-    else {
-        eval { require $plugin };
+    else
+    { # we try first to load from $plugin_dir before attempting from $plugin_path
+        eval        { require "$plugin_dir/$plugin" }
+            or eval { require $plugin };
     }
 
     if ($@) {
@@ -454,7 +457,7 @@ else {
     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,
@@ -503,7 +506,7 @@ sub generate {
 
         package blosxom;
         my $template = shift;
-        $template =~ s/(\$\w+(?:::)?\w*)/"defined $1 ? $1 : ''"/gee;
+        $template =~ s/(\$\w+(?:::\w+)*)/"defined $1 ? $1 : ''"/gee;
         return $template;
     };
 
@@ -692,7 +695,7 @@ sub generate {
 sub nice_date {
     my ($unixtime) = @_;
 
-    my $c_time = ctime($unixtime);
+    my $c_time = CORE::localtime($unixtime);
     my ( $dw, $mo, $da, $hr, $min, $yr )
         = ( $c_time
             =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}):(\d{2}):\d{2} +(\d{4})$/