From 4a33fda9bf44a6101e343bb25b1a63f9e7d40dc5 Mon Sep 17 00:00:00 2001 From: Prashant P. Shah Date: Mon, 14 May 2012 13:01:37 +0530 Subject: adds more email templates Signed-off-by: Prashant P. Shah --- code_approval.inc | 4 +- email.inc | 104 +++++++++++++++---------------------------------- upload_code.inc | 10 ++--- upload_code_delete.inc | 8 ++-- 4 files changed, 43 insertions(+), 83 deletions(-) diff --git a/code_approval.inc b/code_approval.inc index 73fdc26..115fa5e 100755 --- a/code_approval.inc +++ b/code_approval.inc @@ -227,7 +227,7 @@ function code_approval_form_submit($form, &$form_state) $email_to = $user_data->mail . ', ' . variable_get('lab_migration_emails', ''); $param['solution_approved']['solution_id'] = $solution_id; $param['solution_approved']['user_id'] = $user_data->uid; - if (!drupal_mail('lab_migration', 'solution_pending', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) + if (!drupal_mail('lab_migration', 'solution_approved', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) drupal_set_message('Error sending email message.', 'error'); } else if ($form_state['values']['approved'] == "2") { if (delete_solution($solution_id)) @@ -236,7 +236,7 @@ function code_approval_form_submit($form, &$form_state) $email_to = $user_data->mail . ', ' . variable_get('lab_migration_emails', ''); $param['solution_disapproved']['experiment_number'] = $experiment_data->number; $param['solution_disapproved']['experiment_title'] = $experiment_data->title; - $param['solution_disapproved']['solution_code_number'] = $solution_data->code_number; + $param['solution_disapproved']['solution_number'] = $solution_data->code_number; $param['solution_disapproved']['solution_caption'] = $solution_data->caption; $param['solution_disapproved']['user_id'] = $user_data->uid; $param['solution_disapproved']['message'] = $form_state['values']['message']; diff --git a/email.inc b/email.inc index 38149a2..c87cc9c 100644 --- a/email.inc +++ b/email.inc @@ -234,118 +234,78 @@ Best Wishes, !site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); break; - case 'example_uploaded': - $example_q = db_query("SELECT * FROM {lab_migration_example} WHERE id = %d LIMIT 1", $params['example_uploaded']['example_id']); - $example_data = db_fetch_object($example_q); - $user_data = user_load($params['example_uploaded']['user_id']); + case 'solution_uploaded': + $solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE id = %d LIMIT 1", $params['solution_uploaded']['solution_id']); + $solution_data = db_fetch_object($solution_q); + $user_data = user_load($params['solution_uploaded']['user_id']); - $message['subject'] = t('[!site_name] You have uploaded example', array('!site_name' => variable_get('site_name', '')), $language->language); + $message['subject'] = t('[!site_name] You have uploaded solution', array('!site_name' => variable_get('site_name', '')), $language->language); $message['body'] = t(' Dear !user_name, -You have uploaded the following example: +You have uploaded the following solution: -Example number : ' . $example_data->number . ' -Caption : ' . $example_data->caption . ' +Example number : ' . $solution_data->code_number . ' +Caption : ' . $solution_data->caption . ' -The example is under review. You will be notified when it has been approved. +The solution is under review. You will be notified when it has been approved. Best Wishes, !site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); break; - case 'example_updated': - $example_q = db_query("SELECT * FROM {lab_migration_example} WHERE id = %d LIMIT 1", $params['example_updated']['example_id']); - $example_data = db_fetch_object($example_q); - $user_data = user_load($params['example_updated']['user_id']); + case 'solution_approved': + $solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE id = %d LIMIT 1", $params['solution_approved']['solution_id']); + $solution_data = db_fetch_object($solution_q); + $user_data = user_load($params['solution_approved']['user_id']); - $message['subject'] = t('[!site_name] You have updated example', array('!site_name' => variable_get('site_name', '')), $language->language); + $message['subject'] = t('[!site_name] Your uploaded solution has been approved', array('!site_name' => variable_get('site_name', '')), $language->language); $message['body'] = t(' Dear !user_name, -You have updated the following example: +Your following solution has been approved: -Example number : ' . $example_data->number . ' -Caption : ' . $example_data->caption . ' - -The example is still under review. You will be notified when it has been approved. - -Best Wishes, - -!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); - break; - - case 'example_updated_admin': - $example_q = db_query("SELECT * FROM {lab_migration_example} WHERE id = %d LIMIT 1", $params['example_updated_admin']['example_id']); - $example_data = db_fetch_object($example_q); - $user_data = user_load($params['example_updated_admin']['user_id']); - - $message['subject'] = t('[!site_name] Reviewer have updated example', array('!site_name' => variable_get('site_name', '')), $language->language); - $message['body'] = t(' -Dear !user_name, - -Reviewer have updated the following example: - -Example number : ' . $example_data->number . ' -Caption : ' . $example_data->caption . ' - -Best Wishes, - -!site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); - break; - - case 'example_approved': - $example_q = db_query("SELECT * FROM {lab_migration_example} WHERE id = %d LIMIT 1", $params['example_approved']['example_id']); - $example_data = db_fetch_object($example_q); - $user_data = user_load($params['example_approved']['user_id']); - - $message['subject'] = t('[!site_name] Your uploaded example has been approved', array('!site_name' => variable_get('site_name', '')), $language->language); - $message['body'] = t(' -Dear !user_name, - -Your following example has been approved: - -Example number : ' . $example_data->number . ' -Caption : ' . $example_data->caption . ' +Solution number : ' . $solution_data->code_number . ' +Caption : ' . $solution_data->caption . ' Best Wishes, !site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); break; - case 'example_disapproved': - $user_data = user_load($params['example_disapproved']['user_id']); + case 'solution_disapproved': + $user_data = user_load($params['solution_disapproved']['user_id']); - $message['subject'] = t('[!site_name] Your uploaded example has been disapproved', array('!site_name' => variable_get('site_name', '')), $language->language); + $message['subject'] = t('[!site_name] Your uploaded solution has been disapproved', array('!site_name' => variable_get('site_name', '')), $language->language); $message['body'] = t(' Dear !user_name, -Your following example has been disapproved: +Your following solution has been disapproved: -Example number : ' . $params['example_disapproved']['example_number'] . ' -Caption : ' . $params['example_disapproved']['example_caption'] . ' +Solution number : ' . $params['solution_disapproved']['solution_number'] . ' +Caption : ' . $params['solution_disapproved']['solution_caption'] . ' -Reason for dis-approval : ' . $params['example_disapproved']['message'] . ' +Reason for dis-approval : ' . $params['solution_disapproved']['message'] . ' Best Wishes, !site_name', array('!site_name' => variable_get('site_name', ''), '!user_name' => $user_data->name), $language->language); break; - case 'example_deleted_user': - $user_data = user_load($params['example_deleted_user']['user_id']); + case 'solution_deleted_user': + $user_data = user_load($params['solution_deleted_user']['user_id']); - $message['subject'] = t('[!site_name] User has deleted pending example', array('!site_name' => variable_get('site_name', '')), $language->language); + $message['subject'] = t('[!site_name] User has deleted pending solution', array('!site_name' => variable_get('site_name', '')), $language->language); $message['body'] = t(' Dear !user_name, -Your following pending example has been deleted : +Your following pending solution has been deleted : -Title of the Book : ' . $params['example_deleted_user']['book_title'] . ' -Title of the Chapter : ' . $params['example_deleted_user']['chapter_title'] . ' -Example number : ' . $params['example_deleted_user']['example_number'] . ' -Caption : ' . $params['example_deleted_user']['example_caption'] . ' +Title of the Lab : ' . $params['solution_deleted_user']['lab_title'] . ' +Title of the Experiment : ' . $params['solution_deleted_user']['experiment_title'] . ' +Solution number : ' . $params['solution_deleted_user']['solution_number'] . ' +Caption : ' . $params['solution_deleted_user']['solution_caption'] . ' Best Wishes, diff --git a/upload_code.inc b/upload_code.inc index bc1e5a6..e4a9eac 100755 --- a/upload_code.inc +++ b/upload_code.inc @@ -14,7 +14,7 @@ function list_experiments() $return_html = '
'; $return_html .= 'Title of the Lab:
' . $proposal_data->lab_title . '

'; $return_html .= 'Proposer Name:
' . $proposal_data->name_title . ' ' . $proposal_data->name . '

'; - $return_html .= l('Upload Example Code', 'lab_migration/code/upload') . '
'; + $return_html .= l('Upload Solution', 'lab_migration/code/upload') . '
'; /* get experiment list */ $experiment_rows = array(); @@ -79,7 +79,7 @@ function upload_code_form($form_state) return; } - /* add javascript for automatic book title, check if example uploaded, dependency selection effects */ + /* add javascript for dependency selection effects */ $dep_selection_js = " $(document).ready(function() { $('#edit-existing-depfile-dep-lab-title').change(function() { var dep_selected = ''; @@ -328,7 +328,7 @@ function upload_code_form_validate($form, &$form_state) } } - /* add javascript again for automatic book title, check if example uploaded, dependency selection effects */ + /* add javascript dependency selection effects */ $dep_selection_js = " $(document).ready(function() { $('#edit-existing-depfile-dep-lab-title').change(function() { var dep_selected = ''; @@ -480,11 +480,11 @@ function upload_code_form_submit($form, &$form_state) { } } } - drupal_set_message('Example uploaded successfully.', 'status'); + drupal_set_message('Solution uploaded successfully.', 'status'); /* sending email */ $email_to = $user->mail . ', ' . variable_get('lab_migration_emails', ''); - $param['solution_uploaded']['solution_id'] = $example_id; + $param['solution_uploaded']['solution_id'] = $solution_id; $param['solution_uploaded']['user_id'] = $user->uid; if (!drupal_mail('lab_migration', 'solution_uploaded', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) drupal_set_message('Error sending email message.', 'error'); diff --git a/upload_code_delete.inc b/upload_code_delete.inc index 5117a1e..2932ae0 100755 --- a/upload_code_delete.inc +++ b/upload_code_delete.inc @@ -52,10 +52,10 @@ function upload_code_delete() /* sending email */ $email_to = $user->mail . ', ' . variable_get('lab_migration_emails', ''); - $param['solution_deleted_user']['book_title'] = $proposal_data->lab_title; - $param['solution_deleted_user']['chapter_title'] = $experiment_data->title; - $param['solution_deleted_user']['example_number'] = $solution_data->number; - $param['solution_deleted_user']['example_caption'] = $solution_data->caption; + $param['solution_deleted_user']['lab_title'] = $proposal_data->lab_title; + $param['solution_deleted_user']['experiment_title'] = $experiment_data->title; + $param['solution_deleted_user']['solution_number'] = $solution_data->code_number; + $param['solution_deleted_user']['solution_caption'] = $solution_data->caption; $param['example_deleted_user']['user_id'] = $user->uid; if (!drupal_mail('lab_migration', 'solution_deleted_user', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE)) -- cgit