diff --git a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc index 275295b386..f36456f5d3 100644 --- a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc +++ b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc @@ -180,7 +180,7 @@ function boincteam_create_form_submit($form, &$form_state) { } else { drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT))); - rules_invoke_event('boincteam_create_team_error', $values['name']); + rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', '')); watchdog('BOINC team', 'BOINC teams cannot be created for an unknown reason.', 'error'); return FALSE; @@ -215,7 +215,7 @@ function boincteam_create_form_submit($form, &$form_state) { } else { drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT))); - rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name']); + rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', '')); watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams cannot be created.', 'error'); } diff --git a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.rules.inc b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.rules.inc index 76a0cc1641..2218153333 100644 --- a/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.rules.inc +++ b/drupal/sites/default/boinc/modules/boincteam/includes/boincteam.rules.inc @@ -40,5 +40,15 @@ function rules_events_hook_boincteam_arguments() { 'label' => 'team name', 'required' => TRUE, ), - ) + rules_events_global_user_argument(); + ) + rules_events_hook_boincteam_adminnotify_argument(); } + +function rules_events_hook_boincteam_adminnotify_argument() { + return array( + 'subject_tag' => array( + 'type' => 'string', + 'label' => 'Subject tag for email filtering', + 'required' => TRUE, + ), + ) + rules_events_global_user_argument(); +} \ No newline at end of file