Run perltidy 20090616 on current blosxom.cgi.

diff --git a/blosxom.cgi b/blosxom.cgi
index 590e0f2b4adfd76dc2f0220daecd96449266bfb7..fef5750e3d07ba7370ab01fac21bac8a6190c795 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -195,7 +195,6 @@ development was picked up by a team of dedicated users of blosxom since
 
 =cut
 
-
 use vars qw!
     $version
     $blog_title
@@ -229,7 +228,6 @@ use vars qw!
     $path_info_da
     $path_info_mo_num
     $flavour
-    $static_or_dynamic
     %month2num
     @num2month
     $interpolate
@@ -244,7 +242,7 @@ use vars qw!
     $encode_8bit_chars
     $url_escape_re
     $content_type
-!;
+    !;
 
 use strict;
 use FileHandle;
@@ -312,7 +310,7 @@ unless ($url) {
     $url = url();
 
     # Unescape %XX hex codes (from URI::Escape::uri_unescape)
-    $url =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;      
+    $url =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
 
     # Support being called from inside a SSI document
     $url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED';
@@ -363,14 +361,14 @@ else {
 # 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');
-$path_info_full = join '/', @path_info;      # Equivalent to $ENV{PATH_INFO}
+$path_info_full = join '/', @path_info;    # Equivalent to $ENV{PATH_INFO}
 shift @path_info;
 
 # Flavour specified by ?flav={flav} or index.{flav}
 $flavour = '';
-if (! ($flavour = param('flav'))) {
+if ( !( $flavour = param('flav') ) ) {
     if ( $path_info[$#path_info] =~ /(.+)\.(.+)$/ ) {
-       $flavour = $2;
+        $flavour = $2;
         pop @path_info if $1 eq 'index';
     }
 }
@@ -380,45 +378,50 @@ $flavour ||= $default_flavour;
 $flavour = blosxom_html_escape($flavour);
 
 sub blosxom_html_escape {
-  my $string = shift;
-  my %escape = (
-                '<' => '&lt;',
-                '>' => '&gt;',
-                '&' => '&amp;',
-                '"' => '&quot;',
-                "'" => '&apos;'
-                );
-  my $escape_re = join '|' => keys %escape;
-  $string =~ s/($escape_re)/$escape{$1}/g;
-  $string;
+    my $string = shift;
+    my %escape = (
+        '<' => '&lt;',
+        '>' => '&gt;',
+        '&' => '&amp;',
+        '"' => '&quot;',
+        "'" => '&apos;'
+    );
+    my $escape_re = join '|' => keys %escape;
+    $string =~ s/($escape_re)/$escape{$1}/g;
+    $string;
 }
 
 # Global variable to be used in head/foot.{flavour} templates
 $path_info = '';
+
 # Add all @path_info elements to $path_info till we come to one that could be a year
-while ( $path_info[0] && $path_info[0] !~ /^(19|20)\d{2}$/) {
+while ( $path_info[0] && $path_info[0] !~ /^(19|20)\d{2}$/ ) {
     $path_info .= '/' . shift @path_info;
 }
 
 # Pull date elements out of path
-if ($path_info[0] && $path_info[0] =~ /^(19|20)\d{2}$/) {
-  $path_info_yr = shift @path_info;
-  if ($path_info[0] && 
-     ($path_info[0] =~ /^(0\d|1[012])$/ || 
-      exists $month2num{ ucfirst lc $path_info_mo })) {
-    $path_info_mo = shift @path_info;
-    # Map path_info_mo to numeric $path_info_mo_num
-    $path_info_mo_num = $path_info_mo =~ /^\d{2}$/
-      ? $path_info_mo
-      : $month2num{ ucfirst lc $path_info_mo };
-    if ($path_info[0] && $path_info[0] =~ /^[0123]\d$/) {
-      $path_info_da = shift @path_info;
+if ( $path_info[0] && $path_info[0] =~ /^(19|20)\d{2}$/ ) {
+    $path_info_yr = shift @path_info;
+    if ($path_info[0]
+        && ( $path_info[0] =~ /^(0\d|1[012])$/
+            || exists $month2num{ ucfirst lc $path_info_mo } )
+        )
+    {
+        $path_info_mo = shift @path_info;
+
+        # Map path_info_mo to numeric $path_info_mo_num
+        $path_info_mo_num
+            = $path_info_mo =~ /^\d{2}$/
+            ? $path_info_mo
+            : $month2num{ ucfirst lc $path_info_mo };
+        if ( $path_info[0] && $path_info[0] =~ /^[0123]\d$/ ) {
+            $path_info_da = shift @path_info;
+        }
     }
-  }
 }
 
 # Add remaining path elements to $path_info
-$path_info .= '/' . join('/', @path_info);
+$path_info .= '/' . join( '/', @path_info );
 
 # Strip spurious slashes
 $path_info =~ s!(^/*)|(/*$)!!g;
@@ -461,7 +464,7 @@ my @plugin_list = ();
 my %plugin_hash = ();
 
 # If $plugin_list is set, read plugins to use from that file
-if ( $plugin_list ) {
+if ($plugin_list) {
     if ( -r $plugin_list and $fh->open("< $plugin_list") ) {
         @plugin_list = map { chomp $_; $_ } grep { /\S/ && !/^#/ } <$fh>;
         $fh->close;
@@ -473,7 +476,7 @@ if ( $plugin_list ) {
 }
 
 # Otherwise walk @plugin_dirs to get list of plugins to use
-if ( ! @plugin_list && @plugin_dirs ) {
+if ( !@plugin_list && @plugin_dirs ) {
     for my $plugin_dir (@plugin_dirs) {
         next unless -d $plugin_dir;
         if ( opendir PLUGINS, $plugin_dir ) {
@@ -503,7 +506,7 @@ foreach my $plugin (@plugin_list) {
     my $on_off = $off eq '_' ? -1 : 1;
 
     # Allow perl module plugins
-    # The -z test is a hack to allow a zero-length placeholder file in a 
+    # The -z test is a hack to allow a zero-length placeholder file in a
     #   $plugin_path directory to indicate an @INC module should be loaded
     if ( $plugin =~ m/::/ && ( $plugin_list || -z $plugin_hash{$plugin} ) ) {
 
@@ -720,10 +723,13 @@ sub generate {
 
     # Define default interpolation subroutine
     $interpolate = sub {
+
         package blosxom;
         my $template = shift;
+
         # Interpolate scalars, namespaced scalars, and hash/hashref scalars
-        $template =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{([\'\"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
+        $template
+            =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{([\'\"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
         return $template;
     };
 
@@ -771,8 +777,7 @@ sub generate {
         # Define a default sort subroutine
         my $sort = sub {
             my ($files_ref) = @_;
-            return
-                sort { $files_ref->{$b} <=> $files_ref->{$a} }
+            return sort { $files_ref->{$b} <=> $files_ref->{$a} }
                 keys %$files_ref;
         };
 
@@ -858,20 +863,22 @@ sub generate {
                 }
             }
 
-           # Save unescaped versions and allow them to be used in
-           # flavour templates.
-           use vars qw/$url_unesc $path_unesc $fn_unesc/;
-           $url_unesc  = $url;
-           $path_unesc = $path;
-           $fn_unesc   = $fn;
-
-           # Fix special characters in links inside XML content
-            if ( $encode_xml_entities &&
-                 $content_type =~ m{\bxml\b} &&
-                 $content_type !~ m{\bxhtml\b} ) {
+            # Save unescaped versions and allow them to be used in
+            # flavour templates.
+            use vars qw/$url_unesc $path_unesc $fn_unesc/;
+            $url_unesc  = $url;
+            $path_unesc = $path;
+            $fn_unesc   = $fn;
+
+            # Fix special characters in links inside XML content
+            if (   $encode_xml_entities
+                && $content_type =~ m{\bxml\b}
+                && $content_type !~ m{\bxhtml\b} )
+            {
+
                 # Escape special characters inside the <link> container
 
-               &url_escape_url_path_and_fn();
+                &url_escape_url_path_and_fn();
 
                 # Escape <, >, and &, and to produce valid RSS
                 $title = blosxom_html_escape($title);
@@ -881,9 +888,9 @@ sub generate {
                 $fn    = blosxom_html_escape($fn);
             }
 
-           # Fix special characters in links inside XML content
+            # Fix special characters in links inside XML content
             if ($encode_8bit_chars) {
-               &url_escape_url_path_and_fn();
+                &url_escape_url_path_and_fn();
             }
 
             $story = &$interpolate($story);
@@ -944,9 +951,9 @@ sub nice_date {
 }
 
 sub url_escape_url_path_and_fn {
-    $url   =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
-    $path  =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
-    $fn    =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+    $url  =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+    $path =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+    $fn   =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
 }
 
 # Default HTML and RSS template bits