diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-01-17 11:35:43 (GMT) |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-01-17 11:35:43 (GMT) |
| commit | a4b33a9ccb881ffeb8e5151be1753cf6eec11c82 (patch) | |
| tree | 316db230ad950aee49adc9935a7183373bed052b /lib | |
| parent | fd2371b897f5f47d2703127cd4c537b1f0b20af4 (diff) | |
| download | Net_LDAP3-a4b33a9ccb881ffeb8e5151be1753cf6eec11c82.tar.gz | |
Fix issue when modifying entry's RDN attribute and new value is a one-element array (Bug #2778)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Net/LDAP3.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php index dd16ef6..6cfedfe 100644 --- a/lib/Net/LDAP3.php +++ b/lib/Net/LDAP3.php @@ -1187,7 +1187,7 @@ class Net_LDAP3 $_sort2 = false; } - if (!($new_attrs[$attr] === $old_attr_value) && !($_sort1 === $_sort2)) { + if ($new_attrs[$attr] !== $old_attr_value && $_sort1 !== $_sort2) { $this->_debug("Attribute $attr changed from " . var_export($old_attr_value, true) . " to " . var_export($new_attrs[$attr], true)); if ($attr === $rdn_attr) { $this->_debug("This attribute is the RDN attribute. Let's see if it is multi-valued, and if the original still exists in the new value."); @@ -1209,14 +1209,13 @@ class Net_LDAP3 $this->_debug("Adding to delete attribute $attr values:" . implode(', ', $_attr_to_remove)); - $mod_array['delete'][$attr] = $_attr_to_remove; + $mod_array['del'][$attr] = $_attr_to_remove; if (strtolower($new_attrs[$attr]) !== strtolower($rdn_attr_value)) { $this->_debug("new attrs is not the same as the old rdn value, issuing a rename"); $mod_array['rename']['dn'] = $subject_dn; $mod_array['rename']['new_rdn'] = $rdn_attr . '=' . $new_attrs[$attr][0]; } - } else { $this->_debug("new attrs is not the same as any of the old rdn value, issuing a full rename"); $mod_array['rename']['dn'] = $subject_dn; @@ -1225,13 +1224,13 @@ class Net_LDAP3 } else { // TODO: See if the rdn attr. value is still in $new_attrs[$attr] if (in_array($old_attrs[$attr][0], $new_attrs[$attr])) { - $this->_debug("Simply replacing attr $attr as rnd attr value is preserved."); + $this->_debug("Simply replacing attr $attr as rdn attr value is preserved."); $mod_array['replace'][$attr] = $new_attrs[$attr]; } else { // TODO: This fails. $mod_array['rename']['dn'] = $subject_dn; $mod_array['rename']['new_rdn'] = $rdn_attr . '=' . $new_attrs[$attr][0]; - $mod_array['delete'][$attr] = $old_attrs[$attr][0]; + $mod_array['del'][$attr] = $old_attrs[$attr][0]; } } } else { @@ -2227,7 +2226,6 @@ class Net_LDAP3 } } - if (is_array($attributes['add']) && !empty($attributes['add'])) { $this->_debug("LDAP: C: Mod-Add $subject_dn: " . json_encode($attributes['add'])); |