popfile-commit

[<jgr...@us...>]

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

Modified Files:
	HTML.pm 
Log Message:
Clean up regexps used to separate out the popfile123=123.msg part of a history message file name, fixes a bug where if there was popfile in the path various things would not work

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** HTML.pm	11 Mar 2003 22:19:22 -0000	1.112
--- HTML.pm	12 Mar 2003 21:28:21 -0000	1.113
***************
*** 2793,2797 ****
              $body .= "<a name=\"$mail_file\"></a>";
              $body .= $i+1 . "</td>\n<td>";
!             $mail_file =~ /popfile\d+=(\d+)\.msg/;
              $body .= "<a title=\"$from\">$short_from</a></td>\n";
              $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/history?view=$mail_file&amp;start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form__}{sort}&amp;filter=$self->{form__}{filter}&amp;search=$self->{form__}{search}#$mail_file\">";
--- 2793,2797 ----
              $body .= "<a name=\"$mail_file\"></a>";
              $body .= $i+1 . "</td>\n<td>";
!             $mail_file =~ /popfile\d+=(\d+)\.msg$/;
              $body .= "<a title=\"$from\">$short_from</a></td>\n";
              $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/history?view=$mail_file&amp;start_message=$start_message&amp;session=$self->{session_key__}&amp;sort=$self->{form__}{sort}&amp;filter=$self->{form__}{filter}&amp;search=$self->{form__}{search}#$mail_file\">";
***************
*** 3187,3191 ****
  
      for my $i (0..$#{$self->{languages__}}) {
!         $self->{languages__}[$i] =~ s/.*\/(.+)\.msg/$1/;
      }
  }
--- 3187,3191 ----
  
      for my $i (0..$#{$self->{languages__}}) {
!         $self->{languages__}[$i] =~ s/.*\/(.+)\.msg$/$1/;
      }
  }
***************
*** 3297,3301 ****
      my ( $self, $mail_file, $archive ) = @_;
  
!     $mail_file =~ /(popfile.+\=.+\.msg)/;
      $mail_file = $1;
      $self->log_( "delete: $mail_file" );
--- 3297,3301 ----
      my ( $self, $mail_file, $archive ) = @_;
  
!     $mail_file =~ /(popfile.+\=.+\.msg)$/;
      $mail_file = $1;
      $self->log_( "delete: $mail_file" );