From b08caf5813c43e8648cdf5db1e003b3046a37c2c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 31 Aug 2011 08:49:44 -0400
Subject: [PATCH] - Applied fixes from trunk up to r5150

---
 plugins/acl/acl.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 1b021d0..976b362 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -3,7 +3,7 @@
 /**
  * Folders Access Control Lists Management (RFC4314, RFC2086)
  *
- * @version 0.6
+ * @version 0.6.1
  * @author Aleksander Machniak <alec@alec.pl>
  *
  *
@@ -25,7 +25,7 @@
 
 class acl extends rcube_plugin
 {
-    public $task = 'settings|addressbook';
+    public $task = 'settings|addressbook|calendar';
 
     private $rc;
     private $supported = null;
@@ -44,6 +44,7 @@
         $this->add_hook('folder_form', array($this, 'folder_form'));
         // kolab_addressbook plugin
         $this->add_hook('addressbook_form', array($this, 'folder_form'));
+        $this->add_hook('calendar_form_kolab', array($this, 'folder_form'));
         // Plugin actions
         $this->register_action('plugin.acl', array($this, 'acl_actions'));
         $this->register_action('plugin.acl-autocomplete', array($this, 'acl_autocomplete'));
@@ -526,7 +527,7 @@
         $list      = array();
         $attrib    = array(
             'name' => 'rcmyrights',
-            'style' => 'padding: 0 15px;',
+            'style' => 'margin:0; padding:0 15px;',
         );
 
         foreach ($supported as $right) {

--
Gitblit v1.9.1