diff --git a/booking.variety_admin.inc b/booking.variety_admin.inc
index 1453f9b..eb5eebe 100644
--- a/booking.variety_admin.inc
+++ b/booking.variety_admin.inc
@@ -600,6 +600,10 @@ function booking_varietysessions_csv_report($timeslot_id) {
$column_headings[] = array($heading => 'string');
}
+ watchdog('booking_debug', "
Variety session spreadsheet columns\n@info
",
+ array('@info' => print_r( $column_headings, true)));
+
+
// Calculate each row based on column headings
for ($i = 0; $i < max($maximums); $i++) {
$output = array();
diff --git a/libraries/xlsxwriter_plus.class.php b/libraries/xlsxwriter_plus.class.php
deleted file mode 100644
index 31a0978..0000000
--- a/libraries/xlsxwriter_plus.class.php
+++ /dev/null
@@ -1,651 +0,0 @@
-author=$author; }
- public function setFontName($defaultFontName) { $this->defaultFontName=$defaultFontName; }
- public function setFontSize($defaultFontSize) { $this->defaultFontSize=$defaultFontSize; }
- public function setWrapText($defaultWrapText) { $this->defaultWrapText=$defaultWrapText; }
- public function setVerticalAlign($defaultVerticalAlign) { $this->defaultVerticalAlign=$defaultVerticalAlign; }
- public function setHorizontalAlign($defaultHorizontalAlign) { $this->defaultHorizontalAlign=$defaultHorizontalAlign; }
- private function setStyle($defaultStyle) { $this->defaultStyle=$defaultStyle; }
- public function setStartRow($defaultStartRow) { $this->defaultStartRow=($defaultStartRow > 0) ? ((int)$defaultStartRow - 1) : 0; }
- public function setStartCol($defaultStartCol) { $this->defaultStartCol=($defaultStartCol > 0) ? ((int)$defaultStartCol - 1) : 0; }
-
- public function __destruct()
- {
- if (!empty($this->temp_files)) {
- foreach($this->temp_files as $temp_file) {
- @unlink($temp_file);
- }
- }
- }
-
- protected function tempFilename()
- {
- $filename = tempnam("/tmp", "xlsx_writer_");
- $this->temp_files[] = $filename;
- return $filename;
- }
-
- public function writeToStdOut()
- {
- $temp_file = $this->tempFilename();
- self::writeToFile($temp_file);
- readfile($temp_file);
- }
-
- public function writeToString()
- {
- $temp_file = $this->tempFilename();
- self::writeToFile($temp_file);
- $string = file_get_contents($temp_file);
- return $string;
- }
-
- public function sanitize_filename($filename) //http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
- {
- $nonprinting = array_map('chr', range(0,31));
- $invalid_chars = array('<', '>', '?', '"', ':', '|', '\\', '/', '*', '&');
- $all_invalids = array_merge($nonprinting,$invalid_chars);
- return str_replace($all_invalids, "", $filename);
- }
- //------------------------------------------------------------------
- public function sanitize_sheetname($sheetname)
- {
- static $badchars = '\\/?*:[]';
- static $goodchars = ' ';
- $sheetname = strtr($sheetname, $badchars, $goodchars);
- $sheetname = substr($sheetname, 0, 31);
- $sheetname = trim(trim(trim($sheetname),"'"));//trim before and after trimming single quotes
- return !empty($sheetname) ? $sheetname : 'Sheet'.((rand()%900)+100);
- }
-
- public function writeToFile($filename)
- {
- @unlink($filename);//if the zip already exists, overwrite it
- $zip = new ZipArchive();
- if (empty($this->sheets_meta)) { self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined."); return; }
- if (!$zip->open($filename, ZipArchive::CREATE)) { self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip."); return; }
-
- $zip->addEmptyDir("docProps/");
- $zip->addFromString("docProps/app.xml" , self::buildAppXML() );
- $zip->addFromString("docProps/core.xml", self::buildCoreXML());
-
- $zip->addEmptyDir("_rels/");
- $zip->addFromString("_rels/.rels", self::buildRelationshipsXML());
-
- $zip->addEmptyDir("xl/worksheets/");
- foreach($this->sheets_meta as $sheet_meta) {
- $zip->addFile($sheet_meta['filename'], "xl/worksheets/".$sheet_meta['xmlname'] );
- }
- if (!empty($this->shared_strings)) {
- $zip->addFile($this->writeSharedStringsXML(), "xl/sharedStrings.xml" ); //$zip->addFromString("xl/sharedStrings.xml", self::buildSharedStringsXML() );
- }
- $zip->addFromString("xl/workbook.xml" , self::buildWorkbookXML() );
- $zip->addFile($this->writeStylesXML(), "xl/styles.xml" ); //$zip->addFromString("xl/styles.xml" , self::buildStylesXML() );
- $zip->addFromString("[Content_Types].xml" , self::buildContentTypesXML() );
-
- $zip->addEmptyDir("xl/_rels/");
- $zip->addFromString("xl/_rels/workbook.xml.rels", self::buildWorkbookRelsXML() );
- $zip->close();
- }
-
-
- public function writeSheet(array $data, $sheet_name='', array $header_types=array(), array $styles )
- {
- for ($i = 0; $i < count($styles); $i++) {
- $styles[$i] += array('sheet' => $sheet_name);
- }
- $this->setStyle(array_merge((array)$this->defaultStyle, (array)$styles));
-
- $data = empty($data) ? array( array('') ) : $data;
-
- $sheet_filename = $this->tempFilename();
- $sheet_default = 'Sheet'.(count($this->sheets_meta)+1);
- $sheet_name = !empty($sheet_name) ? $sheet_name : $sheet_default;
- $this->sheets_meta[] = array('filename'=>$sheet_filename, 'sheetname'=>$sheet_name ,'xmlname'=>strtolower($sheet_default).".xml" );
-
- $header_offset = empty($header_types) ? 0 : $this->defaultStartRow + 1;
- $row_count = count($data) + $header_offset;
- $column_count = count($data[self::array_first_key($data)]);
- $max_cell = self::xlsCell( $row_count-1, $column_count-1 );
-
- $tabselected = count($this->sheets_meta)==1 ? 'true' : 'false';//only first sheet is selected
- $cell_formats_arr = empty($header_types) ? array_fill(0, $column_count, 'string') : array_values($header_types);
- $header_row = empty($header_types) ? array() : array_keys($header_types);
-
- $fd = fopen($sheet_filename, "w+");
- if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
-
- fwrite($fd,''."\n");
- fwrite($fd,'');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- if (!empty($header_row))
- {
- fwrite($fd, '');
- foreach($header_row as $k=>$v)
- {
- $this->writeCell($fd, $this->defaultStartRow + 0, $this->defaultStartCol + $k, $v, $sheet_name);
- }
- fwrite($fd, '
');
- }
- foreach($data as $i=>$row)
- {
- fwrite($fd, '');
- foreach($row as $k=>$v)
- {
- $this->writeCell($fd, $i+$header_offset, $this->defaultStartCol + $k, $v, $sheet_name);
- }
- fwrite($fd, '
');
- }
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '&C&"Times New Roman,Regular"&12&A');
- fwrite($fd, '&C&"Times New Roman,Regular"&12Page &P');
- fwrite($fd, '');
- fwrite($fd,'');
- fclose($fd);
- }
-
- protected function writeCell($fd, $row_number, $column_number, $value, $sheet_name)
- {
- $cell = self::xlsCell($row_number, $column_number);
- $s = '0';
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $key => $style) {
- if (isset($style['sheet'])) {
- if ($style['sheet'] == $sheet_name) {
- if (isset($style['allfilleddata'])) {
- $s = $key + 1;
- } else {
- if (isset($style['columns'])) {
- if (is_array($style['columns'])) {
- if (in_array($column_number, $style['columns'])) $s = $key + 1;
- } else {
- if ($column_number == $style['columns']) $s = $key + 1;
- }
- } elseif (isset($style['rows'])) {
- if (is_array($style['rows'])) {
- if (in_array($row_number, $style['rows'])) $s = $key + 1;
- } else {
- if ($row_number == $style['rows']) $s = $key + 1;
- }
- } elseif (isset($style['cells'])) {
- if (is_array($style['cells'])) {
- if (in_array($cell, $style['cells'])) $s = $key + 1;
- } else {
- if ($cell == $style['cells']) $s = $key + 1;
- }
- }
- }
- }
- }
- }
- }
- if (is_numeric($value)) {
- fwrite($fd,''.($value*1).'');//int,float, etc
- } else if ($cell_format=='date') {
- fwrite($fd,''.intval(self::convert_date_time($value)).'');
- } else if ($cell_format=='datetime') {
- fwrite($fd,''.self::convert_date_time($value).'');
- } else if ($value==''){
- fwrite($fd,'');
- } else if ($value{0}=='='){
- fwrite($fd,''.self::xmlspecialchars($value).'');
- } else if ($value!==''){
- fwrite($fd,''.self::xmlspecialchars($this->setSharedString($value)).'');
- }
- }
-
- protected function writeStylesXML()
- {
- $tempfile = $this->tempFilename();
- $fd = fopen($tempfile, "w+");
- if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
- fwrite($fd, ''."\n");
- fwrite($fd, '');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['font'])) $this->fontsCount++;
- }
- }
- }
- fwrite($fd, '');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- if ($this->defaultFontName == 'MS Sans Serif') {
- fwrite($fd, ' ');
- } else if ($this->defaultFontName == 'Calibri') {
- fwrite($fd, ' ');
- } else {
- fwrite($fd, ' ');
- }
- fwrite($fd, ' ');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['font'])) {
- if (isset($style['font']['name'])) $this->fontName = $style['font']['name'];
- if (isset($style['font']['size'])) $this->fontSize = $style['font']['size'];
- if (isset($style['font']['color'])) $this->fontColor = $style['font']['color'];
- if ($style['font']['bold']) $this->fontStyles .= '';
- if ($style['font']['italic']) $this->fontStyles .= '';
- if ($style['font']['underline']) $this->fontStyles .= '';
-
- fwrite($fd, ' ');
- if ($this->fontStyles) fwrite($fd, ' '.$this->fontStyles);
- fwrite($fd, ' ');
- if ($this->fontColor) {
- fwrite($fd, ' ');
- } else {
- fwrite($fd, ' ');
- }
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- if ($this->fontName == 'MS Sans Serif') {
- fwrite($fd, ' ');
- } else if ($this->fontName == 'Calibri') {
- fwrite($fd, ' ');
- } else {
- fwrite($fd, ' ');
- }
- fwrite($fd, ' ');
- }
- $this->fontStyles = '';
- }
- }
- }
- fwrite($fd, '');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['fill'])) $this->fillsCount++;
- }
- }
- }
- fwrite($fd, '');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['fill'])) {
- if (isset($style['fill']['color'])) $this->fillColor = $style['fill']['color'];
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- }
- }
- }
- }
- fwrite($fd, '');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['border'])) $this->bordersCount++;
- }
- }
- }
- fwrite($fd, '');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['border'])) {
- if (isset($style['border']['style'])) $this->bordersStyle = ' style="'.$style['border']['style'].'"';
- if (isset($style['border']['color'])) $this->bordersColor = '';
- fwrite($fd, ' ');
- fwrite($fd, ' bordersStyle.'>'.$this->bordersColor.'');
- fwrite($fd, ' bordersStyle.'>'.$this->bordersColor.'');
- fwrite($fd, ' bordersStyle.'>'.$this->bordersColor.'');
- fwrite($fd, ' bordersStyle.'>'.$this->bordersColor.'');
- fwrite($fd, ' ');
- fwrite($fd, ' ');
- }
- }
- }
- }
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- $this->stylesCount += count($this->defaultStyle);
- fwrite($fd, '');
- $this->defaultWrapText = ($this->defaultWrapText) ? '1' : '0';
- fwrite($fd, '');
- if ($this->defaultStyle) {
- foreach ($this->defaultStyle as $style) {
- if (isset($style['sheet'])) {
- if (isset($style['font'])) {
- $font_Id = $this->fontId += 1;
- } else {
- $font_Id = 0;
- }
- if (isset($style['fill'])) {
- $fill_Id = $this->fillId += 1;
- } else {
- $fill_Id = 0;
- }
- if (isset($style['border'])) {
- $border_Id = $this->borderId += 1;
- } else {
- $border_Id = 0;
- }
- if (isset($style['wrapText'])) {
- $wrapText = ($style['wrapText']) ? '1' : '0';
- } else {
- $wrapText = $this->defaultWrapText;
- }
-
- $format_Id = (isset($style['format'])) ? $style['format'] : '0';
-
- if (isset($style['verticalAlign'])) {
- $verticalAlign = $style['verticalAlign'];
- } else {
- $verticalAlign = $this->defaultVerticalAlign;
- }
- if (isset($style['horizontalAlign'])) {
- $horizontalAlign = $style['horizontalAlign'];
- } else {
- $horizontalAlign = $this->defaultHorizontalAlign;
- }
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- }
- }
- }
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fwrite($fd, '');
- fclose($fd);
- return $tempfile;
- }
-
- protected function setSharedString($v)
- {
- if (isset($this->shared_strings[$v]))
- {
- $string_value = $this->shared_strings[$v];
- }
- else
- {
- $string_value = count($this->shared_strings);
- $this->shared_strings[$v] = $string_value;
- }
- $this->shared_string_count++;//non-unique count
- return $string_value;
- }
-
- protected function writeSharedStringsXML()
- {
- $tempfile = $this->tempFilename();
- $fd = fopen($tempfile, "w+");
- if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
-
- fwrite($fd,''."\n");
- fwrite($fd,'');
- foreach($this->shared_strings as $s=>$c)
- {
- fwrite($fd,''.self::xmlspecialchars($s).'');
- }
- fwrite($fd, '');
- fclose($fd);
- return $tempfile;
- }
-
- protected function buildAppXML()
- {
- $app_xml="";
- $app_xml.=''."\n";
- $app_xml.='0';
- return $app_xml;
- }
-
- protected function buildCoreXML()
- {
- $core_xml="";
- $core_xml.=''."\n";
- $core_xml.='';
- $core_xml.=''.date("Y-m-d\TH:i:s.00\Z").'';//$date_time = '2013-07-25T15:54:37.00Z';
- $core_xml.=''.self::xmlspecialchars($this->author).'';
- $core_xml.='0';
- $core_xml.='';
- return $core_xml;
- }
-
- protected function buildRelationshipsXML()
- {
- $rels_xml="";
- $rels_xml.=''."\n";
- $rels_xml.='';
- $rels_xml.='';
- $rels_xml.='';
- $rels_xml.='';
- $rels_xml.="\n";
- $rels_xml.='';
- return $rels_xml;
- }
-
- protected function buildWorkbookXML()
- {
- $workbook_xml="";
- $workbook_xml.=''."\n";
- $workbook_xml.='';
- $workbook_xml.='';
- $workbook_xml.='';
- $workbook_xml.='';
- foreach($this->sheets_meta as $i=>$sheet_meta) {
- $workbook_xml.='';
- }
- $workbook_xml.='';
- $workbook_xml.='';
- return $workbook_xml;
- }
-
- protected function buildWorkbookRelsXML()
- {
- $wkbkrels_xml="";
- $wkbkrels_xml.=''."\n";
- $wkbkrels_xml.='';
- $wkbkrels_xml.='';
- foreach($this->sheets_meta as $i=>$sheet_meta) {
- $wkbkrels_xml.='';
- }
- if (!empty($this->shared_strings)) {
- $wkbkrels_xml.='';
- }
- $wkbkrels_xml.="\n";
- $wkbkrels_xml.='';
- return $wkbkrels_xml;
- }
-
- protected function buildContentTypesXML()
- {
- $content_types_xml="";
- $content_types_xml.=''."\n";
- $content_types_xml.='';
- $content_types_xml.='';
- $content_types_xml.='';
- foreach($this->sheets_meta as $i=>$sheet_meta) {
- $content_types_xml.='';
- }
- if (!empty($this->shared_strings)) {
- $content_types_xml.='';
- }
- $content_types_xml.='';
- $content_types_xml.='';
- $content_types_xml.='';
- $content_types_xml.='';
- $content_types_xml.="\n";
- $content_types_xml.='';
- return $content_types_xml;
- }
-
- //------------------------------------------------------------------
- /*
- * @param $row_number int, zero based
- * @param $column_number int, zero based
- * @return Cell label/coordinates, ex: A1, C3, AA42
- * */
- public static function xlsCell($row_number, $column_number)
- {
- $n = $column_number;
- for($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
- $r = chr($n%26 + 0x41) . $r;
- }
- return $r . ($row_number+1);
- }
- //------------------------------------------------------------------
- public static function log($string)
- {
- file_put_contents("php://stderr", date("Y-m-d H:i:s:").rtrim(is_array($string) ? json_encode($string) : $string)."\n");
- }
- //------------------------------------------------------------------
- public static function xmlspecialchars($val)
- {
- return str_replace("'", "'", htmlspecialchars($val));
- }
- //------------------------------------------------------------------
- public static function array_first_key(array $arr)
- {
- reset($arr);
- $first_key = key($arr);
- return $first_key;
- }
- //------------------------------------------------------------------
- public static function convert_date_time($date_input) //thanks to Excel::Writer::XLSX::Worksheet.pm (perl)
- {
- $days = 0; # Number of days since epoch
- $seconds = 0; # Time expressed as fraction of 24h hours in seconds
- $year=$month=$day=0;
- $hour=$min =$sec=0;
-
- $date_time = $date_input;
- if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches))
- {
- list($junk,$year,$month,$day) = $matches;
- }
- if (preg_match("/(\d{2}):(\d{2}):(\d{2})/", $date_time, $matches))
- {
- list($junk,$hour,$min,$sec) = $matches;
- $seconds = ( $hour * 60 * 60 + $min * 60 + $sec ) / ( 24 * 60 * 60 );
- }
-
- //using 1900 as epoch, not 1904, ignoring 1904 special case
-
- # Special cases for Excel.
- if ("$year-$month-$day"=='1899-12-31') return $seconds ; # Excel 1900 epoch
- if ("$year-$month-$day"=='1900-01-00') return $seconds ; # Excel 1900 epoch
- if ("$year-$month-$day"=='1900-02-29') return 60 + $seconds ; # Excel false leapday
-
- # We calculate the date by calculating the number of days since the epoch
- # and adjust for the number of leap days. We calculate the number of leap
- # days by normalising the year in relation to the epoch. Thus the year 2000
- # becomes 100 for 4 and 100 year leapdays and 400 for 400 year leapdays.
- $epoch = 1900;
- $offset = 0;
- $norm = 300;
- $range = $year - $epoch;
-
- # Set month days and check for leap year.
- $leap = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100)) ) ? 1 : 0;
- $mdays = array( 31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 );
-
- # Some boundary checks
- if($year < $epoch || $year > 9999) return 0;
- if($month < 1 || $month > 12) return 0;
- if($day < 1 || $day > $mdays[ $month - 1 ]) return 0;
-
- # Accumulate the number of days since the epoch.
- $days = $day; # Add days for current month
- $days += array_sum( array_slice($mdays, 0, $month-1 ) ); # Add days for past months
- $days += $range * 365; # Add days for past years
- $days += intval( ( $range ) / 4 ); # Add leapdays
- $days -= intval( ( $range + $offset ) / 100 ); # Subtract 100 year leapdays
- $days += intval( ( $range + $offset + $norm ) / 400 ); # Add 400 year leapdays
- $days -= $leap; # Already counted above
-
- # Adjust for Excel erroneously treating 1900 as a leap year.
- if ($days > 59) { $days++;}
-
- return $days + $seconds;
- }
- //------------------------------------------------------------------
-}
\ No newline at end of file