diff options
Diffstat (limited to 'plugins/acl')
| -rw-r--r-- | plugins/acl/acl.js | 10 | ||||
| -rw-r--r-- | plugins/acl/acl.php | 7 | ||||
| -rw-r--r-- | plugins/acl/skins/default/acl.css | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js index d78607690..4b1431ac3 100644 --- a/plugins/acl/acl.js +++ b/plugins/acl/acl.js @@ -1,7 +1,7 @@ /** * ACL plugin script * - * @version 0.6 + * @version 0.6.1 * @author Aleksander Machniak <alec@alec.pl> */ @@ -11,7 +11,7 @@ if (window.rcmail) { rcmail.acl_list_init(); // 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) { if (e.field.id != 'acluser') @@ -52,7 +52,7 @@ rcube_webmail.prototype.acl_delete = function() var users = this.acl_get_usernames(); 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')); } @@ -82,7 +82,7 @@ rcube_webmail.prototype.acl_save = function() return; } - this.http_request('plugin.acl', '_act=save' + this.http_request('settings/plugin.acl', '_act=save' + '&_user='+urlencode(user) + '&_acl=' +rights + '&_mbox='+urlencode(this.env.mailbox) @@ -120,7 +120,7 @@ rcube_webmail.prototype.acl_mode_switch = function(elem) { 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), this.set_busy(true, 'loading')); diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 1b021d00a..976b36260 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 @@ class acl extends rcube_plugin $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 @@ class acl extends rcube_plugin $list = array(); $attrib = array( 'name' => 'rcmyrights', - 'style' => 'padding: 0 15px;', + 'style' => 'margin:0; padding:0 15px;', ); foreach ($supported as $right) { diff --git a/plugins/acl/skins/default/acl.css b/plugins/acl/skins/default/acl.css index cd8f4b72e..e46a1d00b 100644 --- a/plugins/acl/skins/default/acl.css +++ b/plugins/acl/skins/default/acl.css @@ -81,7 +81,7 @@ #aclform { - top: 100px; + top: 80px; width: 480px; padding: 10px; } |