- Added ACL management for addressbook edit form (kolab_addressbook plugin)

git-svn-id: https://svn.roundcube.net/trunk@4877 208e9e7b-5314-0410-a742-e7e81cd9613c

3 files changed, 13 insertions, 5 deletions

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 6e6aa7b67..300fd7220 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -1,7 +1,7 @@
 /**
  * ACL plugin script
  *
- * @version 0.2
+ * @version 0.3
  * @author Aleksander Machniak <alec@alec.pl>
  */
 
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 8e9d28ae2..552b5032b 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -3,7 +3,7 @@
 /**
  * Folders Access Control Lists Management (RFC4314, RFC2086)
  *
- * @version 0.2
+ * @version 0.3
  * @author Aleksander Machniak <alec@alec.pl>
  *
  *
@@ -25,7 +25,7 @@
 
 class acl extends rcube_plugin
 {
-    public $task = 'settings';
+    public $task = 'settings|addressbook';
 
     private $rc;
     private $supported = null;
@@ -41,8 +41,10 @@ class acl extends rcube_plugin
 
         // Register hooks
         $this->add_hook('folder_form', array($this, 'folder_form'));
+        // kolab_addressbook plugin
+        $this->add_hook('addressbook_form', array($this, 'folder_form'));
         // Plugin actions
-        $this->register_action('plugin.acl', array($this, 'acl_actions')); 
+        $this->register_action('plugin.acl', array($this, 'acl_actions'));
     }
 
     /**
@@ -117,6 +119,12 @@ class acl extends rcube_plugin
         $this->rc->output->include_script('list.js');
         $this->include_stylesheet($this->local_skin_path().'/acl.css');
 
+        // add Info fieldset if it doesn't exist
+        if (!isset($args['form']['props']['fieldsets']['info']))
+            $args['form']['props']['fieldsets']['info'] = array(
+                'name'  => rcube_label('info'),
+                'content' => array());
+
         // Display folder rights to 'Info' fieldset
         $args['form']['props']['fieldsets']['info']['content']['myrights'] = array(
             'label' => Q($this->gettext('myrights')),
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index 608dc4f04..4d048adac 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -21,7 +21,7 @@ $labels['aclk'] = 'Tworzenie podfolderów (Create)';
 $labels['acld'] = 'Usuwanie wiadomości (Delete)';
 $labels['aclt'] = 'Usuwanie wiadomości (Delete)';
 $labels['acle'] = 'Porządkowanie folderu (Expunge)';
-$labels['aclx'] = 'Usuwanie folder (Delete)';
+$labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja (Administer)';
 
 $labels['aclfull'] = 'Wszystkie';