Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drupal: Add subject line text to help email filtering. #3085

Merged
merged 1 commit into from
Apr 3, 2019
Merged

Drupal: Add subject line text to help email filtering. #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error from user consenting to terms of use, missing consent type',
'subject' => '[drupal-error] Error from user consenting to terms of use, missing consent type',
'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and the function \'check_consent_type\' returned an error. Consent type [consent_type:string] seems to be generating an error.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -268,7 +268,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error: User attempted to change email address to one used by existing user.',
'subject' => '[drupal-error] User attempted to change email address to one used by existing user.',
'message' => '[user:display-name] with email [user:mail] attempted to change their email to [new_email_addr:string], which is already in use by another user.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -318,7 +318,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error: User attempted to revert to previous email address to one used by existing user.',
'subject' => '[drupal-error] User attempted to revert to previous email address to one used by existing user.',
'message' => '[user:display-name] with email [user:mail] attempted to revert their email to their previous email address, [new_email_addr:string], which is already in use by another user.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -368,7 +368,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error when user trying to delete their account',
'subject' => '[drupal-error] Error when user trying to delete their account',
'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error from \'boincuser_load\'.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -417,7 +417,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error: invalid uid when user trying to delete their account',
'subject' => '[drupal-error] invalid uid when user trying to delete their account',
'message' => 'User [user:display-name], [user:mail], attempted to delete their account. Error is Drupal UID=[user:uid] cannot be located.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -466,7 +466,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error when user attempted to consent to terms of use',
'subject' => '[drupal-error] Error when user attempted to consent to terms of use',
'message' => '[user:display-name], [user:mail], attempted to consent to terms-of-use form and an error was generated from function \'consent_to_a_policy\'.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -515,7 +515,7 @@ function boinc_standard_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Circular host merging error',
'subject' => '[BOINC-error] Circular host merging error',
'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s rpc_seqno is equal to the old_host\'s id.

Information about this host merge attempt:
Expand Down Expand Up @@ -580,7 +580,7 @@ print "Drupal UID: " . $user->uid . "\\n";
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Zombie host merging error',
'subject' => '[BOINC-error] Zombie host merging error',
'message' => 'User tried to merge a host (old_host) into a target host where the target host\'s userid is equal to 0, a zombie host.
I.e., $target_host->userid == 0

Expand Down
4 changes: 2 additions & 2 deletions drupal/sites/all/features/teams/teams.features.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function teams_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error creating new team',
'subject' => '[drupal-error] Error creating new team',
'message' => '[user:display-name] attempted to create team [team_name:string], but an error was returned. See function \'boincteam_create_form_submit\'. BOINC function \'make_team\' did not return a valid boinc_team object.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down Expand Up @@ -106,7 +106,7 @@ function teams_rules_defaults() {
'#type' => 'action',
'#settings' => array(
'from' => '',
'subject' => 'Error creating BOINC team - no pathauo module',
'subject' => '[drupal-error] Error creating BOINC team - no pathauo module',
'message' => '[user:display-name] attempted to create team [team_name:string], but no pathauto module detected. See function \'boincteam_create_form_submit\'.',
'#eval input' => array(
'token_rules_input_evaluator' => array(
Expand Down