alecpl
2011-07-05 9d195d6e82c3be4e543a47ef8ff1e9fe54bd0939
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, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -31,15 +31,13 @@
if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
{
  $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));
  $deleted = !$plugin['abort'] ? $USER->delete_identity($iid) : $plugin['result'];
  if (!$plugin['abort']) {
    if ($USER->delete_identity($iid)) {
      $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
    }
    else {
      $OUTPUT->show_message('nodeletelastidentity', 'error', null, false);
    }
  }
  if ($deleted > 0 && $deleted !== false)
    $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
  else
    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : ($deleted < 0 ? 'nodeletelastidentity' : 'errorsaving'), 'error', null, false);
  // send response
  if ($OUTPUT->ajax_call)
@@ -51,5 +49,3 @@
// go to identities page
rcmail_overwrite_action('identities');