Changeset 5147 in subversion

Timestamp:

Aug 29, 2011 6:16:08 PM (21 months ago)

Author:

thomasb

Message:

Register ACL plugin for calendar task; send ajax requests to settings task

Location:

trunk/plugins/acl

Files:

• acl.js (modified) (5 diffs)
• acl.php (modified) (4 diffs)
• skins/default/acl.css (modified) (1 diff)

trunk/plugins/acl/acl.js

@@ -2 +2 @@
  * ACL plugin script
  *
- * @version 0.6
+ * @version 0.6.1
  * @author Aleksander Machniak <alec@alec.pl>
  */
@@ -12 +12 @@
             // enable autocomplete on user input
             if (rcmail.env.acl_users_source) {
-                rcmail.init_address_input_events($('#acluser'), {action:'plugin.acl-autocomplete'});
+                rcmail.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'});
                 // fix inserted value
                 rcmail.addEventListener('autocomplete_insert', function(e) {
@@ -53 +53 @@
 
     if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
-        this.http_request('plugin.acl', '_act=delete&_user='+urlencode(users.join(','))
+        this.http_request('settings/plugin.acl', '_act=delete&_user='+urlencode(users.join(','))
             + '&_mbox='+urlencode(this.env.mailbox),
             this.set_busy(true, 'acl.deleting'));
@@ -83 +83 @@
     }
 
-    this.http_request('plugin.acl', '_act=save'
+    this.http_request('settings/plugin.acl', '_act=save'
         + '&_user='+urlencode(user)
         + '&_acl=' +rights
@@ -121 +121 @@
     this.env.acl_advanced = !this.env.acl_advanced;
     this.enable_command('acl-delete', 'acl-edit', false);
-    this.http_request('plugin.acl', '_act=list'
+    this.http_request('settings/plugin.acl', '_act=list'
         + '&_mode='+(this.env.acl_advanced ? 'advanced' : 'simple')
         + '&_mbox='+urlencode(this.env.mailbox),

trunk/plugins/acl/acl.php

@@ -4 +4 @@
  * Folders Access Control Lists Management (RFC4314, RFC2086)
  *
- * @version 0.6
+ * @version 0.6.1
  * @author Aleksander Machniak <alec@alec.pl>
  *
@@ -26 +26 @@
 class acl extends rcube_plugin
 {
-    public $task = 'settings|addressbook';
+    public $task = 'settings|addressbook|calendar';
 
     private $rc;
@@ -45 +45 @@
         // 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'));
@@ -527 +528 @@
         $attrib    = array(
             'name' => 'rcmyrights',
-            'style' => 'padding: 0 15px;',
+            'style' => 'margin:0; padding:0 15px;',
         );
 

trunk/plugins/acl/skins/default/acl.css

@@ -82 +82 @@
 #aclform
 {
-  top: 100px;
+  top: 80px;
   width: 480px;
   padding: 10px;