Move orphaned 'my $d' in default entries inline.

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

diff --git a/blosxom.cgi b/blosxom.cgi
index fef5750e3d07ba7370ab01fac21bac8a6190c795..11143b198c6da35850928c1b2f77eb6861a2bddb 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -550,9 +550,9 @@ sub load_template {
 # Define default entries subroutine
 $entries = sub {
     my ( %files, %indexes, %others );
+    my $param_all = param('-all');
     find(
         sub {
-            my $d;
             my $curr_depth = $File::Find::dir =~ tr[/][];
             return if $depth and $curr_depth > $depth;
 
@@ -579,12 +579,12 @@ $entries = sub {
                 # static rendering bits
                 my $static_file
                     = "$static_dir/$1/index." . $static_flavours[0];
-                if (   param('-all')
+                if (   $param_all
                     or !-f $static_file
                     or stat($static_file)->mtime < $mtime )
                 {
                     $indexes{$1} = 1;
-                    $d = join( '/', ( nice_date($mtime) )[ 5, 2, 3 ] );
+                    my $d = join( '/', ( nice_date($mtime) )[ 5, 2, 3 ] );
                     $indexes{$d} = $d;
                     $indexes{ ( $1 ? "$1/" : '' ) . "$2.$file_extension" } = 1
                         if $static_entries;
@@ -618,11 +618,7 @@ my ( $files, $indexes, $others ) = &$entries();
 %indexes = %$indexes;
 
 # Static
-if (    !$ENV{GATEWAY_INTERFACE}
-    and param('-password')
-    and $static_password
-    and param('-password') eq $static_password )
-{
+if ( $static_or_dynamic eq 'static' ) {
 
     param('-quiet') or print "Blosxom is generating static index pages...\n";