extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix removing aliases incl. identity was remove all identities, but the one it was supposed to remove

Browse Source
This commit is contained in:
Ralf Becker 2016-11-15 14:22:28 +01:00
parent 40e601ddf3
commit bb22b03edc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/admin-cli.php
View File

@ -377,7 +377,7 @@ function do_edit_mail($type, array $arg0s)
foreach($acc_id ? array(Api\Mail\Account::read($acc_id, $account_id)) : foreach($acc_id ? array(Api\Mail\Account::read($acc_id, $account_id)) :
Api\Mail\Account::search($account_id, false) as $account) Api\Mail\Account::search($account_id, false) as $account)
{ {
if (!Api\Mail\Account::is_multiple($account)) continue; // no need to waste time on personal accounts if (!isset($acc_id) && !Api\Mail\Account::is_multiple($account)) continue; // no need to waste time on personal accounts
$args = $arg0s; $args = $arg0s;
try { try {
@ -412,13 +412,13 @@ function do_edit_mail($type, array $arg0s)
{ {
if (($key = array_search($email, $args)) !== false) if (($key = array_search($email, $args)) !== false)
{ {
// delete identities, if "-" is used and email of identity matches given ones and is not standard identity
if ($delete_identity && $ident_id != $account->ident_id)
{
Api\Mail\Account::delete_identity($ident_id);
}
unset($args[$key]); unset($args[$key]);
} }
// delete identities, if "-" is used and email of identity matches given ones and is not standard identity
elseif ($delete_identity && $ident_id != $account->ident_id)
{
Api\Mail\Account::delete_identity($ident_id);
}
} }
// create not existing identities by copying standard identity plus alias as email // create not existing identities by copying standard identity plus alias as email
foreach($args as $email) foreach($args as $email)