style changes in fo_view.pl

[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..441178de243a4ad198b702876dbd29513e17ba6b 100644 (file)
--- a/selfforum-cgi/shared/Template/Posting.pm
+++ b/selfforum-cgi/shared/Template/Posting.pm
@@ -12,14 +12,13 @@ use strict;
 
 package Template::Posting;
 
 
 package Template::Posting;
 

-use vars qw(@ISA @EXPORT);
-

 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 Template;
 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 Template;

+use Template::_conf;

 use Template::_query;
 use Template::_thread;
 
 use Template::_query;
 use Template::_thread;
 


@@ -29,9 +28,8 @@ use XML::DOM;
 # Funktionsexport
 # ====================================================
 
 # Funktionsexport
 # ====================================================
 

-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(print_posting_as_HTML message_as_HTML);
+use base qw(Exporter);
+@Template::Posting::EXPORT = qw(print_posting_as_HTML message_as_HTML);

 
 ################################
 # sub print_posting_as_HTML
 
 ################################
 # sub print_posting_as_HTML


@@ -45,12 +43,15 @@ sub print_posting_as_HTML ($$$) {
   my $template = new Template $tempfile;
 
   # Datei sperren... (eigentlich)
   my $template = new Template $tempfile;
 
   # Datei sperren... (eigentlich)

+  my $view = get_view_params ({adminDefault => $param -> {adminDefault}
+                              });
+

   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 $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 $msg = parse_single_thread ($tnode, $param -> {showDeleted}, $view -> {sortedMsg});

   my $pheader = ($pnode -> getNodeName eq 'Message')?get_message_header ($pnode):{};
 
   my $assign = $param -> {assign};
   my $pheader = ($pnode -> getNodeName eq 'Message')?get_message_header ($pnode):{};
 
   my $assign = $param -> {assign};


@@ -60,7 +61,7 @@ sub print_posting_as_HTML ($$$) {
   my $body = get_message_body ($xml, 'm'.$param -> {posting});
 
   my $text = message_field ($body,
   my $body = get_message_body ($xml, 'm'.$param -> {posting});
 
   my $text = message_field ($body,

-                           {quoteChars => '»» ',
+                           {quoteChars => plain($view -> {quoteChars}),

                             quoting    => 1,
                             startCite  => ${$template -> scrap ($assign -> {startCite})},
                             endCite    => ${$template -> scrap ($assign -> {endCite})}
                             quoting    => 1,
                             startCite  => ${$template -> scrap ($assign -> {startCite})},
                             endCite    => ${$template -> scrap ($assign -> {endCite})}


@@ -68,7 +69,7 @@ sub print_posting_as_HTML ($$$) {
 
   my $area = answer_field ($body,
                           {quoteArea  => 1,
 
   my $area = answer_field ($body,
                           {quoteArea  => 1,

-                           quoteChars => '»» ',
+                           quoteChars => plain($view -> {quoteChars}),

                            messages   => $param -> {messages}
                           });
 
                            messages   => $param -> {messages}
                           });
 


@@ -106,7 +107,7 @@ sub print_posting_as_HTML ($$$) {
                               $formdata->{posterBody}->{assign}->{value} => $area,
                               $formdata->{uniqueID}  ->{assign}->{value} => plain(unique_id),
                               $formdata->{followUp}  ->{assign}->{value} => plain($param -> {thread}.';'.$param -> {posting}),
                               $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} => "ÿ".plain('»» '),
+                              $formdata->{quoteChar} ->{assign}->{value} => "ÿ".plain($view -> {quoteChars}),

                               $formdata->{userID}    ->{assign}->{value} => '',
                               }, $pars)};
 
                               $formdata->{userID}    ->{assign}->{value} => '',
                               }, $pars)};