popfile-commit

[<ssc...@us...>]

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

Modified Files:
	HTML.pm 
Log Message:
add unmagnetized filter (RFE 683007)

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** HTML.pm	19 Apr 2003 10:00:35 -0000	1.138
--- HTML.pm	19 Apr 2003 12:30:04 -0000	1.139
***************
*** 2017,2021 ****
              if ( ( $filter eq '' ) ||
                   ( $self->{history__}{$file}{bucket} eq $filter ) ||
!                  ( ( $filter eq '__filter__magnet' ) && ( $self->{history__}{$file}{magnet} ne '' ) ) ) {
                  if ( ( $search eq '' ) ||
                     ( $self->{history__}{$file}{from}    =~ /\Q$search\E/i ) ||
--- 2017,2022 ----
              if ( ( $filter eq '' ) ||
                   ( $self->{history__}{$file}{bucket} eq $filter ) ||
!                  ( ( $filter eq '__filter__magnet' ) && ( $self->{history__}{$file}{magnet} ne '' ) ) || 
!                  ( ( $filter eq '__filter__no__magnet' ) && ( $self->{history__}{$file}{magnet} eq '' ) ) ) {
                  if ( ( $search eq '' ) ||
                     ( $self->{history__}{$file}{from}    =~ /\Q$search\E/i ) ||
***************
*** 2543,2546 ****
--- 2544,2548 ----
      }
      $body .= "<option value=\"__filter__magnet\"" . ($self->{form_}{filter} eq '__filter__magnet'?' selected':'') . ">&lt;$self->{language__}{History_ShowMagnet}&gt;</option>\n";
+     $body .= "<option value=\"__filter__no__magnet\"" . ($self->{form_}{filter} eq '__filter__no__magnet'?' selected':'') . ">&lt;$self->{language__}{History_ShowNoMagnet}&gt;</option>\n";
      $body .= "<option value=\"unclassified\"" . ($self->{form_}{filter} eq 'unclassified'?' selected':'') . ">&lt;unclassified&gt;</option>\n";
      $body .= "</select>\n<input type=\"submit\" class=\"submit\" name=\"setfilter\" value=\"$self->{language__}{Filter}\" />\n";
***************
*** 2599,2606 ****
      # indicating the current filter and search settings
  
      my $filtered = '';
!     if ( !( $self->{form_}{filter} eq '' ) ) {
!         if ( $self->{form_}{filter} eq '__filter__magnet' ) {
              $filtered .= $self->{language__}{History_Magnet};
          } else {
              $filtered = sprintf( $self->{language__}{History_Filter}, $self->{classifier__}->get_bucket_color($self->{form_}{filter}), $self->{form_}{filter} ) if ( $self->{form_}{filter} ne '' );
--- 2601,2611 ----
      # indicating the current filter and search settings
  
+     my $filter = $self->{form_}{filter};
      my $filtered = '';
!     if ( !( $filter eq '' ) ) {
!         if ( $filter eq '__filter__magnet' ) {
              $filtered .= $self->{language__}{History_Magnet};
+         } elsif ( $filter eq '__filter__no__magnet' ) {
+             $filtered .= $self->{language__}{History_NoMagnet};
          } else {
              $filtered = sprintf( $self->{language__}{History_Filter}, $self->{classifier__}->get_bucket_color($self->{form_}{filter}), $self->{form_}{filter} ) if ( $self->{form_}{filter} ne '' );