| CHANGELOG | ●●●●● patch | view | raw | blame | history | |
| program/lib/Roundcube/rcube_addressbook.php | ●●●●● patch | view | raw | blame | history | |
| program/lib/Roundcube/rcube_contacts.php | ●●●●● patch | view | raw | blame | history | |
| program/lib/Roundcube/rcube_ldap.php | ●●●●● patch | view | raw | blame | history |
CHANGELOG
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== - Fix removal of a contact from a group in LDAP addressbook (#1489081) - Support CSV import from Atmail (#1489045) - Inlcude SQL query in the log on SQL error (#1489064) - Fix handling untagged responses in IMAP FETCH - "could not load message" error (#1489074) program/lib/Roundcube/rcube_addressbook.php
@@ -371,7 +371,8 @@ * Add the given contact records the a certain group * * @param string Group identifier * @param array List of contact identifiers to be added * @param array|string List of contact identifiers to be added * * @return int Number of contacts added */ function add_to_group($group_id, $ids) @@ -384,7 +385,8 @@ * Remove the given contact records from a certain group * * @param string Group identifier * @param array List of contact identifiers to be removed * @param array|string List of contact identifiers to be removed * * @return int Number of deleted group members */ function remove_from_group($group_id, $ids) program/lib/Roundcube/rcube_contacts.php
@@ -880,7 +880,8 @@ * Add the given contact records the a certain group * * @param string Group identifier * @param array List of contact identifiers to be added * @param array|string List of contact identifiers to be added * * @return int Number of contacts added */ function add_to_group($group_id, $ids) @@ -927,7 +928,8 @@ * Remove the given contact records from a certain group * * @param string Group identifier * @param array List of contact identifiers to be removed * @param array|string List of contact identifiers to be removed * * @return int Number of deleted group members */ function remove_from_group($group_id, $ids) program/lib/Roundcube/rcube_ldap.php
@@ -1922,7 +1922,8 @@ * Add the given contact records the a certain group * * @param string Group identifier * @param array List of contact identifiers to be added * @param array|string List of contact identifiers to be added * * @return int Number of contacts added */ function add_to_group($group_id, $contact_ids) @@ -1937,8 +1938,8 @@ $group_name = $group_cache[$group_id]['name']; $member_attr = $group_cache[$group_id]['member_attr']; $group_dn = "cn=$group_name,$base_dn"; $new_attrs = array(); foreach ($contact_ids as $id) $new_attrs[$member_attr][] = self::dn_decode($id); @@ -1949,14 +1950,15 @@ $this->cache->remove('groups'); return count($new_attrs['member']); return count($new_attrs[$member_attr]); } /** * Remove the given contact records from a certain group * * @param string Group identifier * @param array List of contact identifiers to be removed * @param array|string List of contact identifiers to be removed * * @return int Number of deleted group members */ function remove_from_group($group_id, $contact_ids) @@ -1964,13 +1966,16 @@ if (($group_cache = $this->cache->get('groups')) === null) $group_cache = $this->_fetch_groups(); if (!is_array($contact_ids)) $contact_ids = explode(',', $contact_ids); $base_dn = $this->groups_base_dn; $group_name = $group_cache[$group_id]['name']; $member_attr = $group_cache[$group_id]['member_attr']; $group_dn = "cn=$group_name,$base_dn"; $del_attrs = array(); foreach (explode(",", $contact_ids) as $id) foreach ($contact_ids as $id) $del_attrs[$member_attr][] = self::dn_decode($id); if (!$this->ldap_mod_del($group_dn, $del_attrs)) { @@ -1980,7 +1985,7 @@ $this->cache->remove('groups'); return count($del_attrs['member']); return count($del_attrs[$member_attr]); } /**
