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 | 2 +-
program/include/rcube_plugin_api.php | 9 +++++----
program/steps/addressbook/save.inc | 3 ++-
program/steps/settings/save_identity.inc | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 7fe0d4f..692b0c7 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -58,7 +58,8 @@
'address_sources' => 'addressbooks_list',
'get_address_book' => 'addressbook_get',
'create_contact' => 'contact_create',
- 'save_contact' => 'contact_save',
+ 'save_contact' => 'contact_update',
+ 'contact_save' => 'contact_update',
'delete_contact' => 'contact_delete',
'manage_folders' => 'folders_list',
'list_mailboxes' => 'mailboxes_list',
@@ -67,7 +68,9 @@
'list_prefs_sections' => 'preferences_sections_list',
'list_identities' => 'identities_list',
'create_identity' => 'identity_create',
- 'save_identity' => 'identity_save',
+ 'delete_identity' => 'identity_delete',
+ 'save_identity' => 'identity_update',
+ 'identity_save' => 'identity_update',
);
/**
@@ -193,11 +196,9 @@
{
if (is_callable($callback)) {
if (isset($this->deprecated_hooks[$hook])) {
- /* Uncoment after 0.4-stable release
raise_error(array('code' => 522, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Deprecated hook name. ".$hook.' -> '.$this->deprecated_hooks[$hook]), true, false);
- */
$hook = $this->deprecated_hooks[$hook];
}
$this->handlers[$hook][] = $callback;
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 800bf46..dbc7808 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -54,7 +54,8 @@
// update an existing contact
if (!empty($cid))
{
- $plugin = $RCMAIL->plugins->exec_hook('contact_save', array('id' => $cid, 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
+ $plugin = $RCMAIL->plugins->exec_hook('contact_update',
+ array('id' => $cid, 'record' => $a_record, 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
$a_record = $plugin['record'];
if (!$plugin['abort'] && ($result = $CONTACTS->update($cid, $a_record)))
diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc
index a62a052..06bcab9 100644
--- a/program/steps/settings/delete_identity.inc
+++ b/program/steps/settings/delete_identity.inc
@@ -30,7 +30,7 @@
if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
{
- $plugin = $RCMAIL->plugins->exec_hook('delete_identity', array('id' => $iid));
+ $plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));
if (!$plugin['abort'] && $USER->delete_identity($iid)) {
$OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 53cd516..6c2cd81 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -61,7 +61,7 @@
if ($_POST['_iid'])
{
$iid = get_input_value('_iid', RCUBE_INPUT_POST);
- $plugin = $RCMAIL->plugins->exec_hook('identity_save', 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)))
--
Gitblit v1.9.1