From ccd04868e091adbbfc4e08d2bc501085226d6130 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Fri, 24 Oct 2008 04:10:10 -0400 Subject: [PATCH] - Added option 'identities_level', removed 'multiple_identities' - Allow deleting identities when multiple_identities=false (#1485435) --- program/steps/settings/delete_identity.inc | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc index 87bac13..ee6fbb1 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.inc @@ -21,27 +21,16 @@ 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'); -- Gitblit v1.9.1