Avoid "conditional and" in default entries sub

[pkg/blosxom.git] / blosxom.cgi

diff --git a/blosxom.cgi b/blosxom.cgi
index 9b5fe21a53779a7aee9e65a4fd1daa2bb6924821..2c6b6ee17d1e7e5692668cba4f5be2d3297ff4dd 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -142,8 +142,17 @@ $depth += ($datadir =~ tr[/][]) - 1 if $depth;
 # Global variable to be used in head/foot.{flavour} templates
 $path_info = '';
 
-$static_or_dynamic = (!$ENV{GATEWAY_INTERFACE} and param('-password') and $static_password and param('-password') eq $static_password) ? 'static' : 'dynamic';
-$static_or_dynamic eq 'dynamic' and param(-name=>'-quiet', -value=>1);
+if (    !$ENV{GATEWAY_INTERFACE}
+    and param('-password')
+    and $static_password
+    and param('-password') eq $static_password )
+{
+    $static_or_dynamic = 'static';
+}
+else {
+    $static_or_dynamic = 'dynamic';
+    param( -name => '-quiet', -value => 1 );
+}
 
 # Path Info Magic
 # Take a gander at HTTP's PATH_INFO for optional blog name, archive yr/mo/day
@@ -272,32 +281,33 @@ $entries =
           # not an index, .file, and is readable
           and $2 ne 'index' and $2 !~ /^\./ and (-r $File::Find::name)
         ) {
+            # read modification time
+            my $mtime = stat($File::Find::name)->mtime or return;
+
 
             # to show or not to show future entries
-            ( 
-              $show_future_entries
-              or stat($File::Find::name)->mtime < time 
-            )
+            return unless ($show_future_entries or $mtime < time);
 
               # add the file and its associated mtime to the list of files
-              and $files{$File::Find::name} = stat($File::Find::name)->mtime
+            $files{$File::Find::name} = $mtime;
 
                 # static rendering bits
-                and (
-                  param('-all') 
-                  or !-f "$static_dir/$1/index." . $static_flavours[0]
-                  or stat("$static_dir/$1/index." . $static_flavours[0])->mtime < stat($File::Find::name)->mtime
-                )
-                  and $indexes{$1} = 1
-                    and $d = join('/', (nice_date($files{$File::Find::name}))[5,2,3])
-  
-                      and $indexes{$d} = $d
-                        and $static_entries and $indexes{ ($1 ? "$1/" : '') . "$2.$file_extension" } = 1
-
-            } 
-            else {
-              !-d $File::Find::name and -r $File::Find::name and $others{$File::Find::name} = stat($File::Find::name)->mtime
-            }
+            my $static_file = "$static_dir/$1/index." . $static_flavours[0];
+            if (param('-all')
+                or !-f $static_file
+                or stat($static_file)->mtime < $mtime)
+             {
+              $indexes{$1} = 1;
+              $d = join('/', (nice_date($mtime))[5,2,3]);
+              $indexes{$d} = $d;
+              $indexes{ ($1 ? "$1/" : '') . "$2.$file_extension" } = 1 if $static_entries;
+              }
+          }
+          # not an entries match
+          elsif (!-d $File::Find::name and -r $File::Find::name)
+          {
+            $others{$File::Find::name} = stat($File::Find::name)->mtime;
+          }
       }, $datadir
     );
 
@@ -405,13 +415,24 @@ sub generate {
     # Plugins: Interpolate
     # Allow for the first encountered plugin::interpolate subroutine to 
     # override the default built-in interpolate subroutine
-    my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('interpolate') and defined($tmp = $plugin->interpolate()) and $interpolate = $tmp and last; }
+    foreach my $plugin (@plugins) {
+        if ( $plugins{$plugin} > 0 and $plugin->can('interpolate') ) {
+            if ( my $tmp = $plugin->interpolate() ) {
+                $interpolate = $tmp;
+                last;
+            }
+        }
+    }
         
     # Head
     my $head = (&$template($currentdir,'head',$flavour));
   
     # Plugins: Head
-    foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('head') and $entries = $plugin->head($currentdir, \$head) }
+    foreach my $plugin (@plugins) {
+        if ( $plugins{$plugin} > 0 and $plugin->can('head') ) {
+            $entries = $plugin->head( $currentdir, \$head );
+        }
+    }
   
     $head = &$interpolate($head);
   
@@ -438,7 +459,14 @@ sub generate {
     # Plugins: Sort
     # Allow for the first encountered plugin::sort subroutine to override the
     # default built-in sort subroutine
-    my $tmp; foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('sort') and defined($tmp = $plugin->sort()) and $sort = $tmp and last; }
+    foreach my $plugin (@plugins) {
+        if ( $plugins{$plugin} > 0 and $plugin->can('sort') ) {
+            if ( my $tmp = $plugin->sort() ) {
+                $sort = $tmp;
+                last;
+            }
+        }
+    }
   
     foreach my $path_file ( &$sort(\%f, \%others) ) {
       last if $ne <= 0 && $date !~ /\d/;
@@ -484,7 +512,11 @@ sub generate {
       my $story = (&$template($path,'story',$flavour));
   
       # Plugins: Story
-      foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('story') and $entries = $plugin->story($path, $fn, \$story, \$title, \$body) }
+      foreach my $plugin (@plugins) {
+          if ( $plugins{$plugin} > 0 and $plugin->can('story') ) {
+              $entries = $plugin->story( $path, $fn, \$story, \$title, \$body );
+          }
+      }
       
       if ($content_type =~ m{\bxml\b}) {
         # Escape <, >, and &, and to produce valid RSS
@@ -506,18 +538,26 @@ sub generate {
     my $foot = (&$template($currentdir,'foot',$flavour));
   
     # Plugins: Foot
-    foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('foot') and $entries = $plugin->foot($currentdir, \$foot) }
+    foreach my $plugin (@plugins) {
+        if ( $plugins{$plugin} > 0 and $plugin->can('foot') ) {
+            $entries = $plugin->foot( $currentdir, \$foot );
+        }
+    }
   
     $foot = &$interpolate($foot);
     $output .= $foot;
 
     # Plugins: Last
-    foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('last') and $entries = $plugin->last() }
+    foreach my $plugin (@plugins) {
+        if ( $plugins{$plugin} > 0 and $plugin->can('last') ) {
+            $entries = $plugin->last();
+        }
+    }
 
   } # End skip
 
   # Finally, add the header, if any and running dynamically
-  $static_or_dynamic eq 'dynamic' and $header and $output = header($header) . $output;
+  $output = header($header) . $output if ($static_or_dynamic eq 'dynamic' and $header);
   
   $output;
 }