diff --git a/booking.emails.inc b/booking.emails.inc index 1b68cb5..87de08e 100644 --- a/booking.emails.inc +++ b/booking.emails.inc @@ -247,6 +247,7 @@ function _booking_custom_email($nid, $email_type, $sender = 'contact') $language = user_preferred_language($user); if ($sender == 'contact') { + watchdog('booking', 'Sending a custom email from the contact email address.'); //calculate the drupal variables to use $email_subject_variable = 'booking_email_subject_' . $email_type; $email_body_variable = 'booking_email_' . $email_type; @@ -255,9 +256,12 @@ function _booking_custom_email($nid, $email_type, $sender = 'contact') '!email' => variable_get('booking_contact_email', variable_get('site_mail', ini_get('sendmail_from'))) )); } elseif ($sender == 'logistics') { + //watchdog('booking', 'Sending a custom email from the logistics email address.'); //calculate the drupal variables to use $email_subject_variable = 'booking_email_logistics_subject_' . $email_type; $email_body_variable = 'booking_email_logistics_' . $email_type; + watchdog('booking_debug', "
Custom logistics email\n@subject\n@body
", + array('@subject' => $email_subject_variable, '@body' => $email_body_variable)); //calculate the from email address for a logistics email $from = t('!event Registrations ', array('!event' => $event->booking_eventname, '!email' => variable_get('booking_logistics_email', variable_get('site_mail', ini_get('sendmail_from'))) diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc index 705444b..1b0035e 100644 --- a/booking.emails_admin.inc +++ b/booking.emails_admin.inc @@ -243,7 +243,7 @@ function booking_emails_admin() { '#title' => t('Subject line for Logistics Custom Email ' . $i), '#size' => 150, '#maxlength' => 300, - '#default_value' => variable_get($subject_fieldname,'[booking:eventname]'), + '#default_value' => variable_get($subject_fieldname,'[booking:eventname] Logistics'), ); $form['custom-logistics-emails'][$body_fieldname] = array( '#title' => t('Email text for Logistics Custom Email ' . $i), @@ -383,15 +383,14 @@ function booking_manual_email_form($form, &$form_state, $input_option = "") //'#multiple' => TRUE, '#header' => $header, '#options' => $options, - //'#default_value' => array("1814" => TRUE), '#default_value' => $values, '#empty' => t('No attendees found.'), '#attributes' => array('id' => 'sort-table'), '#prefix' => '
', '#suffix' => '
', ); - watchdog('booking_debug', "
Manual email form default values\n@info
", array('@info' => print_r( $values, true))); - watchdog('booking_debug', "
Manual email form table\n@info
", array('@info' => print_r( $form['table'], true))); + //watchdog('booking_debug', "
Manual email form default values\n@info
", array('@info' => print_r( $values, true))); + //watchdog('booking_debug', "
Manual email form table\n@info
", array('@info' => print_r( $form['table'], true))); $form['submit'] = array ( '#type' => 'submit',