extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't call the deleteaccount hook twice anymore

Browse Source
This commit is contained in:
Lars Kneschke 2003-09-20 04:48:34 +00:00
parent 2f986a6667
commit 39e3d2b965
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/inc/class.boaccounts.inc.php
View File

@ -135,6 +135,12 @@
$account_id = get_account_id($accountid); $account_id = get_account_id($accountid);
// make this information also in hook available // make this information also in hook available
$lid = $GLOBALS['phpgw']->accounts->id2name($account_id); $lid = $GLOBALS['phpgw']->accounts->id2name($account_id);
$GLOBALS['hook_values']['account_id'] = $account_id;
$GLOBALS['hook_values']['account_lid'] = $lid;
$singleHookValues = $GLOBALS['hook_values']+array('location' => 'deleteaccount');
$db = $GLOBALS['phpgw']->db; $db = $GLOBALS['phpgw']->db;
$db->query('SELECT app_name,app_order FROM phpgw_applications WHERE app_enabled!=0 ORDER BY app_order',__LINE__,__FILE__); $db->query('SELECT app_name,app_order FROM phpgw_applications WHERE app_enabled!=0 ORDER BY app_order',__LINE__,__FILE__);
if($db->num_rows()) if($db->num_rows())
@ -143,21 +149,16 @@
{ {
$appname = $db->f('app_name'); $appname = $db->f('app_name');
if($appname <> 'admin') if($appname <> 'admin' || $appname <> 'preferences')
{ {
$GLOBALS['phpgw']->hooks->single('deleteaccount', $appname); $GLOBALS['phpgw']->hooks->single($singleHookValues, $appname);
} }
} }
} }
$GLOBALS['hook_values']['account_id'] = $account_id;
$GLOBALS['hook_values']['account_lid'] = $lid;
$GLOBALS['phpgw']->hooks->single('deleteaccount','preferences'); $GLOBALS['phpgw']->hooks->single('deleteaccount','preferences');
$GLOBALS['phpgw']->hooks->single('deleteaccount','admin'); $GLOBALS['phpgw']->hooks->single('deleteaccount','admin');
$GLOBALS['phpgw']->hooks->process('deleteaccount');
$basedir = $GLOBALS['phpgw_info']['server']['files_dir'] . SEP . 'users' . SEP; $basedir = $GLOBALS['phpgw_info']['server']['files_dir'] . SEP . 'users' . SEP;
if (! @rmdir($basedir . $lid)) if (! @rmdir($basedir . $lid))