2 commits - lib/Auth lib/client

[Jeroen van Meeuwen]

 lib/Auth/LDAP.php                       |    5 +++++
 lib/client/kolab_client_task_domain.php |   18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 0240253fff45a7fbc9c5ff990cab69938dd3cc20
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 16:30:27 2012 +0200

    Correct domain list presentation of aliased domains

diff --git a/lib/client/kolab_client_task_domain.php b/lib/client/kolab_client_task_domain.php
index 8fa605c..408f342 100644
--- a/lib/client/kolab_client_task_domain.php
+++ b/lib/client/kolab_client_task_domain.php
@@ -135,7 +135,14 @@ class kolab_client_task_domain extends kolab_client_task
 
                 $i++;
                 $cells = array();
-                $cells[] = array('class' => 'name', 'body' => kolab_html::escape($item['associateddomain']),
+
+                if (is_array($item['associateddomain'])) {
+                    $domain_name = $item['associateddomain'][0];
+                } else {
+                    $domain_name = $item['associateddomain'];
+                }
+
+                $cells[] = array('class' => 'name', 'body' => kolab_html::escape($domain_name),
                     'onclick' => "kadm.command('domain.info', '$idx')");
                 $rows[] = array('id' => $i, 'class' => 'selectable', 'cells' => $cells);
             }
@@ -168,10 +175,15 @@ class kolab_client_task_domain extends kolab_client_task
     public function action_info()
     {
         $id     = $this->get_input('id', 'POST');
-        console("action_info() on", $id);
+        //console("action_info() on", $id);
+
         $result = $this->api->get('domain.info', array('domain' => $id));
+        //console("action_info() \$result", $result);
+
         $domain  = $result->get();
-        $output = $this->domain_form(null, $domain);
+        //console("action_info() \$domain", $domain);
+
+        $output = $this->domain_form(array_keys($domain), $domain);
 
         $this->output->set_object('taskcontent', $output);
     }


commit 7e1573bbda9131759c4dd5535db2d2b52d6b99c7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon May 14 16:14:33 2012 +0200

    Use the old 'kolab_domain_filter' if it is available, and the new 'domain_filter' is not

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index c9f6ecf..b5c9f3f 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -857,6 +857,11 @@ class LDAP
         $base_dn = $this->conf->get($section, 'domain_base_dn');
         $filter  = $this->conf->get($section, 'domain_filter');
 
+        $kolab_filter = $this->conf->get($section, 'kolab_domain_filter');
+        if (empty($filter) && !empty($kolab_filter)) {
+            $filter = $kolab_filter;
+        }
+
         return $this->_search($base_dn, $filter);
     }