Added PHP Datetime object values in a cells

added multisheet support (keeping it compatible to the original version)

.gitignore

@@ -1 +1,3 @@
-vendor*
+vendor*
+/books.fw.png
+/datatypes.fw.png

README.md

@@ -1,10 +1,10 @@
-# SimpleXLSXGen class 0.9.15 (Official)
+# SimpleXLSXGen class 0.9.25 (Official)
 [<img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.herokuapp.com%2Fshuchkin" />](https://www.patreon.com/shuchkin) [<img src="https://img.shields.io/github/license/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/blob/master/license.md) [<img src="https://img.shields.io/github/stars/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/stargazers) [<img src="https://img.shields.io/github/forks/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/network) [<img src="https://img.shields.io/github/issues/shuchkin/simplexlsxgen" />](https://github.com/shuchkin/simplexlsxgen/issues)
 
 Export data to Excel XLSX file. PHP XLSX generator. No external tools and libraries.<br/>
 (!) XLSX reader [here](https://github.com/shuchkin/simplexlsx).  
 
-**Sergey Shuchkin** <sergey.shuchkin@gmail.com> 2020<br/>
+**Sergey Shuchkin** <sergey.shuchkin@gmail.com> 2020-2021<br/>
 
 *Hey, bro, please ★ the package for my motivation :)* 
 
@@ -16,12 +16,9 @@ $books = [
     [908606664, 'Slinky Malinki', 'Lynley Dodd', 'Mallinson Rendel', 'NZ']
 ];
 $xlsx = SimpleXLSXGen::fromArray( $books );
-$xlsx->saveAs('books.xlsx');
+$xlsx->saveAs('books.xlsx'); // or downloadAs('books.xlsx')
 ```
 ![XLSX screenshot](books.png)
-```
-// SimpleXLSXGen::download() or SimpleXSLSXGen::downloadAs('table.xlsx');
-```
 
 ## Installation
 The recommended way to install this library is [through Composer](https://getcomposer.org).
@@ -39,15 +36,30 @@ or download class [here](https://github.com/shuchkin/simplexlsxgen/blob/master/s
 $data = [
     ['Integer', 123],
     ['Float', 12.35],
-    ['Procent', '12%'],
-    ['Date','2020-05-20'],
+    ['Percent', '12%'],
     ['Datetime', '2020-05-20 02:38:00'],
-    ['String', 'See SimpleXLSXGen column autosize feature']
+    ['Date','2020-05-20'],
+    ['Time','02:38:00'],
+    ['Datetime PHP', new DateTime('2021-02-06 21:07:00')],
+    ['String', 'Long UTF-8 String in autoresized column'],
+    ['RAW string', "\0".'2020-10-04 16:02:00']
 ];
 SimpleXLSXGen::fromArray( $data )->saveAs('datatypes.xlsx');
 ```
 ![XLSX screenshot](datatypes.png)
-
+### Fluid examples
+```php
+SimpleXLSXGen::fromArray( $books )->downloadAs('table.xlsx'); // output to browser for download
+SimpleXLSXGen::fromArray( $books )->addSheet( $books2 )->download(); // multiple sheets
+(new SimpleXLSXGen)->addSheet( $books, 'Modern style')->save();
+```
+### Old school, multiple sheets
+```php
+$xlsx = new SimpleXLSXGen();
+$xlsx->addSheet( $books, 'Catalog 2021' );
+$xlsx->addSheet( $books2, 'Stephen King catalog');
+$xlsx->downloadAs('books_2021.xlsx');
+```
 ### Debug
 ```php
 ini_set('error_reporting', E_ALL );
@@ -61,6 +73,16 @@ SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
 
 
 ## History
+v0.9.25 (2021-02-26) Added PHP Datetime object values in a cells
+v0.9.24 (2021-02-26) * Percent<br/>
+v0.9.23 (2021-01-25) Fix local floats in XML<br/>
+v0.9.22 (2020-11-04) Added multiple sheets support, thx [Savino59](https://github.com/Savino59), class ready for extend now<br/> 
+v0.9.21 (2020-10-17) Updated images<br/>
+v0.9.20 (2020-10-04) Disable type detection if string started with chr(0)<br/>
+v0.9.19 (2020-08-23) Numbers like SKU right aligned now<br/>
+v0.9.18 (2020-08-22) Fixed fast shared strings index<br/> 
+v0.9.17 (2020-08-21) Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)<br/> 
+v0.9.16 (2020-07-29) Fixed time detection in HH:MM:SS format<br/>
 v0.9.15 (2020-07-14) escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) <br/>
 v0.9.14 (2020-05-31) fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu<br/>
 v0.9.13 (2020-05-21) if string more 160 chars, save as inlineStr<br/>

src/SimpleXLSXGen.php

@@ -7,10 +7,16 @@
 
 class SimpleXLSXGen {
 
-	public $rows;
-	public $template;
+	public $curSheet;
+	protected $sheets;
+	protected $template;
+	protected $SI, $SI_KEYS;
+
 	public function __construct() {
-		$this->rows = [];
+		$this->curSheet = -1;
+		$this->sheets = [ ['name' => 'Sheet1', 'rows' => [] ] ];
+		$this->SI = [];		// sharedStrings index
+		$this->SI_KEYS = []; //  & keys
 		$this->template = [
 			'[Content_Types].xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
@@ -18,12 +24,11 @@ class SimpleXLSXGen {
 <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
 <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
 <Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
-<Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>
+{SHEETS}
 <Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>
 <Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>
 <Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>
 </Types>',
-/* <Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/> */
 			'_rels/.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
 <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>
@@ -44,8 +49,7 @@ class SimpleXLSXGen {
 			'xl/_rels/workbook.xml.rels' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
 <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
-<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/>
-<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/></Relationships>',
+{SHEETS}',
 			'xl/worksheets/sheet1.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><dimension ref="{REF}"/><cols>{COLS}</cols><sheetData>{ROWS}</sheetData></worksheet>',
 			'xl/sharedStrings.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -58,43 +62,51 @@ class SimpleXLSXGen {
 <cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" /></cellStyleXfs>
 <cellXfs count="6">
 	<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-	<xf numFmtId="9" fontId="0" fillId="0" borderId="0" xfId="0"/>	
-	<xf numFmtId="10" fontId="0" fillId="0" borderId="0" xfId="0"/>
-	<xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0"/>
-	<xf numFmtId="20" fontId="0" fillId="0" borderId="0" xfId="0"/>
-	<xf numFmtId="22" fontId="0" fillId="0" borderId="0" xfId="0"/>	
+	<xf numFmtId="1" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+	<xf numFmtId="9" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>	
+	<xf numFmtId="10" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+	<xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+	<xf numFmtId="20" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+	<xf numFmtId="22" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
+	<xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" applyAlignment="1"><alignment horizontal="right"/></xf>	
 </cellXfs>
 <cellStyles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles>
 </styleSheet>',
 			'xl/workbook.xml' => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<fileVersion appName="'.__CLASS__.'"/>
-<sheets><sheet name="Sheet1" sheetId="1" state="visible" r:id="rId2"/></sheets>
-</workbook>'
+<fileVersion appName="'.__CLASS__.'"/><sheets>
+{SHEETS}
+</sheets></workbook>'
 		];
 		// <col min="1" max="1" width="22.1796875" bestFit="1" customWidth="1"/>
 		// <row r="1" spans="1:2" x14ac:dyDescent="0.35"><c r="A1" t="s"><v>0</v></c><c r="B1"><v>100</v></c></row><row r="2" spans="1:2" x14ac:dyDescent="0.35"><c r="A2" t="s"><v>1</v></c><c r="B2"><v>200</v></c></row>
 		// <si><t>Простой шаблон</t></si><si><t>Будем делать генератор</t></si>
 	}
-	public static function fromArray( array $rows ) {
-		$xlsx = new self();
-		$xlsx->setRows( $rows );
-		return $xlsx;
+	public static function fromArray( array $rows, $sheetName = null ) {
+		$xlsx = new static();
+		return $xlsx->addSheet( $rows, $sheetName );
 	}
-	public function setRows( $rows ) {
+
+	public function addSheet( array $rows, $name = null ) {
+		$this->curSheet++;
+
+		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1)];
+
 		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
-			$this->rows = $rows;
+			$this->sheets[$this->curSheet]['rows'] = $rows;
 		} else {
-			$this->rows = [];
+			$this->sheets[$this->curSheet]['rows'] = [];
 		}
+		return $this;
 	}
+
 	public function __toString() {
 		$fh = fopen( 'php://memory', 'wb' );
 		if ( ! $fh ) {
 			return '';
 		}
 
-		if ( ! $this->_generate( $fh ) ) {
+		if ( ! $this->_write( $fh ) ) {
 			fclose( $fh );
 			return '';
 		}
@@ -103,12 +115,13 @@ class SimpleXLSXGen {
 
 		return (string) fread( $fh, $size );
 	}
+
 	public function saveAs( $filename ) {
 		$fh = fopen( $filename, 'wb' );
 		if (!$fh) {
 			return false;
 		}
-		if ( !$this->_generate($fh) ) {
+		if ( !$this->_write($fh) ) {
 			fclose($fh);
 			return false;
 		}
@@ -116,16 +129,18 @@ class SimpleXLSXGen {
 
 		return true;
 	}
+
 	public function download() {
-		return $this->downloadAs( gmdate('YmdHi.xlsx') );
+		return $this->downloadAs( gmdate('YmdHi') . '.xlsx' );
 	}
+
 	public function downloadAs( $filename ) {
 		$fh = fopen('php://memory','wb');
 		if (!$fh) {
 			return false;
 		}
 
-		if ( !$this->_generate( $fh )) {
+		if ( !$this->_write( $fh )) {
 			fclose( $fh );
 			return false;
 		}
@@ -147,27 +162,184 @@ class SimpleXLSXGen {
 		return true;
 	}
 
-	private function _generate( $fh ) {
+	protected function _write( $fh ) {
+
 
-		$zipSignature = "\x50\x4b\x03\x04"; // local file header signature
-		$dirSignature = "\x50\x4b\x01\x02"; // central dir header signature
 		$dirSignatureE= "\x50\x4b\x05\x06"; // end of central dir signature
-
 		$zipComments = 'Generated by '.__CLASS__.' PHP class, thanks sergey.shuchkin@gmail.com';
 
-//		$fh = fopen( $filename, 'wb' );
-
 		if (!$fh) {
 			return false;
 		}
 
-		$SI = [];
+		$cdrec = '';	// central directory content
+		$entries= 0;	// number of zipped files
+		$cnt_sheets = count( $this->sheets );
+
+		foreach ($this->template as $cfilename => $template ) {
+			if ( $cfilename === '[Content_Types].xml' ) {
+				$s = '';
+				for ( $i = 0; $i < $cnt_sheets; $i++) {
+					$s .= '<Override PartName="/xl/worksheets/sheet'.($i+1).
+							'.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+				}
+				$template = str_replace('{SHEETS}', $s, $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			}
+			elseif ( $cfilename === 'xl/_rels/workbook.xml.rels' ) {
+				$s = '';
+				for ( $i = 0; $i < $cnt_sheets; $i++) {
+					$s .= '<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"'.
+						 ' Target="worksheets/sheet'.($i+1).".xml\"/>\n";
+				}
+				$s .= '<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/></Relationships>';
+				$template = str_replace('{SHEETS}', $s, $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			}
+			elseif ( $cfilename === 'xl/workbook.xml' ) {
+				$s = '';
+				foreach ( $this->sheets as $k => $v ) {
+					$s .= '<sheet name="' . $v['name'] . '" sheetId="' . ( $k + 1) . '" state="visible" r:id="rId' . ( $k + 2) . '"/>';
+				}
+				$template = str_replace('{SHEETS}', $s, $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			}
+			elseif ( $cfilename === 'docProps/core.xml' ) {
+				$template = str_replace('{DATE}', gmdate('Y-m-d\TH:i:s\Z'), $template);
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			} elseif ( $cfilename === 'xl/sharedStrings.xml' ) {
+				if (!count($this->SI)) {
+					$this->SI[] = 'No Data';
+				}
+				$si_cnt = count($this->SI);
+				$this->SI = '<si><t>'.implode("</t></si>\r\n<si><t>", $this->SI).'</t></si>';
+				$template = str_replace(['{CNT}', '{STRINGS}'], [ $si_cnt, $this->SI ], $template );
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			} elseif ( $cfilename === 'xl/worksheets/sheet1.xml' ) {
+				foreach ( $this->sheets as $k => $v ) {
+					$filename = 'xl/worksheets/sheet'.($k+1).'.xml';
+					$xml = $this->_sheetToXML($k, $template);
+					$this->_writeEntry($fh, $cdrec, $filename, $xml );
+					$entries++;
+				}
+				$xml = null;
+			}
+			else {
+				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
+				$entries++;
+			}
+		}
+		$before_cd = ftell($fh);
+		fwrite($fh, $cdrec);
+
+		// end of central dir
+		fwrite($fh, $dirSignatureE);
+		fwrite($fh, pack('v', 0)); // number of this disk
+		fwrite($fh, pack('v', 0)); // number of the disk with the start of the central directory
+		fwrite($fh, pack('v', $entries)); // total # of entries "on this disk"
+		fwrite($fh, pack('v', $entries)); // total # of entries overall
+		fwrite($fh, pack('V', mb_strlen($cdrec,'8bit')));     // size of central dir
+		fwrite($fh, pack('V', $before_cd));         // offset to start of central dir
+		fwrite($fh, pack('v', mb_strlen($zipComments,'8bit'))); // .zip file comment length
+		fwrite($fh, $zipComments);
+
+		return true;
+	}
+
+	protected function _writeEntry($fh, &$cdrec, $cfilename, $data) {
+		$zipSignature = "\x50\x4b\x03\x04"; // local file header signature
+		$dirSignature = "\x50\x4b\x01\x02"; // central dir header signature
+
+		$e = [];
+		$e['uncsize'] = mb_strlen($data, '8bit');
+
+		// if data to compress is too small, just store it
+		if($e['uncsize'] < 256){
+			$e['comsize'] = $e['uncsize'];
+			$e['vneeded'] = 10;
+			$e['cmethod'] = 0;
+			$zdata = $data;
+		} else{ // otherwise, compress it
+			$zdata = gzcompress($data);
+			$zdata = substr(substr($zdata, 0, - 4 ), 2); // fix crc bug (thanks to Eric Mueller)
+			$e['comsize'] = mb_strlen($zdata, '8bit');
+			$e['vneeded'] = 10;
+			$e['cmethod'] = 8;
+		}
+
+		$e['bitflag'] = 0;
+		$e['crc_32']  = crc32($data);
+
+		// Convert date and time to DOS Format, and set then
+		$lastmod_timeS  = str_pad(decbin(date('s')>=32?date('s')-32:date('s')), 5, '0', STR_PAD_LEFT);
+		$lastmod_timeM  = str_pad(decbin(date('i')), 6, '0', STR_PAD_LEFT);
+		$lastmod_timeH  = str_pad(decbin(date('H')), 5, '0', STR_PAD_LEFT);
+		$lastmod_dateD  = str_pad(decbin(date('d')), 5, '0', STR_PAD_LEFT);
+		$lastmod_dateM  = str_pad(decbin(date('m')), 4, '0', STR_PAD_LEFT);
+		$lastmod_dateY  = str_pad(decbin(date('Y')-1980), 7, '0', STR_PAD_LEFT);
+
+		# echo "ModTime: $lastmod_timeS-$lastmod_timeM-$lastmod_timeH (".date("s H H").")\n";
+		# echo "ModDate: $lastmod_dateD-$lastmod_dateM-$lastmod_dateY (".date("d m Y").")\n";
+		$e['modtime'] = bindec("$lastmod_timeH$lastmod_timeM$lastmod_timeS");
+		$e['moddate'] = bindec("$lastmod_dateY$lastmod_dateM$lastmod_dateD");
+
+		$e['offset'] = ftell($fh);
+
+		fwrite($fh, $zipSignature);
+		fwrite($fh, pack('s', $e['vneeded'])); // version_needed
+		fwrite($fh, pack('s', $e['bitflag'])); // general_bit_flag
+		fwrite($fh, pack('s', $e['cmethod'])); // compression_method
+		fwrite($fh, pack('s', $e['modtime'])); // lastmod_time
+		fwrite($fh, pack('s', $e['moddate'])); // lastmod_date
+		fwrite($fh, pack('V', $e['crc_32']));  // crc-32
+		fwrite($fh, pack('I', $e['comsize'])); // compressed_size
+		fwrite($fh, pack('I', $e['uncsize'])); // uncompressed_size
+		fwrite($fh, pack('s', mb_strlen($cfilename, '8bit')));   // file_name_length
+		fwrite($fh, pack('s', 0));  // extra_field_length
+		fwrite($fh, $cfilename);    // file_name
+		// ignoring extra_field
+		fwrite($fh, $zdata);
+
+		// Append it to central dir
+		$e['external_attributes']  = (substr($cfilename, -1) === '/'&&!$zdata)?16:32; // Directory or file name
+		$e['comments']             = '';
+
+		$cdrec .= $dirSignature;
+		$cdrec .= "\x0\x0";                  // version made by
+		$cdrec .= pack('v', $e['vneeded']); // version needed to extract
+		$cdrec .= "\x0\x0";                  // general bit flag
+		$cdrec .= pack('v', $e['cmethod']); // compression method
+		$cdrec .= pack('v', $e['modtime']); // lastmod time
+		$cdrec .= pack('v', $e['moddate']); // lastmod date
+		$cdrec .= pack('V', $e['crc_32']);  // crc32
+		$cdrec .= pack('V', $e['comsize']); // compressed filesize
+		$cdrec .= pack('V', $e['uncsize']); // uncompressed filesize
+		$cdrec .= pack('v', mb_strlen($cfilename,'8bit')); // file name length
+		$cdrec .= pack('v', 0);                // extra field length
+		$cdrec .= pack('v', mb_strlen($e['comments'],'8bit')); // file comment length
+		$cdrec .= pack('v', 0); // disk number start
+		$cdrec .= pack('v', 0); // internal file attributes
+		$cdrec .= pack('V', $e['external_attributes']); // internal file attributes
+		$cdrec .= pack('V', $e['offset']); // relative offset of local header
+		$cdrec .= $cfilename;
+		$cdrec .= $e['comments'];
+	}
+
+	protected function _sheetToXML($idx, $template) {
+		// locale floats fr_FR 1.234,56 -> 1234.56
+		$_loc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC,'C');
 		$COLS = [];
 		$ROWS = [];
-		if ( count($this->rows)  ) {
+		if ( count($this->sheets[$idx]['rows']) ) {
 			$CUR_ROW = 0;
 			$COL = [];
-			foreach( $this->rows as $r ) {
+			foreach( $this->sheets[$idx]['rows'] as $r ) {
 				$CUR_ROW++;
 				$row = '<row r="'.$CUR_ROW.'">';
 				$CUR_COL = 0;
@@ -179,7 +351,6 @@ class SimpleXLSXGen {
 					if ( $v === null || $v === '' ) {
 						continue;
 					}
-					$COL[ $CUR_COL ] = max( mb_strlen( (string) $v ), $COL[ $CUR_COL ] );
 
 					$cname = $this->num2name($CUR_COL) . $CUR_ROW;
 
@@ -187,50 +358,80 @@ class SimpleXLSXGen {
 
 					if ( is_string($v) ) {
 
-						if ( preg_match( '/^[-+]?\d{1,18}$/', $v ) ) {
-							$cv = ltrim($v,'+');
-						} elseif ( preg_match('/^[-+]?\d+\.?\d*$/', $v ) ) {
+						$vl = mb_strlen( $v );
+
+						if ( $v === '0' || preg_match( '/^[-+]?[1-9]\d{0,14}$/', $v ) ) { // Integer as General
+							$cv = ltrim( $v, '+' );
+							if ( $vl > 10 ) {
+								$cs = 1; // [1] 0
+							}
+						} elseif ( preg_match('/^[-+]?(0|[1-9]\d*)\.\d+$/', $v ) ) {
 							$cv = ltrim($v,'+');
 						} elseif ( preg_match('/^([-+]?\d+)%$/', $v, $m) ) {
 							$cv = round( $m[1] / 100, 2);
-							$cs = 1; // [9] 0%
-						} elseif ( preg_match('/^([-+]\d+\.\d*)%$/', $v, $m) ) {
+							$cs = 2; // [9] 0%
+						} elseif ( preg_match('/^([-+]\d+\.\d+)%$/', $v, $m) ) {
 							$cv = round( $m[1] / 100, 4 );
-							$cs = 2; // [10] 0.00%
+							$cs = 3; // [10] 0.00%
 						} elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d)$/', $v, $m ) ){
 							$cv = $this->date2excel($m[1],$m[2],$m[3]);
-							$cs = 3; // [14] mm-dd-yy
+							$cs = 4; // [14] mm-dd-yy
+						} elseif ( preg_match('/^(\d\d)\/(\d\d)\/(\d\d\d\d)$/', $v, $m ) ){
+							$cv = $this->date2excel($m[3],$m[2],$m[1]);
+							$cs = 4; // [14] mm-dd-yy
 						} elseif ( preg_match('/^(\d\d):(\d\d):(\d\d)$/', $v, $m ) ){
 							$cv = $this->date2excel(0,0,0,$m[1],$m[2],$m[3]);
-							$cs = 4; // [14] mm-dd-yy
+							$cs = 5; // [14] mm-dd-yy
 						} elseif ( preg_match('/^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
 							$cv = $this->date2excel( $m[1], $m[2], $m[3], $m[4], $m[5], $m[6] );
-							$cs = 5; // [22] m/d/yy h:mm
+							$cs = 6; // [22] m/d/yy h:mm
+						} elseif ( preg_match('/^(\d\d)\/(\d\d)\/(\d\d\d\d) (\d\d):(\d\d):(\d\d)$/', $v, $m ) ) {
+							$cv = $this->date2excel( $m[3], $m[2], $m[1], $m[4], $m[5], $m[6] );
+							$cs = 6; // [22] m/d/yy h:mm
 						} elseif ( mb_strlen( $v ) > 160 ) {
 							$ct = 'inlineStr';
-							$cv = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v);
+							$cv = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
 						} else {
+							if ( preg_match('/^[0-9+-.]+$/', $v ) ) { // Long ?
+								$cs = 7; // Align Right
+							}
+							$v = ltrim($v,"\0"); // disabled type detection
 							$ct = 's'; // shared string
-							$v = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v);
-							$cv             = array_search( $v, $SI, true );
+							$v = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
+							$cv = false;
+							$skey = '~'.$v;
+							if ( isset($this->SI_KEYS[ $skey ]) ) {
+								$cv = $this->SI_KEYS[ $skey ];
+							}
+
 							if ( $cv === false ) {
-								$SI[] = $v;
-								$cv  = count( $SI ) - 1;
+								$this->SI[] = $v;
+								$cv  = count( $this->SI ) - 1;
+								$this->SI_KEYS[$skey] = $cv;
 							}
 						}
-					} elseif ( is_int( $v ) || is_float( $v ) ) {
+					} elseif ( is_int( $v ) ) {
+						$vl = mb_strlen( (string) $v );
 						$cv = $v;
+					} elseif ( is_float( $v ) ) {
+						$vl = mb_strlen( (string) $v );
+						$cv = $v;
+					} elseif ( $v instanceof DateTime ) {
+						$vl = 16;
+						$cv = $this->date2excel( $v->format('Y'), $v->format('m'), $v->format('d'), $v->format('H'), $v->format('i'), $v->format('s') );
+						$cs = 6; // [22] m/d/yy h:mm
 					} else {
 						continue;
 					}
 
+					$COL[ $CUR_COL ] = max( $vl, $COL[ $CUR_COL ] );
+
 					$row .= '<c r="' . $cname . '"'.($ct ? ' t="'.$ct.'"' : '').($cs ? ' s="'.$cs.'"' : '').'>'
-						.($ct === 'inlineStr' ? '<is><t>'.$cv.'</t></is>' : '<v>' . $cv . '</v>')."</c>\r\n";
+					        .($ct === 'inlineStr' ? '<is><t>'.$cv.'</t></is>' : '<v>' . $cv . '</v>')."</c>\r\n";
 				}
 				$ROWS[] = $row . "</row>\r\n";
 			}
 			foreach ( $COL as $k => $max ) {
-//				$COLS[] = '<col min="'.$k.'" max="'.$k.'" width="'.min( $max+1, 60).'" bestFit="true" customWidth="true" />';
 				$COLS[] = '<col min="'.$k.'" max="'.$k.'" width="'.min( $max+1, 60).'" />';
 			}
 			$REF = 'A1:'.$this->num2name(count($COLS)) . $CUR_ROW;
@@ -238,115 +439,15 @@ class SimpleXLSXGen {
 			$COLS[] = '<col min="1" max="1" bestFit="1" />';
 			$ROWS[] = '<row r="1"><c r="A1" t="s"><v>0</v></c></row>';
 			$REF = 'A1:A1';
-			$SI[] = 'No Data';
 		}
-		$SI_CNT = count($SI);
-		$SI = '<si><t>'.implode("</t></si>\r\n<si><t>", $SI).'</t></si>';
+		//restore locale
+		setlocale(LC_NUMERIC, $_loc);
 
-		$cdrec = '';
-
-		foreach ($this->template as $cfilename => $data ) {
-
-			if ( $cfilename === 'docProps/core.xml' ) {
-				$data = str_replace('{DATE}', gmdate('Y-m-d\TH:i:s\Z'), $data);
-			} elseif ( $cfilename === 'xl/sharedStrings.xml' ) {
-				$data = str_replace(['{CNT}', '{STRINGS}'], [ $SI_CNT, $SI ], $data );
-			} elseif ( $cfilename === 'xl/worksheets/sheet1.xml' ) {
-				$data = str_replace(['{REF}','{COLS}','{ROWS}'],[ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS) ], $data );
-			}
-
-			$e = [];
-			$e['uncsize'] = mb_strlen($data, '8bit');
-
-			// if data to compress is too small, just store it
-			if($e['uncsize'] < 256){
-				$e['comsize'] = $e['uncsize'];
-				$e['vneeded'] = 10;
-				$e['cmethod'] = 0;
-				$zdata = $data;
-			} else{ // otherwise, compress it
-				$zdata = gzcompress($data);
-				$zdata = substr(substr($zdata, 0, - 4 ), 2); // fix crc bug (thanks to Eric Mueller)
-				$e['comsize'] = mb_strlen($zdata, '8bit');
-				$e['vneeded'] = 10;
-				$e['cmethod'] = 8;
-			}
-
-			$e['bitflag'] = 0;
-			$e['crc_32']  = crc32($data);
-
-			// Convert date and time to DOS Format, and set then
-			$lastmod_timeS  = str_pad(decbin(date('s')>=32?date('s')-32:date('s')), 5, '0', STR_PAD_LEFT);
-			$lastmod_timeM  = str_pad(decbin(date('i')), 6, '0', STR_PAD_LEFT);
-			$lastmod_timeH  = str_pad(decbin(date('H')), 5, '0', STR_PAD_LEFT);
-			$lastmod_dateD  = str_pad(decbin(date('d')), 5, '0', STR_PAD_LEFT);
-			$lastmod_dateM  = str_pad(decbin(date('m')), 4, '0', STR_PAD_LEFT);
-			$lastmod_dateY  = str_pad(decbin(date('Y')-1980), 7, '0', STR_PAD_LEFT);
-
-			# echo "ModTime: $lastmod_timeS-$lastmod_timeM-$lastmod_timeH (".date("s H H").")\n";
-			# echo "ModDate: $lastmod_dateD-$lastmod_dateM-$lastmod_dateY (".date("d m Y").")\n";
-			$e['modtime'] = bindec("$lastmod_timeH$lastmod_timeM$lastmod_timeS");
-			$e['moddate'] = bindec("$lastmod_dateY$lastmod_dateM$lastmod_dateD");
-
-			$e['offset'] = ftell($fh);
-
-			/** @noinspection DisconnectedForeachInstructionInspection */
-			fwrite($fh, $zipSignature);
-			fwrite($fh, pack('s', $e['vneeded'])); // version_needed
-			fwrite($fh, pack('s', $e['bitflag'])); // general_bit_flag
-			fwrite($fh, pack('s', $e['cmethod'])); // compression_method
-			fwrite($fh, pack('s', $e['modtime'])); // lastmod_time
-			fwrite($fh, pack('s', $e['moddate'])); // lastmod_date
-			fwrite($fh, pack('V', $e['crc_32']));  // crc-32
-			fwrite($fh, pack('I', $e['comsize'])); // compressed_size
-			fwrite($fh, pack('I', $e['uncsize'])); // uncompressed_size
-			fwrite($fh, pack('s', mb_strlen($cfilename, '8bit')));   // file_name_length
-			/** @noinspection DisconnectedForeachInstructionInspection */
-			fwrite($fh, pack('s', 0));  // extra_field_length
-			fwrite($fh, $cfilename);    // file_name
-			// ignoring extra_field
-			fwrite($fh, $zdata);
-
-			// Append it to central dir
-			$e['external_attributes']  = (substr($cfilename, -1) === '/'&&!$zdata)?16:32; // Directory or file name
-			$e['comments']             = '';
-
-			$cdrec .= $dirSignature;
-			$cdrec .= "\x0\x0";                  // version made by
-			$cdrec .= pack('v', $e['vneeded']); // version needed to extract
-			$cdrec .= "\x0\x0";                  // general bit flag
-			$cdrec .= pack('v', $e['cmethod']); // compression method
-			$cdrec .= pack('v', $e['modtime']); // lastmod time
-			$cdrec .= pack('v', $e['moddate']); // lastmod date
-			$cdrec .= pack('V', $e['crc_32']);  // crc32
-			$cdrec .= pack('V', $e['comsize']); // compressed filesize
-			$cdrec .= pack('V', $e['uncsize']); // uncompressed filesize
-			$cdrec .= pack('v', mb_strlen($cfilename,'8bit')); // file name length
-			$cdrec .= pack('v', 0);                // extra field length
-			$cdrec .= pack('v', mb_strlen($e['comments'],'8bit')); // file comment length
-			$cdrec .= pack('v', 0); // disk number start
-			$cdrec .= pack('v', 0); // internal file attributes
-			$cdrec .= pack('V', $e['external_attributes']); // internal file attributes
-			$cdrec .= pack('V', $e['offset']); // relative offset of local header
-			$cdrec .= $cfilename;
-			$cdrec .= $e['comments'];
-		}
-		$before_cd = ftell($fh);
-		fwrite($fh, $cdrec);
-
-		// end of central dir
-		fwrite($fh, $dirSignatureE);
-		fwrite($fh, pack('v', 0)); // number of this disk
-		fwrite($fh, pack('v', 0)); // number of the disk with the start of the central directory
-		fwrite($fh, pack('v', count( $this->template ))); // total # of entries "on this disk"
-		fwrite($fh, pack('v', count( $this->template ))); // total # of entries overall
-		fwrite($fh, pack('V', mb_strlen($cdrec,'8bit')));     // size of central dir
-		fwrite($fh, pack('V', $before_cd));         // offset to start of central dir
-		fwrite($fh, pack('v', mb_strlen($zipComments,'8bit'))); // .zip file comment length
-		fwrite($fh, $zipComments);
-
-		return true;
+		return str_replace(['{REF}','{COLS}','{ROWS}'],
+			[ $REF, implode("\r\n", $COLS), implode("\r\n",$ROWS) ],
+			$template );
 	}
+
 	public function num2name($num) {
 		$numeric = ($num - 1) % 26;
 		$letter  = chr( 65 + $numeric );
@@ -356,7 +457,14 @@ class SimpleXLSXGen {
 		}
 		return $letter;
 	}
+
 	public function date2excel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
+	    $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
+
+	    if ( $year === 0 ) {
+	        return $excelTime;
+        }
+
 		// self::CALENDAR_WINDOWS_1900
 		$excel1900isLeapYear = True;
 		if (((int)$year === 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
@@ -374,8 +482,6 @@ class SimpleXLSXGen {
 		$decade = substr($year,2,2);
 		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myExcelBaseDate + $excel1900isLeapYear;
 
-		$excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
-
-			return (float) $excelDate + $excelTime;
-		}
-}
+		return (float) $excelDate + $excelTime;
+	}
+}