diff options
| -rw-r--r-- | program/include/rcube_plugin_api.php | 9 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 3 | ||||
| -rw-r--r-- | program/steps/settings/delete_identity.inc | 2 | ||||
| -rw-r--r-- | 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 7fe0d4f34..692b0c7cf 100644 --- a/program/include/rcube_plugin_api.php +++ b/program/include/rcube_plugin_api.php @@ -58,7 +58,8 @@ class rcube_plugin_api '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 @@ class rcube_plugin_api '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 @@ class rcube_plugin_api { 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 800bf4632..dbc780812 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -54,7 +54,8 @@ foreach ($a_save_cols as $col) // 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 a62a0524e..06bcab906 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.inc @@ -30,7 +30,7 @@ if (!$OUTPUT->ajax_call && !$RCMAIL->check_request(RCUBE_INPUT_GPC)) { 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 53cd516da..6c2cd8136 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -61,7 +61,7 @@ if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) 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))) |