From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Sat, 25 Sep 2010 09:03:53 -0400 Subject: [PATCH] - s/RoundCube/Roundcube/ --- program/steps/settings/delete_identity.inc | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc index 42c1da6..4667fd3 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.inc @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | program/steps/settings/delete_identity.inc | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -31,16 +31,13 @@ if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid)) { $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid)); - - if (!$plugin['abort']) { - if ($USER->delete_identity($iid)) { - $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); - } - else { - $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); - } + + if (!$plugin['abort'] && $USER->delete_identity($iid)) { + $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false); } - + else { + $OUTPUT->show_message('nodeletelastidentity', 'error', null, false); + } // send response if ($OUTPUT->ajax_call) $OUTPUT->send(); -- Gitblit v1.9.1