[popfile-commit] engine/Services IMAP.pm,1.9.4.19,1.9.4.20

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4518/Services

Modified Files:
      Tag: b0_22_2
	IMAP.pm 
Log Message:
Make sure that users are not able to map the unclassified bucket to a folder to which another bucket is also mapped.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.19
retrieving revision 1.9.4.20
diff -C2 -d -r1.9.4.19 -r1.9.4.20
*** IMAP.pm	4 Feb 2008 20:25:51 -0000	1.9.4.19
--- IMAP.pm	5 Feb 2008 09:48:43 -0000	1.9.4.20
***************
*** 1437,1446 ****
  
                      $bucket2folder{ $bucket } = $folder;
! 
!                     # pseudo buckets are free to map wherever they like since
!                     # we will never reclassify to them anyway
!                     unless ( $self->classifier()->is_pseudo_bucket( $self->api_session(), $bucket ) ) {
!                         $folders{ $folder }++;
!                     }
                  }
              }
--- 1437,1441 ----
  
                      $bucket2folder{ $bucket } = $folder;
!                     $folders{ $folder }++;
                  }
              }
***************
*** 1454,1458 ****
                  else {
                      $self->folder_for_bucket__( $bucket, $folder );
- 
                      $self->{folder_change_flag__} = 1;
                  }
--- 1449,1452 ----