From ccf6c925c90cb0859ecd63e48d3f2337476aba8a Mon Sep 17 00:00:00 2001
From: Repellent <aleksprm777@gmail.com>
Date: Sun, 7 Aug 2016 21:59:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 import/excel_reader.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 = "<table class=\"$table_class\" cellspacing=0>";
 		if ($col_letters) {
 			$out .= "<thead>\n\t<tr>";
@@ -596,7 +596,7 @@ class Spreadsheet_Excel_Reader {
 				if ($this->colhidden($i,$sheet)) {
 					$style .= "display:none;";
 				}
-				$out .= "\n\t\t<th style=\"$style\">" . strtoupper($this->colindexes[$i]) . "</th>";
+				$out .= "\n\t\t<th".($styles ? " style=\"$style\"":"").">" . strtoupper($this->colindexes[$i]) . "</th>";
 			}
 			$out .= "</tr></thead>\n";
 		}
@@ -608,7 +608,7 @@ class Spreadsheet_Excel_Reader {
 			if ($this->rowhidden($row,$sheet)) {
 				$style .= "display:none;";
 			}
-			$out .= "\n\t<tr style=\"$style\">";
+			$out .= "\n\t<tr".($styles ? " style=\"$style\"":"").">";
 			if ($row_numbers) {
 				$out .= "\n\t\t<th>$row</th>";
 			}
@@ -628,11 +628,12 @@ class Spreadsheet_Excel_Reader {
 					if ($this->colhidden($col,$sheet)) {
 						$style .= "display:none;";
 					}
-					$out .= "\n\t\t<td style=\"$style\"" . ($colspan > 1?" colspan=$colspan":"") . ($rowspan > 1?" rowspan=$rowspan":"") . ">";
+					$out .= "\n\t\t<td".($styles ? " style=\"$style\"":""). ($colspan > 1?" colspan=$colspan":"") . ($rowspan > 1?" rowspan=$rowspan":"") . ">";
 					$val = $this->val($row,$col,$sheet);
+					$val = ($val===floatval(0) ? '0' : $val);
 					if ($val=='') { $val="&nbsp;"; }
 					else { 
-						$val = htmlentities($val); 
+						$val = htmlentities($val,ENT_QUOTES,$this->_defaultEncoding); 
 						$link = $this->hyperlink($row,$col,$sheet);
 						if ($link!='') {
 							$val = "<a href=\"$link\">$val</a>";