- Make the plugin aware of autocomplete_* options

- Fix non-working backspace key in name field


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

3 files changed, 18 insertions, 4 deletions

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 4b1431ac3..488e72722 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -1,7 +1,7 @@
 /**
  * ACL plugin script
  *
- * @version 0.6.1
+ * @version 0.6.2
  * @author Aleksander Machniak <alec@alec.pl>
  */
 
@@ -315,6 +315,9 @@ rcube_webmail.prototype.acl_init_form = function(id)
     this.acl_form.show();
     if (type == 'user')
         name_input.focus();
+
+    // unfocus the list, make backspace key in name input field working
+    this.acl_list.blur();
 }
 
 // Returns class name according to ACL comparision result
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 976b36260..fe7d0d5eb 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.1
+ * @version 0.6.2
  * @author Aleksander Machniak <alec@alec.pl>
  *
  *
@@ -87,10 +87,11 @@ class acl extends rcube_plugin
         $this->load_config();
 
         $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
+        $sid    = get_input_value('_id', RCUBE_INPUT_GPC);
         $users  = array();
 
         if ($this->init_ldap()) {
-            $this->ldap->set_pagesize(15);
+            $this->ldap->set_pagesize((int)$this->rc->config->get('autocomplete_max', 15));
             $result = $this->ldap->search('*', $search);
 
             foreach ($result->records as $record) {
@@ -112,7 +113,7 @@ class acl extends rcube_plugin
 
         sort($users, SORT_LOCALE_STRING);
 
-        $this->rc->output->command('ksearch_query_results', $users, $search);
+        $this->rc->output->command('ksearch_query_results', $users, $search, $sid);
         $this->rc->output->send();
     }
 
@@ -186,6 +187,10 @@ class acl extends rcube_plugin
             'aclrights' => array($this, 'templ_rights'),
         ));
 
+        $this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
+        $this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
+        $this->rc->output->add_label('autocompletechars', 'autocompletemore');
+
         $args['form']['sharing'] = array(
             'name'    => Q($this->gettext('sharing')),
             'content' => $this->rc->output->parse('acl.table', false, false),
diff --git a/plugins/acl/skins/default/acl.css b/plugins/acl/skins/default/acl.css
index e46a1d00b..cf3391f49 100644
--- a/plugins/acl/skins/default/acl.css
+++ b/plugins/acl/skins/default/acl.css
@@ -61,6 +61,12 @@
   background-color: #CC3333;
 }
 
+#acltable tr.unfocused td
+{
+  color: #FFFFFF;
+  background-color: #929292;
+}
+
 #acladvswitch
 {
   position: absolute;