Fix attachment menu structure and aria-attributes

Thomas Bruederli

2014-06-04 3412e50b54e3daac8745234e21ab6e72be0ed165

 program/steps/settings/delete_identity.inc

@@ -5,8 +5,11 @@
 | program/steps/settings/delete_identity.inc                            |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
 | See the README file for a full license statement.                     |
 |                                                                       |
 | PURPOSE:                                                              |
 |   Delete the submitted identities (IIDs) from the database            |
@@ -14,38 +17,39 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

$iid = get_input_value('_iid', RCUBE_INPUT_GPC);
$iid = rcube_utils::get_input_value('_iid', rcube_utils::INPUT_GPC);

// check request token
if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) {
  $OUTPUT->show_message('invalidrequest', 'error');
  rcmail_overwrite_action('identities');
  return;
if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(rcube_utils::INPUT_GPC)) {
    $OUTPUT->show_message('invalidrequest', 'error');
    $RCMAIL->overwrite_action('identities');
    return;
}

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 ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid)) {
    $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));

  if ($deleted)
    $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
  else
    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nodeletelastidentity', 'error', null, false);
    $deleted = !$plugin['abort'] ? $RCMAIL->user->delete_identity($iid) : $plugin['result'];

  // send response
  if ($OUTPUT->ajax_call)
    $OUTPUT->send();
    if ($deleted > 0 && $deleted !== false) {
        $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
    }
    else {
        $msg = $plugin['message'] ? $plugin['message'] : ($deleted < 0 ? 'nodeletelastidentity' : 'errorsaving');
        $OUTPUT->show_message($msg, 'error', null, false);
    }

    // send response
    if ($OUTPUT->ajax_call) {
        $OUTPUT->send();
    }
}

if ($OUTPUT->ajax_call)
  exit;
if ($OUTPUT->ajax_call) {
    exit;
}

// go to identities page
rcmail_overwrite_action('identities');
$RCMAIL->overwrite_action('identities');