fixed a warning producing bug, style changes, some comments added

diff --git a/selfforum-cgi/shared/Template/_thread.pm b/selfforum-cgi/shared/Template/_thread.pm
index 0cea038ab6649bdc92f0bcb0b104eb00e50e6952..7b65d1d2b3a43184bf170a8a11bf0ee13632f137 100644 (file)
--- a/selfforum-cgi/shared/Template/_thread.pm
+++ b/selfforum-cgi/shared/Template/_thread.pm
@@ -1,35 +1,40 @@
-# Template/_thread.pm
+package Template::_thread;

 
 

-# ====================================================
-# Autor: n.d.p. / 2001-01-11
-# lm   : n.d.p. / 2001-01-11
-# ====================================================
-# Funktion:
-#      HTML-Darstellung eines Threads
-# ====================================================
+################################################################################
+#                                                                              #
+# File:        shared/Template/_thread.pm                                      #
+#                                                                              #
+# Authors:     Andre Malo <nd@o3media.de>, 2001-04-02                          #
+#                                                                              #
+# Description: convert parsed thread to HTML                                   #
+#                                                                              #
+################################################################################

 
 use strict;
 
 
 use strict;
 

-package Template::_thread;
-

 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(short_hr_time);
 use Template;
 use Template::_query;
 
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Posting::_lib qw(short_hr_time);
 use Template;
 use Template::_query;
 

-# ====================================================
-# Funktionsexport
-# ====================================================
-
+################################################################################
+#
+# Export
+#

 use base qw(Exporter);
 @Template::_thread::EXPORT = qw(html_thread);
 
 use base qw(Exporter);
 @Template::_thread::EXPORT = qw(html_thread);
 

-################################
-# sub html_thread
+### sub html_thread ($$$) ######################################################
+#
+# create HTML string
+#
+# Params: $msg      - Reference of Message-Array
+#                     (Output of parse_single_thread in Posting::_lib)
+#         $template - Template object
+#         $par      - Hash Reference (see doc for details)
+#
+# Return: Reference of HTML String

 #
 #

-# Thread erzeugen
-################################
-

 sub html_thread ($$$) {
   my ($msg, $template, $par) = @_;
 
 sub html_thread ($$$) {
   my ($msg, $template, $par) = @_;
 


@@ -46,45 +51,69 @@ sub html_thread ($$$) {
   my $oldlevel=0;
   my @indexes;
 
   my $oldlevel=0;
   my @indexes;
 

-  # ganzer Thread
+  # whole thread

   if ($par -> {start} == -1) {
     $_ = $msg -> [0];
     @indexes = (1..$_ -> {answers});
 
     if ($_ -> {answers}) {
   if ($par -> {start} == -1) {
     $_ = $msg -> [0];
     @indexes = (1..$_ -> {answers});
 
     if ($_ -> {answers}) {

-      $html = '<dd><dl><dt>'
-              .${$template -> scrap ($temp -> {(length $_ -> {cat})?'start':'startNC'},
-                                    {$temp -> {name}    => $_ -> {name},
-                                     $temp -> {subject} => $_ -> {subject},
-                                     $temp -> {cat}     => $_ -> {cat},
-                                     $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
-                                     $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})},
-                                     $par -> {addParam})}
-              .'</dt>';}
+      $html =
+        '<dd><dl><dt>'.
+
+        ${$template -> scrap (
+           $temp -> {
+             length $_ -> {cat}
+               ? 'start'
+               : 'startNC'
+           },
+           { $temp -> {name}    => $_ -> {name},
+             $temp -> {subject} => $_ -> {subject},
+             $temp -> {cat}     => $_ -> {cat},
+             $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
+             $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})
+           },
+           $par -> {addParam}
+          )} .
+        '</dt>';
+    }

 
     else {
 
     else {

-      $html = '<dd>'
-              .${$template -> scrap ($temp -> {(length $_ -> {cat})?'start':'startNC'},
-                                    {$temp -> {name}    => $_ -> {name},
-                                     $temp -> {subject} => $_ -> {subject},
-                                     $temp -> {cat}     => $_ -> {cat},
-                                     $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
-                                     $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})},
-                                     $par -> {addParam})}
-              .'</dd>';
-
-      return \$html;}}
-
-  # Teilthread
+      $html =
+        '<dd>'.
+        ${$template -> scrap (
+           $temp -> {
+             length $_ -> {cat}
+             ? 'start'
+             : 'startNC'
+           },
+           { $temp -> {name}    => $_ -> {name},
+             $temp -> {subject} => $_ -> {subject},
+             $temp -> {cat}     => $_ -> {cat},
+             $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
+             $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})
+           },
+           $par -> {addParam}
+          )}.
+        '</dd>';
+
+      return \$html;
+    }
+  }
+
+  # only subthread
+  #

   else {
     my $start=-1;
     for (@$msg) {$start++; last if ($_ -> {mid} == $par -> {start});}
     my $end   = $start + $msg -> [$start] -> {answers};
     $start++;
     @indexes = ($start..$end);
   else {
     my $start=-1;
     for (@$msg) {$start++; last if ($_ -> {mid} == $par -> {start});}
     my $end   = $start + $msg -> [$start] -> {answers};
     $start++;
     @indexes = ($start..$end);

-    $oldlevel = $startlevel = $msg -> [$start] -> {level};}
+    $oldlevel = $startlevel = $msg -> [$start] -> {level}
+      if (defined $msg -> [$start] -> {level});
+  }

 
 

