new kernel implemented (not only programming style changes), several bugs fixed,...

[selfforum.git] / selfforum-cgi / shared / Template / Posting.pm

diff --git a/selfforum-cgi/shared/Template/Posting.pm b/selfforum-cgi/shared/Template/Posting.pm
index d10d10536a1557f01b67a1700f9d03f60be76979..348a7dbb07797d7c2f16e1d153dc1b1fbc4f453b 100644 (file)
--- a/selfforum-cgi/shared/Template/Posting.pm
+++ b/selfforum-cgi/shared/Template/Posting.pm
@@ -1,147 +1,218 @@
-# Template/Posting.pm
+package Template::Posting;

 
 

-# ====================================================
-# Autor: n.d.p. / 2001-01-14
-# lm   : n.d.p. / 2001-01-14
-# ====================================================
-# Funktion:
-#      HTML-Darstellung eines Postings
-# ====================================================
+################################################################################
+#                                                                              #
+# File:        shared/Template/Posting.pm                                      #
+#                                                                              #
+# Authors:     Andre Malo       <nd@o3media.de>, 2001-04-01                    #
+#                                                                              #
+# Description: show HTML formatted posting                                     #
+#                                                                              #
+################################################################################

 
 use strict;
 
 
 use strict;
 

-package Template::Posting;
-
-use vars qw(@ISA @EXPORT);
-

 use Encode::Posting;
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Id;
 use Encode::Posting;
 use Encode::Plain; $Encode::Plain::utf8 = 1;
 use Id;

-use Lock qw(:WRITE);
-use Posting::_lib qw(get_message_node get_message_header get_message_body parse_single_thread hr_time);
+use Lock qw(:READ);
+use Posting::_lib qw(
+  get_message_node
+  get_message_header
+  get_message_body
+  parse_single_thread
+  parse_xml_file
+  hr_time
+);

 use Template;
 use Template;

+use Template::_conf;

 use Template::_query;
 use Template::_thread;
 
 use XML::DOM;
 
 use Template::_query;
 use Template::_thread;
 
 use XML::DOM;
 

-# ====================================================
-# Funktionsexport
-# ====================================================
-
-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(print_posting_as_HTML message_as_HTML);
-
-################################
-# sub print_posting_as_HTML
+################################################################################

 #
 #

-# HTML erzeugen
-################################
+# Export
+#
+use base qw(Exporter);
+@Template::Posting::EXPORT = qw(
+  print_posting_as_HTML
+  message_as_HTML
+);

 
 

