added missing header parameter

2 files changed, 37 insertions, 19 deletions

diff --git a/code_approval.inc b/code_approval.inc
index f3bb2b1..615f3aa 100755
--- a/code_approval.inc
+++ b/code_approval.inc
@@ -253,11 +253,19 @@ function code_approval_form_submit($form, &$form_state)
 	$num_updated = $query->execute();
 
 
-      /* sending email */
+    /* sending email */
       $email_to = $user_data->mail;
-      $param['example_approved']['example_id'] = $ex_data['example_id'];
-      $param['example_approved']['user_id'] = $user_data->uid;
-      if (!drupal_mail('textbook_companion', 'example_approved', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
+      $from = variable_get('textbook_companion_from_email', '');
+      $bcc= variable_get('textbook_companion_emails', '');
+      $cc=variable_get('textbook_companion_cc_emails', '');
+      $params['example_approved']['example_id'] = $ex_data['example_id'];
+      $params['example_approved']['user_id'] = $user_data->uid;
+      $params['example_approved']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+    			'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+    			'Content-Transfer-Encoding' => '8Bit',
+    			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+
+      if (!drupal_mail('textbook_companion', 'example_approved', $email_to, language_default(), $params, $from, TRUE))
         drupal_set_message('Error sending email message.', 'error');
 
     } else if ($ex_data['approved'] == "1") {
@@ -265,11 +273,21 @@ function code_approval_form_submit($form, &$form_state)
       {
         /* sending email */
         $email_to = $user_data->mail;
-        $param['example_disapproved']['example_number'] = $example_data->number;
-        $param['example_disapproved']['example_caption'] = $example_data->caption;
-        $param['example_disapproved']['user_id'] = $user_data->uid;
-        $param['example_disapproved']['message'] = $ex_data['message'];
-        if (!drupal_mail('textbook_companion', 'example_disapproved', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
+	$from = variable_get('textbook_companion_from_email', '');
+      	$bcc= variable_get('textbook_companion_emails', '');
+      	$cc=variable_get('textbook_companion_cc_emails', '');
+	$params['example_disapproved']['preference_id'] = $chapter_data->preference_id;
+	$params['example_disapproved']['chapter_id'] = $example_data->chapter_id;
+        $params['example_disapproved']['example_number'] = $example_data->number;
+        $params['example_disapproved']['example_caption'] = $example_data->caption;
+        $params['example_disapproved']['user_id'] = $user_data->uid;
+        $params['example_disapproved']['message'] = $ex_data['message'];
+	$params['example_disapproved']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
+    			'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+    			'Content-Transfer-Encoding' => '8Bit',
+    			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
+
+        if (!drupal_mail('textbook_companion', 'example_disapproved', $email_to, language_default(), $params, $from, TRUE))
           drupal_set_message('Error sending email message.', 'error');
       } else {
         drupal_set_message('Error disapproving and deleting example. Please contact administrator.', 'error');
@@ -281,6 +299,7 @@ function code_approval_form_submit($form, &$form_state)
 }
 
 
+
 /******************************************************************************/
 /********************************* BULK APPROVAL ******************************/
 /******************************************************************************/
@@ -730,9 +749,9 @@ Reason for dis-approval:
       			if ($email_subject)
       			{
         			$email_to = $user->mail;
-        			$param['standard']['subject'] = $email_subject;
-        			$param['standard']['body'] = $email_body;
-        			if (!drupal_mail('textbook_companion', 'standard', $email_to, language_default(), $param, variable_get('textbook_companion_from_email', NULL), TRUE))
+        			$params['standard']['subject'] = $email_subject;
+        			$params['standard']['body'] = $email_body;
+        			if (!drupal_mail('textbook_companion', 'standard', $email_to, language_default(), $params, variable_get('textbook_companion_from_email', NULL), TRUE))
           				drupal_set_message('Error sending email message.', 'error');
       			}
 
diff --git a/textbook_companion.module b/textbook_companion.module
index bdeb5d8..f51e38e 100755
--- a/textbook_companion.module
+++ b/textbook_companion.module
@@ -1922,7 +1922,7 @@ $query = "
 
 
       $user_data = user_load($params['proposal_received']['user_id']);
- 
+      $message['headers'] = $params['proposal_received']['headers']; 
       $message['subject'] = t('[!site_name] Your book proposal has been received', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
       $message['body'] =array('body' => t('
 Dear !user_name,
@@ -2030,8 +2030,8 @@ Best Wishes,
 	$result = $query->execute();
 	$preference3_data =$result->fetchObject();
 
-      $user_data = user_load($params['proposal_disapproved']['user_id']);
-
+     $user_data = user_load($params['proposal_disapproved']['user_id']);
+     $message['headers'] = $params['proposal_disapproved']['headers'];
      $message['subject'] = t('[!site_name] Your book proposal has been disapproved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
     if($proposal_data->proposal_type != 1){
       $message['body']  =array('body' => t('
@@ -2332,8 +2332,7 @@ Best Wishes,
 
       $user_data = user_load($params['proposal_completed']['user_id']);
       $message['headers'] = $params['proposal_completed']['headers'];
-
-       $message['subject'] = t('[!site_name] Congratulations for completion of the book.', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
+      $message['subject'] = t('[!site_name] Congratulations for completion of the book.', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
       $message['body'] =array('body' => t('
 Dear !user_name,
 
@@ -2499,7 +2498,7 @@ Best Wishes,
 
     case 'example_approved':
        // bcc to textbook_companion_emails
-      $message['headers'] += $tbc_bcc_emails;
+      //$message['headers'] += $tbc_bcc_emails;
 
       /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE id = %d LIMIT 1", $params['example_approved']['example_id']);
       $example_data = db_fetch_object($example_q);*/
@@ -2513,7 +2512,7 @@ Best Wishes,
 
 
       $user_data = user_load($params['example_approved']['user_id']);
-
+      $message['headers'] = $params['example_approved']['headers'];
       $message['subject'] = t('[!site_name] Your uploaded example has been approved', array('!site_name' => variable_get('site_name', '')), array('language' => $language->language));
       $message['body'] =array('body' => t('
 Dear !user_name,