diff --git a/import/excel_reader.php b/import/excel_reader.php index 15e6128..c131fef 100644 --- a/import/excel_reader.php +++ b/import/excel_reader.php @@ -584,7 +584,7 @@ class Spreadsheet_Excel_Reader { // DUMP AN HTML TABLE OF THE ENTIRE XLS DATA // ========================================= - function dump($row_numbers=false,$col_letters=false,$sheet=0,$table_class='excel') { + function dump($row_numbers=false,$col_letters=false,$sheet=0,$table_class='excel',$styles=true) { $out = ""; if ($col_letters) { $out .= "\n\t"; @@ -596,7 +596,7 @@ class Spreadsheet_Excel_Reader { if ($this->colhidden($i,$sheet)) { $style .= "display:none;"; } - $out .= "\n\t\t"; + $out .= "\n\t\t" . strtoupper($this->colindexes[$i]) . ""; } $out .= "\n"; } @@ -608,7 +608,7 @@ class Spreadsheet_Excel_Reader { if ($this->rowhidden($row,$sheet)) { $style .= "display:none;"; } - $out .= "\n\t"; + $out .= "\n\t"; if ($row_numbers) { $out .= "\n\t\t"; } @@ -628,11 +628,12 @@ class Spreadsheet_Excel_Reader { if ($this->colhidden($col,$sheet)) { $style .= "display:none;"; } - $out .= "\n\t\t
" . strtoupper($this->colindexes[$i]) . "
$row 1?" colspan=$colspan":"") . ($rowspan > 1?" rowspan=$rowspan":"") . ">"; + $out .= "\n\t\t 1?" colspan=$colspan":"") . ($rowspan > 1?" rowspan=$rowspan":"") . ">"; $val = $this->val($row,$col,$sheet); + $val = ($val===floatval(0) ? '0' : $val); if ($val=='') { $val=" "; } else { - $val = htmlentities($val); + $val = htmlentities($val,ENT_QUOTES,$this->_defaultEncoding); $link = $this->hyperlink($row,$col,$sheet); if ($link!='') { $val = "$val";