lib/kolab_client_task.php
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun Jun 17 13:27:16 CEST 2012
lib/kolab_client_task.php | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit ee6341f0ee1dcc838faa9248097157c3dc9eb5fd
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Jun 17 12:26:56 2012 +0100
Build list of domains from LDAP query
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 8394163..9ed1845 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -652,6 +652,24 @@ class kolab_client_task
{
$post = $this->get_input('login', 'POST');
+ $auth = Auth::get_instance();
+ $conf = Conf::get_instance();
+ $dna = $conf->get('domain_name_attribute');
+ $auth->connect();
+
+ $domains = Array();
+ $_domains = $auth->list_domains();
+
+ foreach ($_domains as $domain_dn => $domain_attrs) {
+ if (is_array($domain_attrs[$dna])) {
+ $domain = array_shift($domain_attrs[$dna]);
+ } else {
+ $domain = $domain_attrs[$dna];
+ }
+
+ $domains[$domain] = $domain;
+ }
+
$username = kolab_html::label(array(
'for' => 'login_name',
'content' => $this->translate('login.username')), true)
@@ -678,7 +696,7 @@ class kolab_client_task
'type' => 'select',
'id' => 'login_domain',
'name' => 'login[domain]',
- 'options' => array('kolabsys.com' => 'kolabsys.com', 'kanarip.com' => 'kanarip.com')));
+ 'options' => $domains));
$button = kolab_html::input(array(
'type' => 'submit',
More information about the commits
mailing list