Request 2624 (accepted)

Overview

Request 2624 (accepted)

Check in 1.1.3

Created by vanmeeuwen over 4 years ago
In state accepted

Submit php-kolab-net-ldap3

Submit package Kolab:Winterfell / php-kolab-net-ldap3 to package Kolab:16 / php-kolab-net-ldap3

php-kolab-net-ldap3.spec Changed

debian.changelog Changed

pear-Net-LDAP3-1.1.2.tar.gz/lib/Net/LDAP3.php -> pear-Net-LDAP3-1.1.3.tar.gz/lib/Net/LDAP3.php Changed

@@ -734,20 +734,20 @@
             if (!empty($result)) {
                 $attributes = array(
                     'dn'                   => $entry_dn,
-                    'attributeLevelRights' => array(),
-                    'entryLevelRights'     => array(),
+                    'attributelevelrights' => array(),
+                    'entrylevelrights'     => array(),
                 );
 
-                foreach (array('aclRights', 'attributeLevelRights', 'entryLevelRights') as $attr_name) {
+                foreach (array('aclrights', 'attributelevelrights', 'entrylevelrights') as $attr_name) {
                     if ($attr_value = $result[$attr_name]) {
                         switch ($attr_name) {
-                        case 'aclRights':
+                        case 'aclrights':
                             $this->parse_aclrights($attributes, $attr_value);
                             break;
-                        case 'attributeLevelRights':
+                        case 'attributelevelrights':
                             $attributes[$attr_name] = $this->parse_attribute_level_rights($attr_value);
                             break;
-                        case 'entryLevelRights':
+                        case 'entrylevelrights':
                             $attributes[$attr_name] = $this->parse_entry_level_rights($attr_value);
                             break;
                         }
@@ -851,8 +851,8 @@
 
         $attributes = array(
             'dn'                   => $subject_dn,
-            'attributeLevelRights' => array(),
-            'entryLevelRights'     => array(),
+            'attributelevelrights' => array(),
+            'entrylevelrights'     => array(),
         );
 
         if ($this->vendor_name() == "Oracle Corporation") {
@@ -876,10 +876,10 @@
 
                 switch ($attribute_name) {
                 case "attributeLevelRights":
-                    $attributes[$attribute_name] = $this->parse_attribute_level_rights($attribute_value);
+                    $attributes['attributelevelrights'] = $this->parse_attribute_level_rights($attribute_value);
                     break;
                 case "entryLevelRights":
-                    $attributes[$attribute_name] = $this->parse_entry_level_rights($attribute_value);
+                    $attributes['entrylevelrights'] = $this->parse_entry_level_rights($attribute_value);
                     break;
                 }
             }
@@ -1608,6 +1608,12 @@
      */
     public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array(), $count_only = false)
     {
+        $controls = null;
+
+        if (!array_key_exists('sort', $props)) {
+            $props['sort'] = false;
+        }
+
         if (!$this->conn) {
             $this->_debug("No active connection for " . __CLASS__ . "::" . __FUNCTION__);
             return false;
@@ -2465,26 +2471,26 @@
 
         switch ($_acl_components[1]) {
             case "entryLevel":
-                $attributes['entryLevelRights'] = Array();
+                $attributes['entrylevelrights'] = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
                     list($method, $bool) = explode(':', $right);
-                    if ($bool == "1" && !in_array($method, $attributes['entryLevelRights'])) {
-                        $attributes['entryLevelRights'][] = $method;
+                    if ($bool == "1" && !in_array($method, $attributes['entrylevelrights'])) {
+                        $attributes['entrylevelrights'][] = $method;
                     }
                 }
 
                 break;
 
             case "attributeLevel":
-                $attributes['attributeLevelRights'][$_acl_components[2]] = Array();
+                $attributes['attributelevelrights'][$_acl_components[2]] = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
                     list($method, $bool) = explode(':', $right);
-                    if ($bool == "1" && !in_array($method, $attributes['attributeLevelRights'][$_acl_components[2]])) {
-                        $attributes['attributeLevelRights'][$_acl_components[2]][] = $method;
+                    if ($bool == "1" && !in_array($method, $attributes['attributelevelrights'][$_acl_components[2]])) {
+                        $attributes['attributelevelrights'][$_acl_components[2]][] = $method;
                     }
                 }
 
@@ -3060,8 +3066,8 @@
         }
 
         $ckey = 'domain.root::' . $domain;
-        if ($result = $this->icache[$ckey]) {
-            return $result;
+        if (array_key_exists($ckey, $this->icache)) {
+            return $this->icache[$ckey];
         }
 
         $this->_debug("Net_LDAP3::domain_root_dn($domain)");
@@ -3114,7 +3120,7 @@
         $ckey  = 'domain::' . $domain;
         $ickey = $ckey . '::' . md5(implode(',', $attributes));
 
-        if (isset($this->icache[$ickey])) {
+        if (array_key_exists($ickey, $this->icache)) {
             return $this->icache[$ickey];
         }

php-net-ldap3.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2624 0

Request History

vanmeeuwen created request over 4 years ago

Check in 1.1.3

vanmeeuwen accepted review over 4 years ago

vanmeeuwen approved review over 4 years ago

vanmeeuwen accepted request over 4 years ago