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

fixed not working delete-account hook

Browse Source
This commit is contained in:
Ralf Becker 2013-09-02 11:19:42 +00:00
parent 3d20422177
commit 55b0081103
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,7 +793,7 @@ class addressbook_so
{
$this->somain->delete(array('owner' => $account_id)); // so_sql_cf::delete() takes care of cfs too
if(!($this->somain instanceof addressbook_sql))
if(method_exists($this->somain, 'get_lists'))
{
$lists = $this->somain->get_lists($account_id);
$this->somain->delete_list(array_keys($lists));

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

@ -54,6 +54,8 @@ class addressbook_sql extends so_sql_cf
*/
var $ab2list_table = 'egw_addressbook2list';
const EXTRA_TABLE = 'egw_addressbook_extra';
/**
* Constructor
*
@ -61,7 +63,7 @@ class addressbook_sql extends so_sql_cf
*/
function __construct(egw_db $db=null)
{
parent::__construct('phpgwapi','egw_addressbook','egw_addressbook_extra','contact_',
parent::__construct('phpgwapi', 'egw_addressbook', self::EXTRA_TABLE, 'contact_',
$extra_key='_name',$extra_value='_value',$extra_id='_id',$db);
// Get custom fields from addressbook instead of phpgwapi
@ -473,11 +475,11 @@ class addressbook_sql extends so_sql_cf
),__LINE__,__FILE__);
// cfs
$this->db->update($this->soextra->table_name,array(
$this->extra_owner => $new_owner
$this->db->update(self::EXTRA_TABLE, array(
'contact_owner' => $new_owner
),array(
$this->extra_owner => $account_id
),__LINE__,__FILE__);
'contact_owner' => $account_id
), __LINE__, __FILE__);
// lists
$this->db->update($this->lists_table, array(