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

* EMailAdmin: fixed creating identities as admin when further identities are not allowed (for regular users) overwrites standard identity

Browse Source
This commit is contained in:
Ralf Becker 2014-11-20 12:47:58 +00:00
parent 23b9e73a2d
commit a71d0d7a80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emailadmin/inc/class.emailadmin_wizard.inc.php
View File

@ -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(