--- a/imap.pm Fri Nov 25 15:29:45 2011 +0100
+++ b/imap.pm Mon Nov 28 09:49:28 2011 +0100
@@ -6,12 +6,13 @@
verbose(" imap:");
my $imap = connectImap();
- $imap->setacl($mbox, $Cf->imap_admin => "lrswipcda");
- if ($imap->list($mbox)) {
- verbose("(exists)");
+ $imap->setacl( $mbox, $Cf->imap_admin => "lrswipcda" );
+ if ( $imap->list($mbox) ) {
+ verbose("(exists)");
} else {
- $imap->create($mbox) or die ":$@: $mbox\n";
- $imap->setquota($mbox, STORAGE => 1024 * $Cf->imap_quota) or die ":$@: $mbox\n";
+ $imap->create($mbox) or die ":$@: $mbox\n";
+ $imap->setquota( $mbox, STORAGE => 1024 * $Cf->imap_quota )
+ or die ":$@: $mbox\n";
}
verbose("ok");
@@ -23,21 +24,23 @@
verbose(" imap:");
my $imap = connectImap();
- $imap->setacl($mbox, $Cf->imap_admin, "rc");
+ $imap->setacl( $mbox, $Cf->imap_admin, "rc" );
- if (not $imap->exists($mbox)) {
- verbose("does not exist");
+ if ( not $imap->exists($mbox) ) {
+ verbose("does not exist");
} else {
- $imap->delete($mbox) or die "$@";
+ $imap->delete($mbox) or die "$@";
}
verbose("ok");
}
-
sub connectImap() {
- my $imap = new Cyrus::IMAP::Admin($Cf->imap_server) or die "$@";
- $imap->authenticate(-user => $Cf->imap_admin,
- -password => $ENV{IMAP_PASS} || askPass("IMAP (" . $Cf->imap_admin .") password: "));
+ my $imap = new Cyrus::IMAP::Admin( $Cf->imap_server ) or die "$@";
+ $imap->authenticate(
+ -user => $Cf->imap_admin,
+ -password => $ENV{IMAP_PASS}
+ || askPass( "IMAP (" . $Cf->imap_admin . ") password: " )
+ );
return $imap;
}