[popfile-commit] engine/Services IMAP.pm,1.9.4.9,1.9.4.10

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

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

Modified Files:
      Tag: b0_22_2
	IMAP.pm 
Log Message:
Use the more common syntax for the $form hash-ref.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.9
retrieving revision 1.9.4.10
diff -C2 -d -r1.9.4.9 -r1.9.4.10
*** IMAP.pm	19 Nov 2007 14:04:08 -0000	1.9.4.9
--- IMAP.pm	23 Nov 2007 06:59:44 -0000	1.9.4.10
***************
*** 1381,1390 ****
      # watched folders
      if ( $name eq 'imap_1_watch_folders' ) {
!         if ( defined $$form{update_imap_1_watch_folders} ) {
  
              my $i = 1;
              my %folders;
              foreach ( $self->watched_folders__() ) {
!                 $folders{ $$form{"imap_folder_$i"} }++;
                  $i++;
              }
--- 1381,1390 ----
      # watched folders
      if ( $name eq 'imap_1_watch_folders' ) {
!         if ( defined $form->{update_imap_1_watch_folders} ) {
  
              my $i = 1;
              my %folders;
              foreach ( $self->watched_folders__() ) {
!                 $folders{ $form->{"imap_folder_$i"} }++;
                  $i++;
              }
***************
*** 1398,1402 ****
      # Add a watched folder
      if ( $name eq 'imap_2_watch_more_folders' ) {
!         if ( defined $$form{imap_2_watch_more_folders} ) {
              my @current = $self->watched_folders__();
              push @current, 'INBOX';
--- 1398,1402 ----
      # Add a watched folder
      if ( $name eq 'imap_2_watch_more_folders' ) {
!         if ( defined $form->{imap_2_watch_more_folders} ) {
              my @current = $self->watched_folders__();
              push @current, 'INBOX';
***************
*** 1408,1412 ****
      # map buckets to folders
      if ( $name eq 'imap_3_bucket_folders' ) {
!         if ( defined $$form{imap_3_bucket_folders} ) {
  
              # We have to make sure that there is only one bucket per folder
--- 1408,1412 ----
      # map buckets to folders
      if ( $name eq 'imap_3_bucket_folders' ) {
!         if ( defined $form->{imap_3_bucket_folders} ) {
  
              # We have to make sure that there is only one bucket per folder
***************
*** 1421,1425 ****
                  if ( $key =~ /^imap_folder_for_(.+)$/ ) {
                      my $bucket = $1;
!                     my $folder = $$form{ $key };
  
                      $bucket2folder{ $bucket } = $folder;
--- 1421,1425 ----
                  if ( $key =~ /^imap_folder_for_(.+)$/ ) {
                      my $bucket = $1;
!                     my $folder = $form->{ $key };
  
                      $bucket2folder{ $bucket } = $folder;
***************
*** 1458,1465 ****
      if ( $name eq 'imap_5_options' ) {
  
!         if ( defined $$form{update_imap_5_options} ) {
  
              # expunge or not?
!             if ( defined $$form{imap_options_expunge} ) {
                  $self->config_( 'expunge', 1 );
              }
--- 1458,1465 ----
      if ( $name eq 'imap_5_options' ) {
  
!         if ( defined $form->{update_imap_5_options} ) {
  
              # expunge or not?
!             if ( defined $form->{imap_options_expunge} ) {
                  $self->config_( 'expunge', 1 );
              }
***************
*** 1469,1473 ****
  
              # update interval
!             my $form_interval = $$form{imap_options_update_interval};
              if ( defined $form_interval ) {
                  if ( $form_interval > 10 && $form_interval < 60*60 ) {
--- 1469,1473 ----
  
              # update interval
!             my $form_interval = $form->{imap_options_update_interval};
              if ( defined $form_interval ) {
                  if ( $form_interval > 10 && $form_interval < 60*60 ) {
***************
*** 1503,1510 ****
      my $form     = shift;
  
!     if ( defined $$form{update_imap_0_connection_details} ) {
!         if ( $$form{imap_hostname} ne '' ) {
              $templ->param( IMAP_connection_if_hostname_error => 0 );
!             $self->config_( 'hostname', $$form{imap_hostname} );
          }
          else {
--- 1503,1510 ----
      my $form     = shift;
  
!     if ( defined $form->{update_imap_0_connection_details} ) {
!         if ( $form->{imap_hostname} ne '' ) {
              $templ->param( IMAP_connection_if_hostname_error => 0 );
!             $self->config_( 'hostname', $form->{imap_hostname} );
          }
          else {
***************
*** 1512,1517 ****
          }
  
!         if ( $$form{imap_port} >= 1 && $$form{imap_port} < 65536 ) {
!             $self->config_( 'port', $$form{imap_port} );
              $templ->param( IMAP_connection_if_port_error => 0 );
          }
--- 1512,1517 ----
          }
  
!         if ( $form->{imap_port} >= 1 && $form->{imap_port} < 65536 ) {
!             $self->config_( 'port', $form->{imap_port} );
              $templ->param( IMAP_connection_if_port_error => 0 );
          }
***************
*** 1520,1525 ****
          }
  
!         if ( $$form{imap_login} ne '' ) {
!             $self->config_( 'login', $$form{imap_login} );
              $templ->param( IMAP_connection_if_login_error => 0 );
          }
--- 1520,1525 ----
          }
  
!         if ( $form->{imap_login} ne '' ) {
!             $self->config_( 'login', $form->{imap_login} );
              $templ->param( IMAP_connection_if_login_error => 0 );
          }
***************
*** 1528,1533 ****
          }
  
!         if ( $$form{imap_password} ne '' ) {
!             $self->config_( 'password', $$form{imap_password} );
              $templ->param( IMAP_connection_if_password_error => 0 );
          }
--- 1528,1533 ----
          }
  
!         if ( $form->{imap_password} ne '' ) {
!             $self->config_( 'password', $form->{imap_password} );
              $templ->param( IMAP_connection_if_password_error => 0 );
          }
***************
*** 1536,1540 ****
          }
  
!         if ( defined $form->{imap_use_ssl} ) {
              $self->config_( 'use_ssl', 1 );
          }
--- 1536,1540 ----
          }
  
!         if ( $form->{imap_use_ssl} ) {
              $self->config_( 'use_ssl', 1 );
          }