summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-24 08:10:10 +0000
committeralecpl <alec@alec.pl>2008-10-24 08:10:10 +0000
commitccd04868e091adbbfc4e08d2bc501085226d6130 (patch)
tree0dba36daaf7a65d6b0d0888a653bbd974f1c109b
parentec01712a998b35d48be3daaf272779fdbc63cd74 (diff)
- Added option 'identities_level', removed 'multiple_identities'
- Allow deleting identities when multiple_identities=false (#1485435)
-rw-r--r--program/steps/settings/delete_identity.inc17
1 files changed, 3 insertions, 14 deletions
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 87bac13ea..ee6fbb157 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/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');