-  # HTML erzeugen
+  # create HTML
+  #

   for (@$msg[@indexes]) {
 
     if ($_ -> {level} < $oldlevel) {
   for (@$msg[@indexes]) {
 
     if ($_ -> {level} < $oldlevel) {


@@ -93,41 +122,53 @@ sub html_thread ($$$) {
     $oldlevel = $_ -> {level};
 
     if ($_ -> {answers}) {
     $oldlevel = $_ -> {level};
 
     if ($_ -> {answers}) {

-      $html.='<dd><dl><dt>'
-             .${$template -> scrap ($temp -> {(length $_ -> {cat})?'line':'lineNC'},
-                                   {$temp -> {name}    => $_ -> {name},
-                                   $temp -> {subject} => $_ -> {subject},
-                                   $temp -> {cat}     => $_ -> {cat},
-                                   $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
-                                   $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})},
-                                   $par -> {addParam})}
-             .'</dt>';
+      $html.=
+        '<dd><dl><dt>'.
+        ${$template -> scrap (
+           $temp -> {
+             length $_ -> {cat}
+             ? 'line'
+             : 'lineNC'
+           },
+           { $temp -> {name}    => $_ -> {name},
+             $temp -> {subject} => $_ -> {subject},
+             $temp -> {cat}     => $_ -> {cat},
+             $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
+             $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})
+           },
+           $par -> {addParam}
+          )}.
+        '</dt>';

     }
     else {
     }
     else {

-      $html.='<dd>'
-             .${$template -> scrap ($temp -> {(length $_ -> {cat})?'line':'lineNC'},
-                                   {$temp -> {name}    => $_ -> {name},
-                                   $temp -> {subject} => $_ -> {subject},
-                                   $temp -> {cat}     => $_ -> {cat},
-                                   $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
-                                   $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})},
-                                   $par -> {addParam})}
-             .'</dd>';
+      $html.=
+        '<dd>'.
+        ${$template -> scrap (
+           $temp -> {
+             length $_ -> {cat}
+             ? 'line'
+             : 'lineNC'
+           },
+           { $temp -> {name}    => $_ -> {name},
+             $temp -> {subject} => $_ -> {subject},
+             $temp -> {cat}     => $_ -> {cat},
+             $temp -> {time}    => plain(short_hr_time ($_ -> {time})),
+             $temp -> {link}    => query_string({$t => $tid, $p => $_ -> {mid}})
+           },
+           $par -> {addParam}
+          )}.
+        '</dd>';

     }
   }
     }
   }

-

   $html.='</dl></dd>' x ($oldlevel - $startlevel);
 
   \$html;
 }
 
   $html.='</dl></dd>' x ($oldlevel - $startlevel);
 
   \$html;
 }
 

-# ====================================================
-# Modulinitialisierung
-# ====================================================
-
-# making require happy
+# keep require happy

 1;
 
 1;
 

-# ====================================================
-# end of Template::_thread
-# ====================================================
\ No newline at end of file
+#
+#
+### end of Template::_thread ###################################################
+