From 7fe6eead5a9aaa21bb09c45c2a8842a2c49b7196 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 14 Nov 2016 13:42:22 +0100
Subject: [PATCH] remove identity if alias is removed with "-alias" AND
 create_identity is "yes"

---
 admin/admin-cli.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/admin-cli.php b/admin/admin-cli.php
index d1fd9a401e..99941bf40b 100755
--- a/admin/admin-cli.php
+++ b/admin/admin-cli.php
@@ -389,6 +389,7 @@ function do_edit_mail($type, array $arg0s)
 			{
 				case 'alias':
 					$create_identity = strtolower(array_shift($args)) === 'yes';
+					$delete_identity = $args[0][0] == '-';
 					array_modify($data['mailAlternateAddress'], $args);
 					break;
 				case 'forward':
@@ -407,12 +408,17 @@ function do_edit_mail($type, array $arg0s)
 			if ($type == 'alias' && $create_identity && $args)
 			{
 				// check if user allready has an identity created for given aliases
-				foreach(Api\Mail\Account::identities($account, false, 'ident_email', $account_id) as $email)
+				foreach(Api\Mail\Account::identities($account, false, 'ident_email', $account_id) as $ident_id => $email)
 				{
 					if (($key = array_search($email, $args)) !== false)
 					{
 						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
 				foreach($args as $email)
@@ -456,16 +462,16 @@ function array_modify(&$arr, array &$mod)
 	{
 		case '-':
 			$mod[0] = substr($mod[0], 1);
-			$arr = array_unique(array_diff($arr, $mod));
+			$arr = array_values(array_unique(array_diff($arr, $mod)));
 			break;
 
 		case '+';
 			$mod[0] = substr($mod[0], 1);
-			$arr = array_unique(array_merge($arr, $mod));
+			$arr = array_values(array_unique(array_merge($arr, $mod)));
 			break;
 
 		default:
-			$arr = array_unique($mod);
+			$arr = array_values(array_unique($mod));
 	}
 	return $arr;
 }