mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
* EMailAdmin: fixed creating identities as admin when further identities are not allowed (for regular users) overwrites standard identity
This commit is contained in:
parent
23b9e73a2d
commit
a71d0d7a80
@ -955,8 +955,8 @@ class emailadmin_wizard
|
||||
|
||||
case 'delete_identity':
|
||||
// delete none-standard identity of current user
|
||||
if ($content['acc_further_identities'] && $content['ident_id'] > 0 &&
|
||||
$content['std_ident_id'] != $content['ident_id'])
|
||||
if (($this->is_admin || $content['acc_further_identities']) &&
|
||||
$content['ident_id'] > 0 && $content['std_ident_id'] != $content['ident_id'])
|
||||
{
|
||||
emailadmin_account::delete_identity($content['ident_id']);
|
||||
$msg = lang('Identity deleted');
|
||||
@ -970,7 +970,7 @@ class emailadmin_wizard
|
||||
try {
|
||||
// save none-standard identity for current user
|
||||
if ($content['acc_id'] && $content['acc_id'] !== 'new' &&
|
||||
$content['acc_further_identities'] &&
|
||||
($this->is_admin || $content['acc_further_identities']) &&
|
||||
$content['std_ident_id'] != $content['ident_id'])
|
||||
{
|
||||
$content['ident_id'] = emailadmin_account::save_identity(array(
|
||||
|
Loading…
Reference in New Issue
Block a user