+### sub print_posting_as_HTML ($$$) ############################################
+#
+# print HTML formatted Posting to STDOUT
+#
+# Params: $threadpath - /path/to/thread_files
+#         $tempfile   - template file
+#         $param      - Hash-Reference (see doc for details)
+#
+# Return: -none-
+#

 sub print_posting_as_HTML ($$$) {
   my ($threadpath, $tempfile, $param) = @_;
 
   my $template = new Template $tempfile;
 sub print_posting_as_HTML ($$$) {
   my ($threadpath, $tempfile, $param) = @_;
 
   my $template = new Template $tempfile;

-
-  # Datei sperren... (eigentlich)
-  my $xml=new XML::DOM::Parser -> parsefile ($threadpath.'t'.$param -> {thread}.'.xml');
-
-  my ($mnode, $tnode) = get_message_node ($xml, 't'.$param -> {thread}, 'm'.$param -> {posting});
-  my $pnode = $mnode -> getParentNode;
-  my $header = get_message_header ($mnode);
-  my $msg = parse_single_thread ($tnode, 0, 0);
-  my $pheader = ($pnode -> getNodeName eq 'Message')?get_message_header ($pnode):{};
-

   my $assign = $param -> {assign};
   my $assign = $param -> {assign};

-  my $formdata = $param -> {form} -> {data};
-  my $formact = $param -> {form} -> {action};
-
-  my $body = get_message_body ($xml, 'm'.$param -> {posting});
-
-  my $text = message_field ($body,
-                           {quoteChars => '&raquo;&raquo; ',
-                            quoting    => 1,
-                            startCite  => ${$template -> scrap ($assign -> {startCite})},
-                            endCite    => ${$template -> scrap ($assign -> {endCite})}
-                           });
-
-  my $area = answer_field ($body,
-                          {quoteArea  => 1,
-                           quoteChars => '&raquo;&raquo; ',
-                           messages   => $param -> {messages}
-                          });
-
-  my $pars = {};
-
-  for (qw(posterBody uniqueID followUp quoteChar userID posterName posterEmail posterURL posterImage)) {
-    $pars -> {$formdata -> {$_} -> {assign} -> {name}} = plain($formdata -> {$_} -> {name});}
-
-  my $cgi = $param -> {cgi};
-
-  my $tpar = {thread   => $param -> {thread},
-              template => $param -> {tree},
-              start    => $param -> {posting},
-              cgi      => $cgi};
-
-  my $plink = %$pheader?(query_string ({$cgi -> {thread} => $param -> {thread}, $cgi -> {posting} => ($pnode -> getAttribute ('id') =~ /(\d+)/)[0]})):'';
-
-  print ${$template -> scrap ($assign->{mainDoc},
-                             {$assign->{name}                            => plain($header->{name}),
-                              $assign->{email}                           => plain($header->{email}),
-                              $assign->{home}                            => plain($header->{home}),
-                              $assign->{image}                           => plain($header->{image}),
-                              $assign->{time}                            => plain(hr_time($header->{time})),
-                              $assign->{message}                         => $text,
-                              $assign->{messageTitle}                    => plain($header->{subject}),
-                              $assign->{parentTitle}                     => plain($pheader->{subject}),
-                              $assign->{messageCat}                      => plain($header->{category}),
-                              $assign->{parentCat}                       => plain($pheader->{category}),
-                              $assign->{parentName}                      => plain($pheader->{name}),
-                              $assign->{parentLink}                      => $plink,
-                              $assign->{parentTime}                      => plain(hr_time($pheader->{time})),
-                              $param->{tree}->{main}                     => html_thread ($msg, $template, $tpar),
-                              $formact->{post}->{assign}                 => $formact->{post}->{url},
-                              $formact->{vote}->{assign}                 => $formact->{vote}->{url},
-                              $formdata->{posterBody}->{assign}->{value} => $area,
-                              $formdata->{uniqueID}  ->{assign}->{value} => plain(unique_id),
-                              $formdata->{followUp}  ->{assign}->{value} => plain($param -> {thread}.';'.$param -> {posting}),
-                              $formdata->{quoteChar} ->{assign}->{value} => "&#255;".plain('»» '),
-                              $formdata->{userID}    ->{assign}->{value} => '',
-                              }, $pars)};

 
 

+  my $view = get_view_params ({
+    adminDefault => $param -> {adminDefault}
+  });
+
+  my ($xmlfile, $locked, $xml) = ($threadpath.'t'.$param -> {thread}.'.xml', 0);
+
+  unless (($locked = lock_file ($xmlfile)) and ($xml = parse_xml_file ($xmlfile))) {
+    violent_unlock_file ($xmlfile);
+    print ${$template -> scrap (
+      $assign -> {errorDoc},
+      { $assign -> {errorText} => $template -> insert (
+          $assign -> {(defined $locked)
+            ? 'occupied'
+            : 'notAvailable'
+          })
+      }
+    )};
+  }
+  else {
+    violent_unlock_file ($xmlfile) unless (unlock_file($xmlfile));
+
+    my ($mnode, $tnode) = get_message_node ($xml, 't'.$param -> {thread}, 'm'.$param -> {posting});
+
+    unless ($mnode and not $mnode->getAttribute('invisible')) {
+      print ${$template -> scrap (
+        $assign -> {errorDoc},
+        { $assign -> {errorText} => $template -> insert ($assign -> {'notAvailable'}) }
+      )};
+    }
+    else {
+      my $pnode = $mnode -> getParentNode;
+      my $header = get_message_header ($mnode);
+      my $msg = parse_single_thread ($tnode, $param -> {showDeleted}, $view -> {sortedMsg});
+      my $pheader = ($pnode -> getNodeName eq 'Message')?get_message_header ($pnode):{};
+
+      my $formdata = $param -> {form} -> {data};
+      my $formact = $param -> {form} -> {action};
+
+      my $body = get_message_body ($xml, 'm'.$param -> {posting});
+
+      my $text = message_field (
+        $body,
+        { quoteChars => plain($view -> {quoteChars}),
+          quoting    => $view -> {quoting},
+          startCite  => ${$template -> scrap ($assign -> {startCite})},
+          endCite    => ${$template -> scrap ($assign -> {endCite})}
+        }
+      );
+
+      my $area = answer_field (
+        $body,
+        { quoteArea  => 1,
+          quoteChars => plain($view -> {quoteChars}),
+          messages   => $param -> {messages}
+        }
+      );
+
+      my $pars = {};
+
+      $pars -> {$formdata -> {$_} -> {assign} -> {name}} = plain($formdata -> {$_} -> {name})
+        for (qw(
+          posterBody
+          uniqueID
+          followUp
+          quoteChar
+          userID
+          posterName
+          posterEmail
+          posterURL
+          posterImage
+          )
+        );
+
+      my $cgi = $param -> {cgi};
+
+      my $tpar = {
+        thread   => $param -> {thread},
+        template => $param -> {tree},
+        start    => $param -> {posting},
+        cgi      => $cgi
+      };
+
+      my $parent_pars;
+
+      $parent_pars = {
+        $assign->{parentTitle} => plain(defined $pheader->{subject}  ? $pheader->{subject}  : ''),
+        $assign->{parentCat}   => plain(defined $pheader->{category} ? $pheader->{category} : ''),
+        $assign->{parentName}  => plain(defined $pheader->{name}     ? $pheader->{name}     : ''),
+        $assign->{parentTime}  => plain(hr_time($pheader->{time})),
+        $assign->{parentLink}  => query_string (
+          { $cgi -> {thread} => $param -> {thread},
+            $cgi -> {posting} => ($pnode -> getAttribute ('id') =~ /(\d+)/)[0]
+          })
+      } if (%$pheader);
+
+      print ${$template -> scrap (
+        $assign->{mainDoc},
+        { $assign->{name}                            => plain(defined $header->{name}  ? $header->{name}  : ''),
+          $assign->{email}                           => plain(defined $header->{email} ? $header->{email} : ''),
+          $assign->{home}                            => plain(defined $header->{home}  ? $header->{home}  : ''),
+          $assign->{image}                           => plain(defined $header->{image} ? $header->{image} : ''),
+          $assign->{time}                            => plain(hr_time($header->{time})),
+          $assign->{message}                         => $text,
+          $assign->{messageTitle}                    => plain(defined $header->{subject}  ? $header->{subject}  : ''),
+          $assign->{messageCat}                      => plain(defined $header->{category} ? $header->{category} : ''),
+          $param->{tree}->{main}                     => html_thread ($msg, $template, $tpar),
+          $formact->{post}->{assign}                 => $formact->{post}->{url},
+          $formact->{vote}->{assign}                 => $formact->{vote}->{url},
+          $formdata->{posterBody}->{assign}->{value} => $area,
+          $formdata->{uniqueID}  ->{assign}->{value} => plain(unique_id),
+          $formdata->{followUp}  ->{assign}->{value} => plain($param -> {thread}.';'.$param -> {posting}),
+          $formdata->{quoteChar} ->{assign}->{value} => "&#255;".plain(defined $view -> {quoteChars} ? $view -> {quoteChars} : ''),
+          $formdata->{userID}    ->{assign}->{value} => ''
+        },
+        $pars,
+        $parent_pars
+      )};
+    }
+  }
+
+  return;

 }
 
 }
 

