From 119ad13d74388ed62144724ac22e7cc24588eb6b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 09 Aug 2010 02:35:10 -0400
Subject: [PATCH] - Rename hooks: contact_save -> contact_update, identity_save -> identity_update, delete_identity -> identity_delete - Print warning to the log about deprecated hook names usage
---
program/steps/settings/delete_identity.inc | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index 87bac13..06bcab9 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/program/steps/settings/delete_identity.inc
@@ -5,7 +5,7 @@
| program/steps/settings/delete_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: |
@@ -19,31 +19,34 @@
*/
-if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids))
+$iid = get_input_value('_iid', RCUBE_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 ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
{
- if ($RCMAIL->config->get('multiple_identities', true)) {
- if ($USER->delete_identity($ids)) {
- $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
- }
- else {
- $OUTPUT->show_message('nodeletelastidentity', 'error');
- }
+ $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));
+
+ if (!$plugin['abort'] && $USER->delete_identity($iid)) {
+ $OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
}
else {
- $OUTPUT->show_message('opnotpermitted', 'error');
+ $OUTPUT->show_message('nodeletelastidentity', 'error', null, false);
}
-
// send response
if ($OUTPUT->ajax_call)
$OUTPUT->send();
}
-
if ($OUTPUT->ajax_call)
exit;
-
// go to identities page
rcmail_overwrite_action('identities');
-?>
+
--
Gitblit v1.9.1