holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed not working update of members

Browse Source
This commit is contained in:
Ralf Becker 2012-02-01 00:59:25 +00:00
parent f5cb740795
commit 625a125e83
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -528,7 +528,7 @@ class addressbook_groupdav extends groupdav_handler
}
if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
if (!($save_ok = $is_group ? $this->save_group($contact) : $this->bo->save($contact)))
if (!($save_ok = $is_group ? $this->save_group($contact, $oldContact) : $this->bo->save($contact)))
{
if ($this->debug) error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
if ($save_ok === 0)
@ -571,11 +571,12 @@ class addressbook_groupdav extends groupdav_handler
{
if ($name != self::$path_attr) $data['list_'.$name] = $contact[$name];
}
//error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') data='.array2string($data));
if (($list_id=$this->bo->add_list(array('list_'.self::$path_attr => $contact[self::$path_attr]),
$contact['owner'], null, $data)))
{
// update members given in $contact['##X-CALENDARSERVER-MEMBER']
$new_members = $contact['##X-CALENDARSERVER-MEMBER'];
// update members given in $contact['##X-ADDRESSBOOKSERVER-MEMBER']
$new_members = $contact['##X-ADDRESSBOOKSERVER-MEMBER'];
if ($new_members[1] == ':' && ($n = unserialize($new_members)))
{
$new_members = $n['values'];
@ -588,13 +589,14 @@ class addressbook_groupdav extends groupdav_handler
if ($oldContact)
{
$to_add = array_diff($oldContact['members'],$new_members);
$to_delete = array_diff($new_members,$oldContact['members']);
$to_add = array_diff($new_members,$oldContact['members']);
$to_delete = array_diff($oldContact['members'],$new_members);
}
else
{
$to_add = $new_members;
}
//error_log('to_add='.array2string($to_add).', to_delete='.array2string($to_delete));
if ($to_add || $to_delete)
{
$to_add_ids = $to_delete_ids = array();
@ -613,6 +615,7 @@ class addressbook_groupdav extends groupdav_handler
}
}
}
//error_log('to_add_ids='.array2string($to_add_ids).', to_delete_ids='.array2string($to_delete_ids));
if ($to_add_ids) $this->bo->add2list($to_add_ids, $list_id, array());
if ($to_delete_ids) $this->bo->remove_from_list($to_delete_ids, $list_id);
}
@ -775,7 +778,7 @@ class addressbook_groupdav extends groupdav_handler
{
$contact = array_shift($contact);
$contact['n_fn'] = $contact['n_family'] = $contact['list_name'];
foreach(array('owner','id','carddav_name','modified','modifier','created','creator','etag') as $name)
foreach(array('owner','id','carddav_name','modified','modifier','created','creator','etag','uid') as $name)
{
$contact[$name] = $contact['list_'.$name];
}

4
addressbook/inc/class.addressbook_sql.inc.php
View File

@ -500,7 +500,7 @@ class addressbook_sql extends so_sql_cf
*/
function add_list($keys,$owner,$contacts=array(),array &$data=array())
{
error_log(__METHOD__.'('.array2string($keys).", $owner, ..., ".array2string($data).')');
//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
if (!$keys && !$data || !(int)$owner) return false;
if ($keys && !is_array($keys)) $keys = array('list_name' => $keys);
@ -512,7 +512,7 @@ class addressbook_sql extends so_sql_cf
{
$data['list_owner'] = $owner;
}
if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys)->fetchColumn()))
if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
{
$data['list_created'] = time();
$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];