-################################
-# sub message_as_HTML
+### sub message_as_HTML ($$$) ##################################################
+#
+# create HTML String for the Messagetext
+#
+# Params: $xml      - XML::DOM::Document object
+#         $template - Template object
+#         $param    - Hash reference
+#                     (assign, posting, quoteChars, quoting)
+#
+# Return: HTML String

 #
 #

-# HTML erzeugen
-################################
-

 sub message_as_HTML ($$$) {
   my ($xml, $template, $param) = @_;
 
   my $assign = $param -> {assign};
   my $body = get_message_body ($xml, $param -> {posting});
 
 sub message_as_HTML ($$$) {
   my ($xml, $template, $param) = @_;
 
   my $assign = $param -> {assign};
   my $body = get_message_body ($xml, $param -> {posting});
 

-  my $text = message_field ($body,
-                           {quoteChars => '&raquo;&raquo; ',
-                            quoting    => 1,
-                            startCite  => ${$template -> scrap ($assign -> {startCite})},
-                            endCite    => ${$template -> scrap ($assign -> {endCite})}
-                           });
+  my $text = message_field (
+    $body,
+    { quoteChars => plain ($param -> {quoteChars}),
+      quoting    => $param -> {quoting},
+      startCite  => ${$template -> scrap ($assign -> {startCite})},
+      endCite    => ${$template -> scrap ($assign -> {endCite})}
+    }
+  );

 
 

-  # Rueckgabe
+  # return

   $text;
 }
 
   $text;
 }
 

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

 1;
 
 1;
 

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