From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Tue, 21 Sep 2010 14:47:55 -0400 Subject: [PATCH] Fix db_mode check in insert_id() --- program/steps/settings/save_identity.inc | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index 86ff263..6c2cd81 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -5,7 +5,7 @@ | program/steps/settings/save_identity.inc | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | + | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -26,12 +26,6 @@ $a_boolean_cols = array('standard', 'html_signature'); $updated = $default_id = false; -// check request token -if (!$RCMAIL->check_request('save-identity.'.intval(get_input_value('_iid', RCUBE_INPUT_POST)), RCUBE_INPUT_POST)) { - $OUTPUT->show_message('invalidrequest', 'error'); - rcmail_overwrite_action('identities'); - return; -} // check input if (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3)) { @@ -67,7 +61,7 @@ if ($_POST['_iid']) { $iid = get_input_value('_iid', RCUBE_INPUT_POST); - $plugin = $RCMAIL->plugins->exec_hook('save_identity', array('id' => $iid, 'record' => $save_data)); + $plugin = $RCMAIL->plugins->exec_hook('identity_update', array('id' => $iid, 'record' => $save_data)); $save_data = $plugin['record']; if (!$plugin['abort'] && ($updated = $USER->update_identity($iid, $save_data))) @@ -98,7 +92,7 @@ if (IDENTITIES_LEVEL == 1) $save_data['email'] = $RCMAIL->user->get_username(); - $plugin = $RCMAIL->plugins->exec_hook('create_identity', array('record' => $save_data)); + $plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data)); $save_data = $plugin['record']; if (!$plugin['abort'] && $save_data['email'] && ($insert_id = $USER->insert_identity($save_data))) @@ -129,4 +123,4 @@ // go to next step rcmail_overwrite_action('identities'); -?> + -- Gitblit v1.9.1