popfile-commit

[<sta...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv21278

Modified Files:
	HTML.pm 
Log Message:
fixed D. Smith amp fix

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** HTML.pm	24 Feb 2003 18:49:06 -0000	1.82
--- HTML.pm	24 Feb 2003 21:48:44 -0000	1.83
***************
*** 2734,2749 ****
              }
  
              $from =~ s/</&lt;/g;
              $from =~ s/>/&gt;/g;
! 
              $short_from =~ s/</&lt;/g;
              $short_from =~ s/>/&gt;/g;
! 
              $subject =~ s/</&lt;/g;
              $subject =~ s/>/&gt;/g;
! 
              $short_subject =~ s/</&lt;/g;
              $short_subject =~ s/>/&gt;/g;
! 
              $body .= "<tr";
              if ( ( ( defined($self->{form}{view}) ) && ( $self->{form}{view} eq $mail_file ) ) || ( ( defined($self->{form}{file}) && ( $self->{form}{file} eq $mail_file ) ) ) || ( $highlight_message eq $mail_file ) ) {
--- 2734,2753 ----
              }
  
+             $from =~ s/&/&amp;/g;
              $from =~ s/</&lt;/g;
              $from =~ s/>/&gt;/g;
!             
!             $short_from =~ s/&/&amp;/g;
              $short_from =~ s/</&lt;/g;
              $short_from =~ s/>/&gt;/g;
!             
!             $subject =~ s/&/&amp;/g;
              $subject =~ s/</&lt;/g;
              $subject =~ s/>/&gt;/g;
!             
!             $short_subject =~ s/&/&amp;/g;
              $short_subject =~ s/</&lt;/g;
              $short_subject =~ s/>/&gt;/g;
!             
              $body .= "<tr";
              if ( ( ( defined($self->{form}{view}) ) && ( $self->{form}{view} eq $mail_file ) ) || ( ( defined($self->{form}{file}) && ( $self->{form}{file} eq $mail_file ) ) ) || ( $highlight_message eq $mail_file ) ) {