prepared for XHTML (<br> -> <br />).

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

diff --git a/selfforum-cgi/shared/Encode/Posting.pm b/selfforum-cgi/shared/Encode/Posting.pm
index ffafbf1c0f3aa848f1d43163c615acbe21a800ba..395f71fdea37cbeae9e557460482238d53576a7e 100644 (file)
--- a/selfforum-cgi/shared/Encode/Posting.pm
+++ b/selfforum-cgi/shared/Encode/Posting.pm
@@ -158,8 +158,8 @@ sub answer_field ($$) {
   my $area = $$posting;
   my $qchar = $params -> {quoteChars};
 
   my $area = $$posting;
   my $qchar = $params -> {quoteChars};
 

-  $area =~ s/<br>/\n/g;            # <br> => \n
-  $area =~ s/&(?:#160|nbsp);/ /g;  # nbsp => ' '
+  $area =~ s/<br(?:\/| \/)?>/\n/g;  # <br> => \n
+  $area =~ s/&(?:#160|nbsp);/ /g;   # nbsp => ' '

 
   $area =~ s/^(.)/\177$1/gm if ($params -> {quoteArea}); # shift a quoting character
   $area =~ s/^(\177+)/$qchar x length ($1)/gem;          # decode normalized quoting characters
 
   $area =~ s/^(.)/\177$1/gm if ($params -> {quoteArea}); # shift a quoting character
   $area =~ s/^(\177+)/$qchar x length ($1)/gem;          # decode normalized quoting characters


@@ -208,12 +208,12 @@ sub message_field ($$) {
   my $posting = ${+shift};
   my $params = shift || {};
 
   my $posting = ${+shift};
   my $params = shift || {};
 

-  my $break = '<br>';
+  my $break = '<br />';

 
   if ($params -> {quoting}) {       # quotes are displayed as special?
     my @array = [0 => []];
 
 
   if ($params -> {quoting}) {       # quotes are displayed as special?
     my @array = [0 => []];
 

-    for (split /<br>/ => $posting) {
+    for (split /<br(?:\/| \/)?>/ => $posting) {

       my $l = length ((/^(\177*)/)[0]);
       if ($array[-1][0] == $l) {
         push @{$array[-1][-1]} => $_;
       my $l = length ((/^(\177*)/)[0]);
       if ($array[-1][0] == $l) {
         push @{$array[-1][-1]} => $_;


@@ -225,7 +225,7 @@ sub message_field ($$) {
     shift @array unless @{$array[0][-1]};
 
     my $ll=0;
     shift @array unless @{$array[0][-1]};
 
     my $ll=0;

-    $posting = join '<br>' => map {
+    $posting = join $break => map {

       my $string = $_->[0]
         ? (($ll and $ll != $_->[0]) ? $break : '') .
           join join ($break => @{$_->[-1]})
       my $string = $_->[0]
         ? (($ll and $ll != $_->[0]) ? $break : '') .
           join join ($break => @{$_->[-1]})


@@ -248,4 +248,4 @@ sub message_field ($$) {
 
 #
 #
 
 #
 #

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