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

* Addressbook: deleting an account now also takes care of deleting or changing ownership of distribution lists (beside contacts as before)

Browse Source
This commit is contained in:
Ralf Becker 2013-08-30 07:05:19 +00:00
parent ecf440ed57
commit 32ebec4feb
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addressbook/inc/class.addressbook_so.inc.php
View File

@ -791,20 +791,17 @@ class addressbook_so
if (!$new_owner)
{
$this->somain->delete(array('owner' => $account_id));
$this->somain->delete(array('owner' => $account_id)); // so_sql_cf::delete() takes care of cfs too
if(!($this->somain instanceof addressbook_sql))
{
$this->soextra->delete_customfields(array($this->extra_owner => $account_id));
$lists = $this->somain->get_lists($account_id);
$this->somain->delete_list(array_keys($lists));
}
}
else
{
$this->somain->change_owner($account_id,$new_owner);
$this->db->update($this->soextra->table_name,array(
$this->extra_owner => $new_owner
),array(
$this->extra_owner => $account_id
),__LINE__,__FILE__);
}
}

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

@ -454,7 +454,7 @@ class addressbook_sql extends so_sql_cf
}
/**
* Change the ownership of contacts owned by a given account
* Change the ownership of contacts and distribution-lists owned by a given account
*
* @param int $account_id account-id of the old owner
* @param int $new_owner account-id of the new owner
@ -463,13 +463,28 @@ class addressbook_sql extends so_sql_cf
{
if (!$new_owner) // otherwise we would create an account (contact_owner==0)
{
die("socontacts_sql::change_owner($account_id,$new_owner) new owner must not be 0");
throw egw_exception_wrong_parameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
}
// contacts
$this->db->update($this->table_name,array(
'contact_owner' => $new_owner,
),array(
'contact_owner' => $account_id,
),__LINE__,__FILE__);
// cfs
$this->db->update($this->soextra->table_name,array(
$this->extra_owner => $new_owner
),array(
$this->extra_owner => $account_id
),__LINE__,__FILE__);
// lists
$this->db->update($this->lists_table, array(
'list_owner' => $new_owner,
),array(
'list_owner' => $account_id,
),__LINE__,__FILE__);
}
/**