diff options
9 files changed, 32 insertions, 32 deletions
diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index 21016dd10..80c58d58b 100644 --- a/plugins/additional_message_headers/additional_message_headers.php +++ b/plugins/additional_message_headers/additional_message_headers.php @@ -19,7 +19,7 @@ class additional_message_headers extends rcube_plugin function init() { - $this->add_hook('outgoing_message_headers', array($this, 'message_headers')); + $this->add_hook('message_outgoing_headers', array($this, 'message_headers')); } function message_headers($args) diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php index 6a0723a0a..bd18aa4ed 100644 --- a/plugins/archive/archive.php +++ b/plugins/archive/archive.php @@ -53,8 +53,8 @@ class archive extends rcube_plugin else if ($rcmail->task == 'settings') { $dont_override = $rcmail->config->get('dont_override', array()); if (!in_array('archive_mbox', $dont_override)) { - $this->add_hook('user_preferences', array($this, 'prefs_table')); - $this->add_hook('save_preferences', array($this, 'save_prefs')); + $this->add_hook('preferences_list', array($this, 'prefs_table')); + $this->add_hook('preferences_save', array($this, 'save_prefs')); } } } diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php index a8ac62e26..919beacbf 100644 --- a/plugins/database_attachments/database_attachments.php +++ b/plugins/database_attachments/database_attachments.php @@ -109,19 +109,19 @@ class database_attachments extends filesystem_attachments /** * When composing an html message, image attachments may be shown - * For this plugin, $this->get_attachment will check the file and + * For this plugin, $this->get() will check the file and * return it's contents */ function display($args) { - return $this->get_attachment($args); + return $this->get($args); } /** * When displaying or sending the attachment the file contents are fetched - * using this method. This is also called by the display_attachment hook. + * using this method. This is also called by the attachment_display hook. */ - function get_attachment($args) + function get($args) { $rcmail = rcmail::get_instance(); diff --git a/plugins/example_addressbook/example_addressbook.php b/plugins/example_addressbook/example_addressbook.php index 42272c86e..c50f8d8ce 100644 --- a/plugins/example_addressbook/example_addressbook.php +++ b/plugins/example_addressbook/example_addressbook.php @@ -12,8 +12,8 @@ class example_addressbook extends rcube_plugin public function init() { - $this->add_hook('address_sources', array($this, 'address_sources')); - $this->add_hook('get_address_book', array($this, 'get_address_book')); + $this->add_hook('addressbooks_list', array($this, 'address_sources')); + $this->add_hook('addressbook_get', array($this, 'get_address_book')); // use this address book for autocompletion queries // (maybe this should be configurable by the user?) diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php index d5f555311..2b2fe71ae 100644 --- a/plugins/filesystem_attachments/filesystem_attachments.php +++ b/plugins/filesystem_attachments/filesystem_attachments.php @@ -20,27 +20,27 @@ class filesystem_attachments extends rcube_plugin { public $task = 'mail'; - + function init() { // Save a newly uploaded attachment - $this->add_hook('upload_attachment', array($this, 'upload')); + $this->add_hook('attachment_upload', array($this, 'upload')); // Save an attachment from a non-upload source (draft or forward) - $this->add_hook('save_attachment', array($this, 'save')); + $this->add_hook('attachment_save', array($this, 'save')); // Remove an attachment from storage - $this->add_hook('remove_attachment', array($this, 'remove')); + $this->add_hook('attachment_delete', array($this, 'remove')); // When composing an html message, image attachments may be shown - $this->add_hook('display_attachment', array($this, 'display')); + $this->add_hook('attachment_display', array($this, 'display')); // Get the attachment from storage and place it on disk to be sent - $this->add_hook('get_attachment', array($this, 'get_attachment')); + $this->add_hook('attachment_get', array($this, 'get')); // Delete all temp files associated with this user - $this->add_hook('cleanup_attachments', array($this, 'cleanup')); - $this->add_hook('kill_session', array($this, 'cleanup')); + $this->add_hook('attachments_cleanup', array($this, 'cleanup')); + $this->add_hook('session_destroy', array($this, 'cleanup')); } /** @@ -86,10 +86,10 @@ class filesystem_attachments extends rcube_plugin } else return $args; } - + $args['id'] = $this->file_id(); $args['status'] = true; - + // Note the file for later cleanup $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $args['path']; @@ -122,11 +122,11 @@ class filesystem_attachments extends rcube_plugin * on disk for use. This stub function is kept here to make this * class handy as a parent class for other plugins which may need it. */ - function get_attachment($args) + function get($args) { return $args; } - + /** * Delete all temp files associated with this user */ @@ -149,7 +149,7 @@ class filesystem_attachments extends rcube_plugin function file_id() { $userid = rcmail::get_instance()->user->ID; - list($usec, $sec) = explode(' ', microtime()); + list($usec, $sec) = explode(' ', microtime()); return preg_replace('/[^0-9]/', '', $userid . $sec . $usec); } } diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php index 71b39214a..5bf8f8497 100644 --- a/plugins/new_user_dialog/new_user_dialog.php +++ b/plugins/new_user_dialog/new_user_dialog.php @@ -16,7 +16,7 @@ class new_user_dialog extends rcube_plugin function init() { - $this->add_hook('create_identity', array($this, 'create_identity')); + $this->add_hook('identity_create', array($this, 'create_identity')); $this->register_action('plugin.newusersave', array($this, 'save_data')); // register additional hooks if session flag is set diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index 73e9198f7..79b01cf9d 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -26,7 +26,7 @@ class new_user_identity extends rcube_plugin function init() { - $this->add_hook('create_user', array($this, 'lookup_user_name')); + $this->add_hook('user_create', array($this, 'lookup_user_name')); } function lookup_user_name($args) diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php index b3d223761..8d442974e 100644 --- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php +++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php @@ -24,8 +24,8 @@ class squirrelmail_usercopy extends rcube_plugin $ilevel = $rcmail->config->get('identities_level', 0); $this->identities_level = intval($ilevel); - $this->add_hook('create_user', array($this, 'create_user')); - $this->add_hook('create_identity', array($this, 'create_identity')); + $this->add_hook('user_create', array($this, 'create_user')); + $this->add_hook('identity_create', array($this, 'create_identity')); } public function create_user($p) diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php index 8e0a676b1..d9c5ce7db 100644 --- a/plugins/subscriptions_option/subscriptions_option.php +++ b/plugins/subscriptions_option/subscriptions_option.php @@ -31,11 +31,11 @@ class subscriptions_option extends rcube_plugin $this->add_texts('localization/', false); $dont_override = rcmail::get_instance()->config->get('dont_override', array()); if (!in_array('use_subscriptions', $dont_override)) { - $this->add_hook('user_preferences', array($this, 'settings_blocks')); - $this->add_hook('save_preferences', array($this, 'save_prefs')); + $this->add_hook('preferences_list', array($this, 'settings_blocks')); + $this->add_hook('preferences_save', array($this, 'save_prefs')); } - $this->add_hook('list_mailboxes', array($this, 'list_mailboxes')); - $this->add_hook('manage_folders', array($this, 'manage_folders')); + $this->add_hook('mailboxes_list', array($this, 'mailboxes_list')); + $this->add_hook('folders_list', array($this, 'folders_list')); } function settings_blocks($args) @@ -72,7 +72,7 @@ class subscriptions_option extends rcube_plugin return $args; } - function list_mailboxes($args) + function mailboxes_list($args) { $rcmail = rcmail::get_instance(); if (!$rcmail->config->get('use_subscriptions', true)) { @@ -81,7 +81,7 @@ class subscriptions_option extends rcube_plugin return $args; } - function manage_folders($args) + function folders_list($args) { $rcmail = rcmail::get_instance(); if (!$rcmail->config->get('use_subscriptions', true)) { |