lib/api lib/Auth

Aleksander Machniak machniak at kolabsys.com
Sat Aug 24 19:26:56 CEST 2013


 lib/Auth/LDAP.php                        |    5 +++--
 lib/api/kolab_api_service_form_value.php |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f10c70e141c6a85ea5b366dddb8fc84550678754
Author: Aleksander Machniak <alec at alec.pl>
Date:   Sat Aug 24 19:26:36 2013 +0200

    Always check if search result is an object

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index ccb39ea..02aa27b 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -514,8 +514,9 @@ class LDAP extends Net_LDAP3 {
             $domain_filter         = "(&" . $domain_filter . "(" . $domain_name_attribute . "=" . $domain . "))";
 
             $this->_log(LOG_DEBUG, "Auth::LDAP::domain_info() uses _search()");
-            $result = $this->_search($domain_base_dn, $domain_filter, $attributes);
-            $result = $result->entries(true);
+            if ($result = $this->_search($domain_base_dn, $domain_filter, $attributes)) {
+                $result = $result->entries(true);
+            }
         }
         else {
             $this->_log(LOG_DEBUG, "Auth::LDAP::domain_info() uses _read()");
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 7f62a08..1b66760 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -257,8 +257,8 @@ class kolab_api_service_form_value extends kolab_api_service
     {
         $rcpt_pol_aliases = $this->generate_secondary_mail($postdata, $attribs);
 
-        $service = $this->controller->get_service('user');
-        $user_attrs  = $service->user_info(array('id' => $postdata['id']), null);
+        $service    = $this->controller->get_service('user');
+        $user_attrs = $service->user_info(array('id' => $postdata['id']), null);
 
         if (!empty($user_attrs['alias'])) {
             $cur_aliases = $user_attrs['alias'];




More information about the commits mailing list