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 c0815f4ce89b45cb0ef0f3aac4c5d389e3a7609a..395f71fdea37cbeae9e557460482238d53576a7e 100644 (file)
--- a/selfforum-cgi/shared/Encode/Posting.pm
+++ b/selfforum-cgi/shared/Encode/Posting.pm
@@ -60,7 +60,7 @@ sub encoded_body ($;$) {
   my $params = shift;
 
   $posting =~ s/\015\012|\015|\012/\n/g; # normalize newlines
   my $params = shift;
 
   $posting =~ s/\015\012|\015|\012/\n/g; # normalize newlines

-  $posting =~ s/[^\S\n]$//gm;            # kill whitespaces at the end of all lines
+  $posting =~ s/[^\S\n]+$//gm;           # kill whitespaces at the end of all lines

   $posting =~ s/\s+$//;                  # kill whitespaces (newlines) at the end of the string (text)
 
   # check the special syntaxes:
   $posting =~ s/\s+$//;                  # kill whitespaces (newlines) at the end of the string (text)
 
   # check the special syntaxes:


@@ -73,7 +73,7 @@ sub encoded_body ($;$) {
   my @links = grep {
        is_URL ( $_ -> [1] => ':ALL')
     or is_URL (($_ -> [1] =~ /^[Vv][Ii][Ee][Ww]-[Ss][Oo][Uu][Rr][Cc][Ee]:(.+)/)[0] || '' => 'http')
   my @links = grep {
        is_URL ( $_ -> [1] => ':ALL')
     or is_URL (($_ -> [1] =~ /^[Vv][Ii][Ee][Ww]-[Ss][Oo][Uu][Rr][Cc][Ee]:(.+)/)[0] || '' => 'http')

-    or (  $_ -> [1] =~ m<^\.?\.?/(?!/)|\?>
+    or (  $_ -> [1] =~ m<^(?:\.?\.?/(?!/)|\?)>

       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawlinks;
 
       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawlinks;
 


@@ -83,7 +83,7 @@ sub encoded_body ($;$) {
   push @rawimages => [$1 => $2] while ($posting =~ /\[([Ii][Mm][Aa][Gg][Ee]):\s*([^\]\s]+)\s*\]/g);
   my @images = grep {
        is_URL ($_ -> [1] => 'strict_http')
   push @rawimages => [$1 => $2] while ($posting =~ /\[([Ii][Mm][Aa][Gg][Ee]):\s*([^\]\s]+)\s*\]/g);
   my @images = grep {
        is_URL ($_ -> [1] => 'strict_http')

-    or (  $_ -> [1] =~ m<^\.?\.?/(?!/)|\?>
+    or (  $_ -> [1] =~ m<^(?:\.?\.?/(?!/)|\?)>

       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawimages;
 
       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawimages;
 


@@ -93,8 +93,7 @@ sub encoded_body ($;$) {
   push @rawiframes => [$1 => $2] while ($posting =~ /\[([Ii][Ff][Rr][Aa][Mm][Ee]):\s*([^\]\s]+)\s*\]/g);
   my @iframes = grep {
        is_URL ($_ -> [1] => 'http')
   push @rawiframes => [$1 => $2] while ($posting =~ /\[([Ii][Ff][Rr][Aa][Mm][Ee]):\s*([^\]\s]+)\s*\]/g);
   my @iframes = grep {
        is_URL ($_ -> [1] => 'http')

-    or is_URL (($_ -> [1] =~ /^[Vv][Ii][Ee][Ww]-[Ss][Oo][Uu][Rr][Cc][Ee]:(.+)/)[0] || '' => 'http')
-    or (  $_ -> [1] =~ m<^\.?\.?/(?!/)|\?>
+    or (  $_ -> [1] =~ m<^(?:\.?\.?/(?!/)|\?)>

       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawiframes;
 
       and is_URL (rel_uri ($_ -> [1], $base) => 'http'))
   } @rawiframes;
 


@@ -159,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


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

+  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]} => $_;


@@ -224,10 +224,14 @@ sub message_field ($$) {
     }
     shift @array unless @{$array[0][-1]};
 
     }
     shift @array unless @{$array[0][-1]};
 

-    $posting = join '<br>' => map {
-      $_->[0]
-        ? join join ('<br>' => @{$_->[-1]}) => ($params->{startCite}, $params->{endCite})
-        : (join '<br>' => @{$_->[-1]});
+    my $ll=0;
+    $posting = join $break => map {
+      my $string = $_->[0]
+        ? (($ll and $ll != $_->[0]) ? $break : '') .
+          join join ($break => @{$_->[-1]})
+            => ($params->{startCite}, $params->{endCite})
+        : (join $break => @{$_->[-1]});
+      $ll = $_->[0]; $string;

     } @array;
   }
 
     } @array;
   }
 


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

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