- Added option 'identities_level', removed 'multiple_identities'

- Allow deleting identities when multiple_identities=false (#1485435)


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

1 files changed, 3 insertions, 14 deletions

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