From: Manni H. <man...@us...> - 2007-08-31 12:52:57
|
Update of /cvsroot/popfile/engine/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16408/Services Modified Files: Tag: b0_22_2 IMAP.pm Log Message: If we loose the connection to the server, we just die. This is fine as long as what we were doing was a result of a call to service(). However, we have to make sure that stuff that happens outside of service also gets eval'd. Index: IMAP.pm =================================================================== RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v retrieving revision 1.9.4.3 retrieving revision 1.9.4.4 diff -C2 -d -r1.9.4.3 -r1.9.4.4 *** IMAP.pm 6 Nov 2006 15:05:53 -0000 1.9.4.3 --- IMAP.pm 31 Aug 2007 12:52:52 -0000 1.9.4.4 *************** *** 2234,2240 **** if ( defined $imap ) { if ( $self->login( $imap ) ) {; ! $self->get_mailbox_list( $imap ); ! $self->logout( $imap ); ! $templ->param( IMAP_update_list_failed => '' ); } else { --- 2234,2247 ---- if ( defined $imap ) { if ( $self->login( $imap ) ) {; ! eval { ! $self->get_mailbox_list( $imap ); ! }; ! if ( $@ ) { ! $templ->param( IMAP_update_list_failed => 'Lost the connection to the server while trying to update the list of mailboxes. Please try again and/or check your connection settings.' ); ! } ! else { ! $self->logout( $imap ); ! $templ->param( IMAP_update_list_failed => '' ); ! } } else { |