From f247cc770243a474bbba7845094047e0995b9746 Mon Sep 17 00:00:00 2001 From: ndparker <> Date: Tue, 27 Feb 2001 00:20:40 +0000 Subject: [PATCH 1/1] *** empty log message *** --- selfforum-cgi/shared/Conf/Admin.pm | 7 +++---- selfforum-cgi/shared/Encode/Plain.pm | 9 +++++---- selfforum-cgi/shared/Encode/Posting.pm | 7 +++---- selfforum-cgi/shared/Posting/Write.pm | 7 +++---- selfforum-cgi/shared/Posting/_lib.pm | 7 +++---- selfforum-cgi/shared/Template/Posting.pm | 12 ++++++++---- selfforum-cgi/shared/common.xml | 8 ++++---- selfforum-cgi/user/fo_posting.pl | 1 - selfforum-cgi/user/fo_view.pl | 15 ++++++++------- 9 files changed, 37 insertions(+), 36 deletions(-) diff --git a/selfforum-cgi/shared/Conf/Admin.pm b/selfforum-cgi/shared/Conf/Admin.pm index cf4fa13..0a50ee8 100644 --- a/selfforum-cgi/shared/Conf/Admin.pm +++ b/selfforum-cgi/shared/Conf/Admin.pm @@ -2,7 +2,7 @@ # ==================================================== # Autor: n.d.p. / 2001-01-05 -# lm : n.d.p. / 2001-02-02 +# lm : n.d.p. / 2001-02-25 # ==================================================== # Funktion: # Einlesen der Admindefaultkonfiguration @@ -12,7 +12,7 @@ use strict; package Conf::Admin; -use vars qw(@ISA @EXPORT); +use vars qw(@EXPORT); use Lock qw(:READ); @@ -22,8 +22,7 @@ use XML::DOM; # Funktionsexport # ==================================================== -require Exporter; -@ISA = qw(Exporter); +use base qw(Exporter); @EXPORT = qw(read_admin_conf); ################################ diff --git a/selfforum-cgi/shared/Encode/Plain.pm b/selfforum-cgi/shared/Encode/Plain.pm index cf7ef06..f7c5eef 100644 --- a/selfforum-cgi/shared/Encode/Plain.pm +++ b/selfforum-cgi/shared/Encode/Plain.pm @@ -2,7 +2,7 @@ # ==================================================== # Autor: n.d.p. / 2001-01-07 -# lm : n.d.p. / 2001-02-06 +# lm : n.d.p. / 2001-02-25 # ==================================================== # Funktion: # Codierung von non-ASCII-Zeichen fuer @@ -15,14 +15,13 @@ package Encode::Plain; require 5.6.0; -use vars qw(@ISA @EXPORT %sonder %unimap $utf8); +use vars qw(@EXPORT %sonder %unimap $utf8); # ==================================================== # Funktionsexport # ==================================================== -require Exporter; -@ISA = qw(Exporter); +use base qw(Exporter); @EXPORT = qw(plain multiline toUTF8); ################################ @@ -152,6 +151,8 @@ sub toUTF8 ($) { # ==================================================== BEGIN { + $utf8 = 0; + # Latin 1 + geraten %sonder=("\177" => '', # Delete-Zeichen "\200" => '€', # Euro-Zeichen diff --git a/selfforum-cgi/shared/Encode/Posting.pm b/selfforum-cgi/shared/Encode/Posting.pm index b12420f..0140dfb 100644 --- a/selfforum-cgi/shared/Encode/Posting.pm +++ b/selfforum-cgi/shared/Encode/Posting.pm @@ -2,7 +2,7 @@ # ==================================================== # Autor: n.d.p. / 2001-01-07 -# lm : n.d.p. / 2001-01-08 +# lm : n.d.p. / 2001-02-25 # ==================================================== # Funktion: # Spezielle Codierung eines Postingtextes @@ -12,15 +12,14 @@ use strict; package Encode::Posting; -use vars qw(@ISA @EXPORT); +use vars qw(@EXPORT); use Encode::Plain; $Encode::Plain::utf8 = 1; # ==================================================== # Funktionsexport # ==================================================== -require Exporter; -@ISA = qw(Exporter); +use base qw(Exporter); @EXPORT = qw(encoded_body answer_field message_field); ################################ diff --git a/selfforum-cgi/shared/Posting/Write.pm b/selfforum-cgi/shared/Posting/Write.pm index d2444df..72a5b25 100644 --- a/selfforum-cgi/shared/Posting/Write.pm +++ b/selfforum-cgi/shared/Posting/Write.pm @@ -2,7 +2,7 @@ # ==================================================== # Autor: n.d.p. / 2001-01-29 -# lm : n.d.p. / 2001-01-29 +# lm : n.d.p. / 2001-02-25 # ==================================================== # Funktion: # Speicherung eines Postings @@ -12,14 +12,13 @@ use strict; package Posting::Write; -use vars qw(@ISA @EXPORT); +use vars qw(@EXPORT); +use base qw(Exporter); # ==================================================== # Funktionsexport # ==================================================== -require Exporter; -@ISA = qw(Exporter); @EXPORT = qw(write_posting); use Encode::Plain; $Encode::Plain::utf8 = 1; diff --git a/selfforum-cgi/shared/Posting/_lib.pm b/selfforum-cgi/shared/Posting/_lib.pm index fea4097..587ed9a 100644 --- a/selfforum-cgi/shared/Posting/_lib.pm +++ b/selfforum-cgi/shared/Posting/_lib.pm @@ -2,7 +2,7 @@ # ==================================================== # Autor: n.d.p. / 2001-01-07 -# lm : n.d.p. / 2001-01-08 +# lm : n.d.p. / 2001-02-25 # ==================================================== # Funktion: # * Schnittstellen fuer den Zugriff auf Messages @@ -13,7 +13,8 @@ use strict; package Posting::_lib; -use vars qw(@ISA @EXPORT_OK); +use vars qw(@EXPORT_OK); +use base qw(Exporter); use Encode::Plain; $Encode::Plain::utf8 = 1; @@ -23,8 +24,6 @@ use XML::DOM; # Funktionsexport # ==================================================== -require Exporter; -@ISA = qw(Exporter); @EXPORT_OK = qw(get_message_header get_message_body get_message_node parse_single_thread hr_time short_hr_time long_hr_time get_all_threads diff --git a/selfforum-cgi/shared/Template/Posting.pm b/selfforum-cgi/shared/Template/Posting.pm index d10d105..fe504f0 100644 --- a/selfforum-cgi/shared/Template/Posting.pm +++ b/selfforum-cgi/shared/Template/Posting.pm @@ -20,6 +20,7 @@ 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; @@ -45,12 +46,15 @@ sub print_posting_as_HTML ($$$) { 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 $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}; @@ -60,7 +64,7 @@ sub print_posting_as_HTML ($$$) { 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})} @@ -68,7 +72,7 @@ sub print_posting_as_HTML ($$$) { my $area = answer_field ($body, {quoteArea => 1, - quoteChars => '»» ', + quoteChars => plain($view -> {quoteChars}), messages => $param -> {messages} }); @@ -106,7 +110,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->{quoteChar} ->{assign}->{value} => "ÿ".plain('»» '), + $formdata->{quoteChar} ->{assign}->{value} => "ÿ".plain($view -> {quoteChars}), $formdata->{userID} ->{assign}->{value} => '', }, $pars)}; diff --git a/selfforum-cgi/shared/common.xml b/selfforum-cgi/shared/common.xml index b534444..e32612a 100644 --- a/selfforum-cgi/shared/common.xml +++ b/selfforum-cgi/shared/common.xml @@ -1,9 +1,9 @@ - C:/Server/teamone - C:/Server/teamone/cgi-local - teamone + e:/localhosts/i_selfhtml/htdocs + e:/localhosts/i_selfhtml/cgi-local + selfhtml - + \ No newline at end of file diff --git a/selfforum-cgi/user/fo_posting.pl b/selfforum-cgi/user/fo_posting.pl index fc8b182..916dc99 100644 --- a/selfforum-cgi/user/fo_posting.pl +++ b/selfforum-cgi/user/fo_posting.pl @@ -32,7 +32,6 @@ use Template; use Template::Posting; use CGI qw(param header); - use XML::DOM; print header (-type => 'text/html'); diff --git a/selfforum-cgi/user/fo_view.pl b/selfforum-cgi/user/fo_view.pl index 5d7d529..ad74b50 100644 --- a/selfforum-cgi/user/fo_view.pl +++ b/selfforum-cgi/user/fo_view.pl @@ -42,13 +42,14 @@ my ($tid, $mid) = (param ($cgi -> {thread}), param ($cgi -> {posting})); if (defined ($tid) and defined ($mid)) { print_posting_as_HTML ($message_path, "$Bin/".$show_posting -> {templateFile}, - {assign => $show_posting -> {assign}, - thread => $tid, - posting => $mid, - messages => $show_posting -> {messages}, - form => $show_posting -> {form}, - cgi => $cgi, - tree => $tree + {assign => $show_posting -> {assign}, + thread => $tid, + posting => $mid, + adminDefault => $adminDefault, + messages => $show_posting -> {messages}, + form => $show_posting -> {form}, + cgi => $cgi, + tree => $tree });} else { -- 2.34.1