Redesign of the identities settings + add config option to disable multiple identities

git-svn-id: https://svn.roundcube.net/trunk@1796 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 10 insertions, 7 deletions

diff --git a/roundcubemail/program/steps/settings/delete_identity.inc b/roundcubemail/program/steps/settings/delete_identity.inc
index a5f3d4445..87bac13ea 100644
--- a/roundcubemail/program/steps/settings/delete_identity.inc
+++ b/roundcubemail/program/steps/settings/delete_identity.inc
@@ -21,15 +21,18 @@
 
 if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
 {
-
-  if ($USER->delete_identity($ids))
-  {
-    $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
+  if ($RCMAIL->config->get('multiple_identities', true)) {
+    if ($USER->delete_identity($ids)) {
+      $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
+    }
+    else {
+      $OUTPUT->show_message('nodeletelastidentity', 'error');
+    }
   }
-  else 
-  {
-    $OUTPUT->show_message('nodeletelastidentity', 'error');
+  else {
+    $OUTPUT->show_message('opnotpermitted', 'error');
   }
+  
   // send response
   if ($OUTPUT->ajax_call)
     $OUTPUT->send();