Index: publicbookings.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/publicbookings/publicbookings.admin.inc,v retrieving revision 1.15.2.1 diff -u -p -r1.15.2.1 publicbookings.admin.inc --- publicbookings.admin.inc 15 May 2009 12:05:10 -0000 1.15.2.1 +++ publicbookings.admin.inc 15 May 2009 12:40:29 -0000 @@ -432,23 +432,46 @@ function publicbookings_settings_form() '#description' => t('The increments for datetime selectors, in minutes.'), ); - $form['basic']['bookingsapi_using_sql_ts_triggers'] = array( + $form['advanced'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['advanced']['bookingsapi_using_sql_ts_triggers'] = array( '#type' => 'checkbox', '#title' => t('Tables have triggers defined for updating the \'created\' and \'modified\' timestamps.'), '#default_value' => variable_get('bookingsapi_using_sql_ts_triggers', 0), '#description' => t('If checked, the updating of these fields will be delegated entirely to the MySQL triggers.'), ); - $form['basic']['publicbookings_sendmail'] = array( + $form['advanced']['publicbookings_sendmail'] = array( '#type' => 'checkbox', '#title' => t('Whether to require email-verification for new (public) bookings - Highly Recommanded.'), '#default_value' => variable_get('publicbookings_sendmail',true), '#description' => t('If checked, each new public booking requires, that the corresponding mailadress is verified by following a link send in a confirmation email. It is recommanded to leave this checked in order to verify, that mailadresses are correct and bookings serious.'), ); - $form['#validate'] = array( - 'publicbookings_settings_validate' => array() + $form['notify'] = array( + '#type' => 'fieldset', + '#title' => t('Notification settings'), + ); + + $form['notify']['publicbookings_notify'] = array( + '#type' => 'checkbox', + '#title' => t('Notify administrator of new bookings.'), + '#default_value' => variable_get('publicbookings_notify',false), + '#description' => t('If checked, the administrator will get a copy of each email send to a customer (e.g. confirmation mails)'), + ); + $form['notify']['publicbookings_notify_address'] = array( + '#type' => 'textfield', + '#title' => t('Address that will recieve notifications.'), + '#default_value' => variable_get('publicbookings_notify_address',variable_get('site_mail','')), ); + + $form['#validate'][] = 'publicbookings_settings_validate'; + return system_settings_form($form); } @@ -456,9 +479,13 @@ function publicbookings_settings_form() * Settings form validation. */ function publicbookings_settings_validate($form, &$form_state) { - if(!is_numeric($form_state['values']['bookingsapi_time_granularity'])) { + watchdog('foo','
'.print_r($form_state,true).'
'); + if (!is_numeric($form_state['values']['bookingsapi_time_granularity'])) { form_set_error('bookingsapi_time_granularity', t('Must be an integer.')); } + if (isset($form_state['values']['publicbookings_notify_address']) && !valid_email_address($form_state['values']['publicbookings_notify_address'])) { + form_set_error('publicbookings_notify_address', t('Must be a valid email address.')); + } } /** @@ -469,5 +496,7 @@ function publicbookings_settings_submit( variable_set('bookingsapi_time_granularity', (int) $form_state['values']['bookingsapi_time_granularity']); variable_set('bookingsapi_using_sql_ts_triggers', (bool) $form_state['values']['bookingsapi_using_sql_ts_triggers']); variable_set('publicbookings_sendmail', (bool) $form_state['values']['publicbookings_sendmail']); + variable_set('publicbookings_notify', (bool) $form_state['values']['publicbookings_notify']); + variable_set('publicbookings_notify_address', (bool) $form_state['values']['publicbookings_notify_address']); } Index: publicbookings.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/publicbookings/publicbookings.install,v retrieving revision 1.5 diff -u -p -r1.5 publicbookings.install --- publicbookings.install 30 Mar 2009 22:25:49 -0000 1.5 +++ publicbookings.install 15 May 2009 12:43:24 -0000 @@ -23,6 +23,9 @@ function publicbookings_uninstall() { drupal_uninstall_schema('publicbookings'); // delete vars variable_del('publicbookings_enabled'); + variable_del('publicbookings_sendmail'); + variable_del('publicbookings_notify'); + variable_del('publicbookings_notify_address'); } /** Index: publicbookings.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/publicbookings/publicbookings.module,v retrieving revision 1.13.2.3 diff -u -p -r1.13.2.3 publicbookings.module --- publicbookings.module 15 May 2009 12:05:10 -0000 1.13.2.3 +++ publicbookings.module 15 May 2009 12:45:00 -0000 @@ -516,6 +516,10 @@ function publicbookings_booking_save(&$v function _publicbookings_send_mail($key, $email, $values) { drupal_mail('publicbookings', $key, $email, language_default(), $values, NULL, TRUE); + if (variable_get('publicbookings_notify',false) + && valid_email_address(variable_get('publicbookings_notify_address',''))) { + drupal_mail('publicbookings', $key, variable_get('publicbookings_notify_address',''), language_default(), $values, NULL, TRUE); + } } function publicbookings_generate_passphrase($length) { Index: publicbookings.public.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/publicbookings/publicbookings.public.inc,v retrieving revision 1.7.2.1 diff -u -p -r1.7.2.1 publicbookings.public.inc --- publicbookings.public.inc 15 May 2009 12:05:10 -0000 1.7.2.1 +++ publicbookings.public.inc 15 May 2009 12:46:12 -0000 @@ -243,7 +243,7 @@ function publicbookings_confirm($passphr 'start'=>$client['start'], 'end'=>$client['end'], ); - drupal_mail('publicbookings', 'request_pending', $client['email'], language_default(), $values, NULL, TRUE); + _publicbookings_send_mail('request_pending', $client['email'], $values); return '

'.t('Your email has been verified. Your booking request is now pending review by a booking manager. You will be informed of any status changes by email').'

'; }