From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 29 Jul 2015 22:10:28 +0000 (+0200)
Subject: Don't push non-existing mailboxes to @MAILBOXES.
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=cdb79844048406e4084496dfca4346ea9f111ba3;p=interimap.git

Don't push non-existing mailboxes to @MAILBOXES.
---

diff --git a/imapsync b/imapsync
index ae05163..d46c262 100755
--- a/imapsync
+++ b/imapsync
@@ -408,13 +408,13 @@ my @MAILBOXES;
     $mailboxes{$_} = 1 foreach keys %{$IMAP->{remote}->{mailboxes}};
     my $sth_subscribe = $DBH->prepare(q{UPDATE mailboxes SET subscribed = ? WHERE idx = ?});
 
-    @MAILBOXES = keys %mailboxes;
-    @MAILBOXES = grep !/$CONF->{_}->{'ignore-mailbox'}/, @MAILBOXES
-        if defined $CONF->{_}->{'ignore-mailbox'};
+    foreach my $mailbox (keys %mailboxes) {
+        next if defined $CONF->{_}->{'ignore-mailbox'} and $mailbox !~ /$CONF->{_}->{'ignore-mailbox'}/o;
+        my ($lExists, $rExists) = map {mbx_exists($_,$mailbox)} qw/local remote/;
+        next unless $lExists or $rExists;
 
-    foreach my $mailbox (@MAILBOXES) {
         check_delim($mailbox); # ensure that the delimiter match
-        my ($lExists, $rExists) = map {mbx_exists($_,$mailbox)} qw/local remote/;
+        push $mailbox, @MAILBOXES;
 
         $STH_GET_INDEX->execute($mailbox);
         my ($idx,$subscribed) = $STH_GET_INDEX->fetchrow_array();