Kolab Groupware OBS

kolab-autoconf.spec Changed

debian.changelog Changed

kolab-autoconf-0.2.tar.gz/lib/Autodiscover.php -> kolab-autoconf-0.3.tar.gz/lib/Autodiscover.php Changed

@@ -172,7 +172,7 @@
         $this->ldap();
 
         // find domain
-        if (!($domain = $this->find_domain($domain))) {
+        if (!$this->ldap->find_domain($domain)) {
             $this->error("Unknown domain");
         }
 
@@ -211,6 +211,9 @@
             'hosts'           => array($this->_ldap_server),
             'port'            => $this->_ldap_port,
             'use_tls'         => $this->_ldap_scheme == 'tls',
+            'domain_base_dn'  => $this->conf->get('ldap', 'domain_base_dn'),
+            'domain_filter'   => $this->conf->get('ldap', 'domain_filter'),
+            'domain_name_attribute' => $this->conf->get('ldap', 'domain_name_attribute'),
         ));
 
         $this->_ldap_domain = $this->conf->get('primary_domain');
@@ -227,43 +230,6 @@
     }
 
     /**
-     * Find domain by name
-     */
-    private function find_domain($domain)
-    {
-        $ckey = 'domain::' . $domain;
-/*
-        // use memcache
-        if ($domain = $this->get_cache_data($ckey)) {
-            return $domain;
-        }
-*/
-        $domain_base_dn        = $this->conf->get('ldap', 'domain_base_dn');
-        $domain_filter         = $this->conf->get('ldap', 'domain_filter');
-        $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute');
-
-        if (empty($domain_name_attribute)) {
-            $domain_name_attribute = 'associateddomain';
-        }
-
-        $name_filter   = $domain_name_attribute . "=" . Net_LDAP3::quote_string($domain);
-        $domain_filter = "(&" . $domain_filter . "(" . $name_filter . "))";
-
-        if ($result = $this->ldap->search($domain_base_dn, $domain_filter, 'sub', array($domain_name_attribute))) {
-            $result = $result->entries(true);
-
-            // root domain
-            $domain = current($result);
-            $domain = current((array)$domain[$domain_name_attribute]);
-/*
-            // cache domain DN
-            $this->set_cache_data($ckey, $domain);
-*/
-            return $domain;
-        }
-    }
-
-    /**
      * Find user in LDAP
      */
     private function find_user($email, $domain)
@@ -292,7 +258,7 @@
         );
 
         $filter  = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter);
-        $base_dn = 'dc=' . implode(',dc=', explode('.', $domain));
+        $base_dn = $this->ldap->domain_root_dn($domain);
 
         $result = $this->ldap->search($base_dn, $filter, 'sub', array_values($attributes));

kolab-autoconf.dsc Changed

Changes of Revision 8