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

delete user by account_id, not account_lid, as there might be a group with same name

Browse Source
This commit is contained in:
Ralf Becker 2014-10-29 16:03:42 +00:00
parent 08ed554df5
commit eae15c06fd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_account.inc.php
View File

@ -217,7 +217,7 @@ class admin_account
} }
if ($content['delete']) if ($content['delete'])
{ {
$cmd = new admin_cmd_delete_account(accounts::id2name($content['account_id']), $content['new_owner'], true); $cmd = new admin_cmd_delete_account($content['account_id'], $content['new_owner'], true);
$msg = $cmd->run(); $msg = $cmd->run();
if ($content['contact_id']) if ($content['contact_id'])
{ {

14
admin/inc/class.admin_cmd_delete_account.inc.php
View File

@ -49,16 +49,16 @@ class admin_cmd_delete_account extends admin_cmd
$account_id = admin_cmd::parse_account($this->account,$this->is_user); $account_id = admin_cmd::parse_account($this->account,$this->is_user);
admin_cmd::_instanciate_accounts(); admin_cmd::_instanciate_accounts();
$account_lid = admin_cmd::$accounts->id2name($account_id); $account_lid = admin_cmd::$accounts->id2name($account_id);
if ($this->is_user && $this->new_user) if ($this->is_user && $this->new_user)
{ {
$new_user = admin_cmd::parse_account($this->new_user,true); // true = user, no group $new_user = admin_cmd::parse_account($this->new_user,true); // true = user, no group
} }
// check creator is still admin and not explicitly forbidden to edit accounts // check creator is still admin and not explicitly forbidden to edit accounts
if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32); if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
if ($check_only) return true; if ($check_only) return true;
// delete the account // delete the account
$GLOBALS['hook_values'] = array( $GLOBALS['hook_values'] = array(
'account_id' => $account_id, 'account_id' => $account_id,
@ -71,14 +71,14 @@ class admin_cmd_delete_account extends admin_cmd
foreach(array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']),array('preferences','admin')),array('preferences','admin')) as $app) foreach(array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']),array('preferences','admin')),array('preferences','admin')) as $app)
{ {
$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'],$app); $GLOBALS['egw']->hooks->single($GLOBALS['hook_values'],$app);
} }
if (!$this->is_user) $GLOBALS['egw']->accounts->delete($account_id); // groups get not deleted via the admin hook, as users if (!$this->is_user) $GLOBALS['egw']->accounts->delete($account_id); // groups get not deleted via the admin hook, as users
if ($account_id < 0) if ($account_id < 0)
{ {
return lang("Group '%1' deleted.",$this->account)."\n\n"; return lang("Group '%1' deleted.",$account_lid)."\n\n";
} }
return lang("Account '%1' deleted.",$this->account)."\n\n"; return lang("Account '%1' deleted.",$account_lid)."\n\n";
} }
/** /**