drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

debug

Browse Source
This commit is contained in:
Nathan Coad
2016-05-31 18:28:54 +10:00
parent 333cfa38c4
commit e887776ce5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.emails.inc
View File

@@ -247,6 +247,7 @@ function _booking_custom_email($nid, $email_type, $sender = 'contact')
$language = user_preferred_language($user); $language = user_preferred_language($user);
if ($sender == 'contact') { if ($sender == 'contact') {
watchdog('booking', 'Sending a custom email from the contact email address.');
//calculate the drupal variables to use //calculate the drupal variables to use
$email_subject_variable = 'booking_email_subject_' . $email_type; $email_subject_variable = 'booking_email_subject_' . $email_type;
$email_body_variable = 'booking_email_' . $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'))) '!email' => variable_get('booking_contact_email', variable_get('site_mail', ini_get('sendmail_from')))
)); ));
} elseif ($sender == 'logistics') { } elseif ($sender == 'logistics') {
//watchdog('booking', 'Sending a custom email from the logistics email address.');
//calculate the drupal variables to use //calculate the drupal variables to use
$email_subject_variable = 'booking_email_logistics_subject_' . $email_type; $email_subject_variable = 'booking_email_logistics_subject_' . $email_type;
$email_body_variable = 'booking_email_logistics_' . $email_type; $email_body_variable = 'booking_email_logistics_' . $email_type;
watchdog('booking_debug', "<pre>Custom logistics email\n@subject\n@body</pre>",
array('@subject' => $email_subject_variable, '@body' => $email_body_variable));
//calculate the from email address for a logistics email //calculate the from email address for a logistics email
$from = t('!event Registrations <!email>', array('!event' => $event->booking_eventname, $from = t('!event Registrations <!email>', array('!event' => $event->booking_eventname,
'!email' => variable_get('booking_logistics_email', variable_get('site_mail', ini_get('sendmail_from'))) '!email' => variable_get('booking_logistics_email', variable_get('site_mail', ini_get('sendmail_from')))

7
booking.emails_admin.inc
View File

@@ -243,7 +243,7 @@ function booking_emails_admin() {
'#title' => t('Subject line for Logistics Custom Email ' . $i), '#title' => t('Subject line for Logistics Custom Email ' . $i),
'#size' => 150, '#size' => 150,
'#maxlength' => 300, '#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( $form['custom-logistics-emails'][$body_fieldname] = array(
'#title' => t('Email text for Logistics Custom Email ' . $i), '#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, //'#multiple' => TRUE,
'#header' => $header, '#header' => $header,
'#options' => $options, '#options' => $options,
//'#default_value' => array("1814" => TRUE),
'#default_value' => $values, '#default_value' => $values,
'#empty' => t('No attendees found.'), '#empty' => t('No attendees found.'),
'#attributes' => array('id' => 'sort-table'), '#attributes' => array('id' => 'sort-table'),
'#prefix' => '<div id="manual-email-attendees-items">', '#prefix' => '<div id="manual-email-attendees-items">',
'#suffix' => '</div>', '#suffix' => '</div>',
); );
watchdog('booking_debug', "<pre>Manual email form default values\n@info</pre>", array('@info' => print_r( $values, true))); //watchdog('booking_debug', "<pre>Manual email form default values\n@info</pre>", array('@info' => print_r( $values, true)));
watchdog('booking_debug', "<pre>Manual email form table\n@info</pre>", array('@info' => print_r( $form['table'], true))); //watchdog('booking_debug', "<pre>Manual email form table\n@info</pre>", array('@info' => print_r( $form['table'], true)));
$form['submit'] = array ( $form['submit'] = array (
'#type' => 'submit', '#type' => 'submit',