tidy ups

booking.module

@@ -64,7 +64,7 @@ module_load_include('inc', 'booking', 'booking.studygroups_admin');
 module_load_include('inc', 'booking', 'booking.studygroups_report');
 module_load_include('inc', 'booking', 'booking.studygroup_leaders');
 // Load the include for the travel form
-//module_load_include('inc', 'booking', 'booking.travel');
+module_load_include('inc', 'booking', 'booking.travel');
 // Load the include for managing room bookings and definitions
 module_load_include('inc', 'booking', 'booking.rooms');
 // load the include for mass-allocating people to rooms
@@ -76,7 +76,7 @@ module_load_include('inc', 'booking', 'booking.stripe');
 // Load the include for miscellaneous functions
 module_load_include('inc', 'booking', 'booking.misc');
 // Load the include for the extended mail system
-module_load_include('inc', 'booking', 'booking.MailSystemInterface');
+//module_load_include('inc', 'booking', 'booking.MailSystemInterface');
 
 function booking_init() {
   date_default_timezone_set(date_default_timezone(FALSE)); 

booking.reports.inc

@@ -682,6 +682,7 @@ function booking_waitinglist_page() {
   return $output;
 }
 
+/*
 function ucname($string) {
     $string =ucwords(strtolower($string));
 
@@ -692,7 +693,7 @@ function ucname($string) {
     }
     return $string;
 }
-
+*/
 
 /**
  * Generate a CSV file as a report of all current registrations
@@ -711,6 +712,8 @@ function booking_csv_report() {
   $enclosure_esc = preg_quote($enclosure, '/');	
   $readinggroup_id = "";
 
+  module_load_include('php', 'booking', 'libraries/xlsxwriter.class');  
+  
   //$readinggroup = "session" . variable_get('booking_readinggroup_id','7');
         
   //calculate fields to ignore in the output csv file
@@ -798,7 +801,7 @@ function booking_csv_report() {
       
       //capitalise street name and suburb name
       if ($key == 'booking_street' || $key == 'booking_suburb') {
-        $value = ucname($value);
+        $value = _booking_ucname($value);
       }
       
       //handle dates

booking.variety_admin.inc

@@ -512,7 +512,6 @@ function booking_varietysessions_csv_report($timeslot_id) {
   $data = array();
   $rows = array();
 
-  //include_once("./libraries/xlsxwriter.class.php");
   module_load_include('php', 'booking', 'libraries/xlsxwriter.class');
 
   //verify that $timeslot_id is a number