tidy ups

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
@@ -710,6 +711,8 @@ function booking_csv_report() {
   $delimiter_esc = preg_quote($delimiter, '/');
   $enclosure_esc = preg_quote($enclosure, '/');	
   $readinggroup_id = "";
+
+  module_load_include('php', 'booking', 'libraries/xlsxwriter.class');  
   
   //$readinggroup = "session" . variable_get('booking_readinggroup_id','7');
         
@@ -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