Revert the 1.27 change (mixed changesets).

diff --git a/blosxom.cgi b/blosxom.cgi
index 3b915c5644a33ded46a3ddad5752c535cf0252b3..ad19c9a196b65ba0f7b73000b98bad4104c4f126 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -47,16 +47,14 @@ $show_future_entries = 0;
 
 # --- Plugins (Optional) -----
 
-# File listing plugins blosxom should load 
-# (if empty blosxom will load all plugins in $plugin_path directories)
+# File listing plugins blosxom should load (if empty blosxom will walk $plugin_dir)
 $plugin_list = "";
 
-# Where are my plugins kept? (list of directories, separated by ':')
-$plugin_path = "";
+# Where are my plugins kept?
+$plugin_dir = "";
 
-# Where should my plugins keep their state information?
-$plugin_state_dir = "";
-#$plugin_state_dir = "/var/lib/blosxom/state";
+# Where should my modules keep their state information?
+$plugin_state_dir = "$plugin_dir/state";
 
 # --- Static Rendering -----
 
@@ -75,7 +73,7 @@ $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_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 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 strict;
 use FileHandle;
@@ -197,9 +195,7 @@ while (<DATA>) {
 }
 
 # Plugins: Start
-my @plugin_dirs = split /:/, ($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"
@@ -208,31 +204,18 @@ 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;
+# 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;
 }
 
-# Load all plugins in @plugin_list
-unshift @INC, @plugin_dirs;
+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_hash{ $plugin }) {
+  if ($plugin =~ m/::/ && -z "$plugin_dir/$plugin") {
     # For Blosxom::Plugin::Foo style plugins, we need to use a string require
     eval "require $plugin_name";
   }
@@ -242,7 +225,7 @@ foreach my $plugin ( @plugin_list ) {
   $@ 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;
+shift @INC;
 
 # Plugins: Template
 # Allow for the first encountered plugin::template subroutine to override the
@@ -355,7 +338,6 @@ 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);
@@ -530,7 +512,7 @@ sub nice_date {
 
 # Default HTML and RSS template bits
 __DATA__
-html content_type text/html; charset=$blog_encoding
+html content_type text/html
 
 html head <html>
 html head     <head>
@@ -563,7 +545,7 @@ html foot         </center>
 html foot     </body>
 html foot </html>
 
-rss content_type text/xml; charset=$blog_encoding
+rss content_type text/xml
 
 rss head <?xml version="1.0" encoding="$blog_encoding"?>
 rss head <rss version="2.0">