3 commits - bin/setquota.pl lib/Kolab lib/Kolab.pm

[Jeroen van Meeuwen]

 bin/setquota.pl    |    6 ++++--
 lib/Kolab.pm       |    2 +-
 lib/Kolab/Cyrus.pm |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f5870a8fc5068ee4c395efbee6dad4d871cb742b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jun 17 16:03:50 2011 -0500

    Correct typo

diff --git a/lib/Kolab.pm b/lib/Kolab.pm
index 710c29f..4e5d4da 100644
--- a/lib/Kolab.pm
+++ b/lib/Kolab.pm
@@ -742,7 +742,7 @@ sub cyrusMurderTransferMailbox {
 
 =head3 Transfer a Mailbox in a Cyrus Murder
 
-=head4 cyrusMurderTrasnferMailbox
+=head4 cyrusMurderTransferMailbox
 
 This function transfers a mailbox in a Cyrus IMAP Murder. It expects to be
 passed a mailbox name, such as 'jdoe', 'jdoe at example.org' or 'info at company.com',


commit f52ab265f5dac305a8a4fd469ae91f3982ebffb9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jun 17 16:03:21 2011 -0500

    Fix the return values for transferMailbox

diff --git a/lib/Kolab/Cyrus.pm b/lib/Kolab/Cyrus.pm
index 7ed630a..3279ca3 100644
--- a/lib/Kolab/Cyrus.pm
+++ b/lib/Kolab/Cyrus.pm
@@ -235,10 +235,10 @@ sub transferMailbox
 
     if (!$cyrus->xfermailbox($mailboxPath, $mailHost)) {
         Kolab::log('Y', "Unable to transfer mailbox `$mailboxPath' to `$mailHost', Error = `" . $cyrus->error . "'", KOLAB_WARN);
-        return 0;
+        return 1;
     }
 
-    return 1;
+    return 0;
 }
 
 sub setACL


commit 47b41c6c53cb88b4b73e800475ccdc5f90d58e45
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jun 17 16:02:55 2011 -0500

    Update setquota.pl

diff --git a/bin/setquota.pl b/bin/setquota.pl
index c5b9bee..bad3a5f 100755
--- a/bin/setquota.pl
+++ b/bin/setquota.pl
@@ -6,7 +6,9 @@
 use Kolab;
 use Kolab::Cyrus;
 
-my ($mailboxName, $mailboxType) = @ARGV;
+my $mailboxName = $ARGV[0];
+my $quota = $ARGV[1];
+my $mailboxType = $ARGV[2];
 
 Kolab::reloadConfig('/etc/kolab/kolab-shc.conf');
 
@@ -14,4 +16,4 @@ if ( !$mailboxType ) {
     $mailboxType = 'user';
 }
 
-Kolab::cyrusMurderSetQuota($mailboxName, $mailboxType);
+Kolab::cyrusMurderSetQuota($mailboxName, $quota, $mailboxType);