Index: core/email_api.php =================================================================== --- a/core/email_api.php +++ b/core/email_api.php @@ -447,7 +447,8 @@ function email_signup( $p_user_id, $p_password, $p_confirm_hash, $p_admin_name = # Send signup email regardless of mail notification pref # or else users won't be able to sign up if( !is_blank( $t_email ) ) { - email_store( $t_email, $t_subject, $t_message ); + $t_params = array( 'admin_name' => $p_admin_name, 'user_id' => $p_user_id, 'confirm_hash' => $p_confirm_hash ); + email_store( 'email_notification_signup', $t_email, $t_subject, $t_message, null, $t_params ); log_event( LOG_EMAIL, sprintf( 'Signup Email = %s, Hash = %s, User = @U%d', $t_email, $p_confirm_hash, $p_user_id ) ); if( OFF == config_get( 'email_send_using_cronjob' ) ) { @@ -483,7 +484,8 @@ function email_send_confirm_hash_url( $p_user_id, $p_confirm_hash ) { # Send password reset regardless of mail notification prefs # or else users won't be able to receive their reset pws if( !is_blank( $t_email ) ) { - email_store( $t_email, $t_subject, $t_message ); + $t_params = array( 'user_id' => $p_user_id, 'confirm_hash' => $p_confirm_hash ); + email_store( 'email_notification_forgotten_password', $t_email, $t_subject, $t_message, null, $t_params ); log_event( LOG_EMAIL, sprintf( 'Password reset for email = %s', $t_email ) ); if( OFF == config_get( 'email_send_using_cronjob' ) ) { @@ -515,7 +517,7 @@ function email_notify_new_account( $p_username, $p_email ) { $t_message = lang_get( 'new_account_signup_msg' ) . "\n\n" . lang_get( 'new_account_username' ) . ' ' . $p_username . "\n" . lang_get( 'new_account_email' ) . ' ' . $p_email . "\n" . lang_get( 'new_account_IP' ) . ' ' . $_SERVER["REMOTE_ADDR"] . "\n" . $g_path . "\n\n" . lang_get( 'new_account_do_not_reply' ); if( !is_blank( $t_recipient_email ) ) { - email_store( $t_recipient_email, $t_subject, $t_message ); + email_store( 'email_notification_new_account', $t_recipient_email, $t_subject, $t_message ); log_event( LOG_EMAIL, sprintf( 'New Account Notify for email = \'%s\'', $t_recipient_email ) ); if( OFF == config_get( 'email_send_using_cronjob' ) ) { @@ -781,7 +783,7 @@ function email_bug_deleted( $p_bug_id ) { * @param array $p_headers * @return int */ -function email_store( $p_recipient, $p_subject, $p_message, $p_headers = null ) { +function email_store( $p_message_id, $p_recipient, $p_subject, $p_message, $p_headers = null, $p_params = null ) { $t_recipient = trim( $p_recipient ); $t_subject = string_email( trim( $p_subject ) ); $t_message = string_email_links( trim( $p_message ) ); @@ -817,6 +819,8 @@ function email_store( $p_recipient, $p_subject, $p_message, $p_headers = null ) } $t_email_data->metadata['hostname'] = $t_hostname; + $t_email_data = event_signal( 'EVENT_NOTIFY_EMAIL', $t_email_data, array( 'message_id' => $p_message_id, 'params' => $p_params ) ); + $t_email_id = email_queue_add( $t_email_data ); return $t_email_id; @@ -930,7 +934,7 @@ function email_send( $p_email_data ) { break; } - $mail->IsHTML( false ); # set email format to plain text + $mail->IsHTML( isset( $t_email_data->metadata['Content-Type'] ) && stripos( $t_email_data->metadata['Content-Type'], "text/html" ) !== false ); $mail->WordWrap = 80; # set word wrap to 50 characters $mail->Priority = $t_email_data->metadata['priority']; # Urgent = 1, Not Urgent = 5, Disable = 0 $mail->CharSet = $t_email_data->metadata['charset']; @@ -1126,8 +1130,10 @@ function email_bug_reminder( $p_recipients, $p_bug_id, $p_message ) { $t_header = "\n" . lang_get( 'on_date' ) . " $t_date, $t_sender $t_sender_email " . lang_get( 'sent_you_this_reminder_about' ) . ": \n\n"; $t_contents = $t_header . string_get_bug_view_url_with_fqdn( $p_bug_id, $t_recipient ) . " \n\n$p_message"; + $t_params = array( 'message' => $p_message, 'bug_id' => $p_bug_id, 'recipient' => $t_recipient, 'sender' => $t_sender, 'sender_email' => $t_sender_email ); + if( ON == config_get( 'enable_email_notification' ) ) { - email_store( $t_email, $t_subject, $t_contents ); + email_store( 'email_bug_reminder', $t_email, $t_subject, $t_contents, null, $t_params ); } lang_pop(); @@ -1189,7 +1195,7 @@ function email_bug_info_to_one_user( $p_visible_bug_data, $p_message_id, $p_proj } # send mail - $t_ok = email_store( $t_user_email, $t_subject, $t_message, $t_mail_headers ); + $t_ok = email_store( $p_message_id, $t_user_email, $t_subject, $t_message, $t_mail_headers, array_merge( $p_visible_bug_data, array( 'header_optional_params' => $p_header_optional_params ) ) ); return $t_ok; } index: core/events_inc.php =================================================================== --- a/core/events_inc.php +++ b/core/events_inc.php @@ -108,6 +108,7 @@ event_declare_many( array( # Email notification events 'EVENT_NOTIFY_USER_INCLUDE' => EVENT_TYPE_DEFAULT, 'EVENT_NOTIFY_USER_EXCLUDE' => EVENT_TYPE_DEFAULT, + 'EVENT_NOTIFY_EMAIL' => EVENT_TYPE_CHAIN, # Wiki events 'EVENT_WIKI_INIT' => EVENT_TYPE_FIRST, index: docbook/developers/en/event-reference-notify.sgml =================================================================== --- a/docbook/developers/en/event-reference-notify.sgml +++ b/docbook/developers/en/event-reference-notify.sgml @@ -55,4 +55,31 @@ + + Email notification + +
+ EVENT_NOTIFY_EMAIL (Chained) + +
+ + This event allows a plugin to modify an email notification message before it is sent. + + + + Parameters + <Complex>: email message to be sent, EmailData object (see core\email_queue_api.php) + <String>: message type identificator + <Array>: message parameters + + + + + Return Value + <Complex>: email message to be sent, EmailData object + +
+
+ + index: manage_user_update.php =================================================================== --- a/manage_user_update.php +++ b/manage_user_update.php @@ -164,7 +164,7 @@ if ( $f_send_email_notification ) { $t_subject = '[' . config_get( 'window_title' ) . '] ' . lang_get( 'email_user_updated_subject' ); $t_updated_msg = lang_get( 'email_user_updated_msg' ); $t_message = $t_updated_msg . "\n\n" . config_get( 'path' ) . 'account_page.php' . "\n\n" . $t_changes; - email_store( $t_email, $t_subject, $t_message ); + email_store( 'email_notification_user_update', $t_email, $t_subject, $t_message, null, array( 'changes' => $t_changes ) ); log_event( LOG_EMAIL, sprintf( 'Account update notification sent to ' . $f_username . ' (' . $t_email . ')' ) ); if ( config_get( 'email_send_using_cronjob' ) == OFF ) { email_send_all();