Branch 'kolab-webadmin-3.0' - 4 commits - lib/Auth lib/client lib/ext lib/kolab_client_task.php public_html/js

[Jeroen van Meeuwen]

 lib/Auth/LDAP.php                         |   13 ++++---------
 lib/client/kolab_client_task_settings.php |    4 ++++
 lib/ext/Net/LDAP3.php                     |    2 ++
 lib/kolab_client_task.php                 |    3 +++
 public_html/js/kolab_admin.js             |   16 +++-------------
 5 files changed, 16 insertions(+), 22 deletions(-)

New commits:
commit 10e24e306591a696b65f0919fa4e571535ce8963
Author: Aleksander Machniak <alec at alec.pl>
Date:   Wed Jan 23 17:45:54 2013 +0100

    Reset additional search filter after search (Bug #1565)

diff --git a/lib/ext/Net/LDAP3.php b/lib/ext/Net/LDAP3.php
index 76c6702..df44b0f 100644
--- a/lib/ext/Net/LDAP3.php
+++ b/lib/ext/Net/LDAP3.php
@@ -1325,6 +1325,8 @@ class Net_LDAP3
 
         $search = $this->search($base_dn, $filter, $scope, $sort, $search);
 
+        $this->additional_filter = null;
+
         if (!$search) {
             $this->_debug("Net_LDAP3: Search did not succeed!");
             return FALSE;


commit 40588bda28d3cc4ceb6315fab411a8003c5edb3c
Author: Aleksander Machniak <alec at alec.pl>
Date:   Wed Jan 23 15:30:33 2013 +0100

    Fix bug where type=*e* was added to some LDAP searches

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index bcf2176..d3116c8 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -249,18 +249,13 @@ class LDAP extends Net_LDAP3 {
 
         $mail_attrs = $this->conf->get_list('mail_attributes', array('mail', 'alias'));
 
-        $search = array(
-                'params' => array(
-                        'type' => 'exact'
-                    ),
-                'operator' => "OR"
-            );
+        $search = array('operator' => 'OR');
 
         foreach ($mail_attrs as $num => $attr) {
             $search['params'][$attr] = array(
-                        'type' => 'exact',
-                        'value' => $address,
-                );
+                'type'  => 'exact',
+                'value' => $address,
+            );
         }
 
         $result = $this->search_entries($this->config_get('root_dn'), '(objectclass=*)', 'sub', null, $search);


commit acb61b85a9e80c19a225c65a0b8a2f9522dc4bf8
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Jan 7 17:17:56 2013 +0100

    Fix detection of auto_form_fields (e.g. 'alias') type (Bug #1512)

diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php
index 849bc90..ec55c73 100644
--- a/lib/client/kolab_client_task_settings.php
+++ b/lib/client/kolab_client_task_settings.php
@@ -648,6 +648,10 @@ class kolab_client_task_settings extends kolab_client_task
                 if (empty($data['attributes']['form_fields'][$attr])) {
                     $valtype = 'auto-readonly';
                 }
+
+                if (empty($type) && !empty($data['attributes']['auto_form_fields'][$attr]['type'])) {
+                    $type = $data['attributes']['auto_form_fields'][$attr]['type'];
+                }
             }
 
             // set cell content


commit ca44d6f4d33abb27f00a393e49f20d4b94c78b9b
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri Jan 4 14:43:38 2013 +0100

    Implement autocompletion minimum length limit (add 'autocomplete_min_length' option) (Bug #1486)
    Increase autocompletion request delay - the time from key press to the request (Bug #1486)

diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 5fe2473..8583e01 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -1315,9 +1315,12 @@ class kolab_client_task
             ));
         }
 
+        $ac_min_len = $this->config_get('autocomplete_min_length', 1, Conf::INT);
+
         $this->output->set_env('form_id', $attribs['id']);
         $this->output->set_env('assoc_fields', $assoc_fields);
         $this->output->set_env('required_fields', $req_fields);
+        $this->output->set_env('autocomplete_min_length', $ac_min_len);
         $this->output->add_translation('form.required.empty', 'form.maxcount.exceeded',
             $name . '.add.success', $name . '.edit.success', $name . '.delete.success',
             'add', 'edit', 'delete');
diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index 3290bf1..959f0f1 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -514,11 +514,11 @@ function kolab_admin()
       case 37:  // left
       case 39:  // right
         if (!e.shiftKey)
-	      return;
+          return;
     }
 
     // start timer
-    this.ac_timer = window.setTimeout(function() { kadm.ac_start(props); }, 200);
+    this.ac_timer = window.setTimeout(function() { kadm.ac_start(props); }, 500);
     this.ac_input = e.target;
 
     return true;
@@ -565,10 +565,7 @@ function kolab_admin()
     this.ac_stop();
 
     if (q.length && q.length < min) {
-      if (!this.ac_info) {
-        this.ac_info = this.display_message(
-          this.t('search.acchars').replace('$min', min));
-      }
+      this.display_message(this.t('search.acchars').replace('$min', min), 'notice', 2000);
       return;
     }
 
@@ -698,15 +695,8 @@ function kolab_admin()
     if (this.ac_data)
       this.ac_data.abort();
 
-    if (this.ac_info)
-      this.hide_message(this.ac_info);
-
-    if (this.ac_msg)
-      this.hide_message(this.ac_msg);
-
     this.ac_data = null;
     this.ac_info = null;
-    this.ac_msg = null;
   };