summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xabstract_bulk_approval.inc38
-rwxr-xr-xemail.inc36
2 files changed, 37 insertions, 37 deletions
diff --git a/abstract_bulk_approval.inc b/abstract_bulk_approval.inc
index 5a56682..f05693e 100755
--- a/abstract_bulk_approval.inc
+++ b/abstract_bulk_approval.inc
@@ -132,7 +132,7 @@ function dwsim_flowsheet_abstract_bulk_approval_form_submit($form, &$form_state)
$email_body = array(
0 => t('
-Dear !user_name,
+Dear ' . $user_info->contributor_name . ',
Congratulations!
Your DWSIM flowsheet and abstract with the following details have been approved.
@@ -148,8 +148,8 @@ Note: It will take upto 30 days from the time we receive your forms, to process
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
))
@@ -202,7 +202,7 @@ FOSSEE,IIT Bombay', array(
$email_body = array(
0 => t('
-Dear !user_name,
+Dear ' . $user_info->contributor_name . ',
Your all the uploaded flowsheeting project with Title : ' . $user_info->project_title . ' have been marked as pending to be reviewed.
@@ -210,8 +210,8 @@ You will be able to see the flowsheeting project after approved by one of our re
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
))
@@ -259,23 +259,23 @@ FOSSEE,IIT Bombay', array(
$email_body = array(
0 => t('
- Dear !user_name,
+Dear ' . $user_info->contributor_name . ',
- We regret to inform you that your DWSIM flowsheet and abstract with the following details have been disapproved:
+We regret to inform you that your DWSIM flowsheet and abstract with the following details have been disapproved:
- Full Name: ' . $user_info->name_title . ' ' . $user_info->contributor_name . '
- Project Title: ' . $user_info->project_title . '
- Name of compound for which process development is carried out : ' . $user_info->process_development_compound_name . '
- Reason for dis-approval: ' . $form_state['values']['message'] . '
+Full Name: ' . $user_info->name_title . ' ' . $user_info->contributor_name . '
+Project Title: ' . $user_info->project_title . '
+Name of compound for which process development is carried out : ' . $user_info->process_development_compound_name . '
+Reason for dis-approval: ' . $form_state['values']['message'] . '
- Best Wishes,
+Best Wishes,
- !site_name Team,
- FOSSEE,IIT Bombay', array(
- '!site_name' => variable_get('site_name', ''),
- '!user_name' => $user_data->name
- ))
- );
+!site_name Team
+FOSSEE, IIT Bombay', array(
+ '!site_name' => variable_get('site_name', ''),
+ '!user_name' => $user_data->name
+ ))
+ );
$email_to = $user_data->mail;
$from = variable_get('dwsim_flowsheet_from_email', '');
$bcc = variable_get('dwsim_flowsheet_emails', '');
diff --git a/email.inc b/email.inc
index da04468..64b7a8f 100755
--- a/email.inc
+++ b/email.inc
@@ -43,7 +43,7 @@ function dwsim_flowsheet_mail($key, &$message, $params)
));
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
Thank you for submitting proposal for the DWSIM Flowsheeting Project. The details of your proposal are as below.
@@ -59,8 +59,8 @@ Your proposal is under review. You will be notified via email about the approval
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(
@@ -101,7 +101,7 @@ FOSSEE,IIT Bombay', array(
));
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
We regret to inform you that your DWSIM Flowsheeting Project proposal with following details have been disapproved.
@@ -117,8 +117,8 @@ Thank you for participating in the DWSIM Flowsheeting Project. You are welcome t
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(
@@ -159,7 +159,7 @@ FOSSEE,IIT Bombay', array(
));
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
Congratulations! Your proposal for DWSIM Flowsheeting Project with the following details is approved.
@@ -173,8 +173,8 @@ You can upload your abstract using abstract submission interface.
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(
@@ -214,7 +214,7 @@ FOSSEE,IIT Bombay', array(
));
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
Your DWSIM flowsheet and abstract on the following process have been published successfully.
@@ -231,8 +231,8 @@ Thank you for participating in the DWSIM Flowsheeting Project. You are welcome t
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(
@@ -273,7 +273,7 @@ FOSSEE,IIT Bombay', array(
));
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
Your DWSIM Flowsheeting Project proposal with the following details has been deleted :
@@ -300,8 +300,8 @@ You can propose a new flowsheet project.
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(
@@ -327,7 +327,7 @@ FOSSEE,IIT Bombay', array(
$message['headers'] = $params['abstract_uploaded']['headers'];
$message['body'] = array(
'body' => t('
-Dear !user_name,
+Dear ' . $proposal_data->contributor_name . ',
You have successfully uploaded your DWSIM flowsheet and abstract with the following details.
@@ -339,8 +339,8 @@ You shall be notified via email after the flowsheet and abstract are reviewed an
Best Wishes,
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
'!site_name' => variable_get('site_name', ''),
'!user_name' => $user_data->name
), array(