CS fixes

Aleksander Machniak

2013-12-31 d575e46067c06f1165adb249865f3812e270df12

 program/steps/settings/delete_identity.inc

@@ -4,9 +4,12 @@
 +-----------------------------------------------------------------------+
 | program/steps/settings/delete_identity.inc                            |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 | This file is part of the Roundcube Webmail client                     |
 | 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,28 +17,39 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
{
$iid = rcube_utils::get_input_value('_iid', rcube_utils::INPUT_GPC);

  if ($USER->delete_identity($ids))
    $OUTPUT->show_message('deletedsuccessfully', 'confirmation');

  // send response
  if ($OUTPUT->ajax_call)
    $OUTPUT->send();
// check request token
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));

if ($OUTPUT->ajax_call)
  exit;
    $deleted = !$plugin['abort'] ? $RCMAIL->user->delete_identity($iid) : $plugin['result'];

    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;
}

// go to identities page
rcmail_overwrite_action('identities');

?>
$RCMAIL->overwrite_action('identities');