Loads of changes

This commit is contained in:
2014-02-24 23:53:12 +11:00
parent 66d4c89679
commit b710954bdd
10 changed files with 357 additions and 251 deletions

View File

@@ -114,7 +114,7 @@ function booking_admin() {
$form['misc']['booking_auto_confirm_email'] = array (
'#type' => 'radios',
'#title' => t('Automatic Registration Email'),
'#description' => t('Automatically send a confirmation email when a user registers for an event? (If No, email will be sent when status manually changed from Not Coming to Paid).'),
'#description' => t('Automatically send a confirmation email when a user registers for an event? (If No, email will be sent when status manually changed from Not Coming to Paid). Recommended to set this to Yes if "Show on lists once booked in" is set to No.'),
'#options' => array (0 => t('No'), t('Yes')),
'#default_value' => variable_get('booking_auto_confirm_email', 0),
);
@@ -200,7 +200,7 @@ function booking_admin() {
'#default_value' => variable_get('booking_csv_exclude_fields', ''),
'#description' => 'Separate each field with a semi-colon. Field names as per database schema.',
'#size' => 150,
'#maxlength' => 500,
'#maxlength' => 2000,
);
return system_settings_form($form);
}
@@ -340,29 +340,13 @@ function booking_manual_email_submit($form, &$form_state) {
elseif (strpos($form_state['values']['email-type'], 'custom') !== false)
{
watchdog('booking', 'Processing a @custom type email to id @info', array ('@custom' => $form_state['values']['email-type'], '@info' => $key));
_booking_custom_email($key,$form_state['values']['email-type']);
_booking_custom_email($key, $form_state['values']['email-type']);
}
/*
elseif ($form_state['values']['email-type'] == 'custom1')
{
watchdog('booking', 'Processing a custom1 type email to id @info', array ('@info' => $key));
_booking_custom_email($key,$form_state['values']['email-type']);
}
elseif ($form_state['values']['email-type'] == 'custom2')
{
watchdog('booking', 'Processing a custom2 type email to id @info', array ('@info' => $key));
_booking_custom_email($key,$form_state['values']['email-type']);
}
elseif ($form_state['values']['email-type'] == 'custom3')
{
watchdog('booking', 'Processing a custom3 type email to id @info', array ('@info' => $key));
_booking_custom_email($key,$form_state['values']['email-type']);
}
*/
$counter++;
}
}
}
drupal_set_message("Sent manual email for $counter people.", 'status', FALSE);
watchdog('booking', "Sent manual email for $counter people.");
//watchdog('booking', "Sent manual email for $counter people.");
}