1.0.23

added a ; in the Debug section.

CHANGELOG.md

@@ -1,7 +1,33 @@
 # Changelog
 
-## 1.0.14 (2021-06-08)
+## 1.0.23 (2022-02-01)
+* fixed dates if year < 1900 and time only cells, thx [fapth](https://github.com/shuchkin/simplexlsxgen/issues/51)   
 
+## 1.0.22 (2021-10-29)
+* Escape \x00 and \x0B (vertical tab)
+
+## 1.0.21 (2021-09-03)
+*  Fixed saveAs / downloadAs / etc methods more than once
+
+## 1.0.20 (2021-07-29)
+* Fixed sheet names duplicates (Page, Page (1), Page (2)...) 
+
+## 1.0.19 (2021-07-28)
+* Fixed sheet names duplicates 
+
+## 1.0.18 (2021-07-28)
+* Fixed email regex
+
+## 1.0.17 (2021-07-28)
+* Fixed &quot; and &amp; in sheets names
+
+## 1.0.16 (2021-07-01)
+* Fixed &quot;&amp;&quot; in hyperlinks
+
+## 1.0.15 (2021-06-22)
+* Fixed *mailto* hyperlinks detection
+
+## 1.0.14 (2021-06-08)
 * Added *mailto* hyperlinks support (thx Howard Martin)
 ```php
 SimpleXLSXGen::fromArray([
@@ -9,86 +35,65 @@ SimpleXLSXGen::fromArray([
 ])->saveAs('test.xlsx');
 ```
 ## 1.0.13 (2021-05-29)
-
 * Fixed hyperlinks in several sheets
 * Added [Opencollective donation link](https://opencollective.com/simplexlsx)
 
 ## 1.0.12 (2021-05-19)
-
 * Fixed hyperlink regex
 
 ## 1.0.11 (2021-05-14)
-
 * Fixed 0.00% format, thx [marcrobledo](https://github.com/shuchkin/simplexlsxgen/pull/34), more examples in README.md
 
 ## 1.0.10 (2021-05-03)
-
 Stable release
 
 * Added hyperlinks and minimal formatting
 
 ## 0.9.25 (2021-02-26)
-
 * Added PHP Datetime object values in a cells
 
 ## 0.9.24 (2021-02-26)
-
 * Percent support
 
 
 ## 0.9.23 (2021-01-25)
-
 * Fix local floats in XML
 
-
 ## 0.9.22 (2020-11-04)
-
 * Added multiple sheets support, thx [Savino59](https://github.com/Savino59), class ready for extend now
  
 ## 0.9.21 (2020-10-17)
-
 * Updated images
 
 ## 0.9.20 (2020-10-04)
-
 * Disable type detection if string started with chr(0)
 
 ## 0.9.19 (2020-08-23)
-
 * Numbers like SKU right aligned now
 
 ## 0.9.18 (2020-08-22)
-
 * Fixed fast shared strings index
  
 ## 0.9.17 (2020-08-21)
-
 * Fixed real numbers in 123.45 format detection, fast shared strings index (thx fredriksundin)
  
 ## 0.9.16 (2020-07-29)
-
 * Fixed time detection in HH:MM:SS format
 
 ## 0.9.15 (2020-07-14)
-
 * Escape of shared strings for special chars in cells [#1](https://github.com/shuchkin/simplexlsxgen/issues/1) 
 
 ## 0.9.14 (2020-05-31)
-
 * Fixed num2name A-Z,AA-AZ column names, thx Ertan Yusufoglu
 
 ## 0.9.13 (2020-05-21)
-
 * If string more 160 chars, save as inlineStr
 
 ## 0.9.12 (2020-05-21)
-
 * Readme fixed
 
 ## 0.9.11 (2020-05-21)
-
 * Removed XML unimportant attributes
 
 ## 0.9.10 (2020-05-20)
-
 * Initial release

README.md

@@ -99,6 +99,7 @@ ini_set('display_errors', 1 );
 
 $data = [
     ['Debug', 123]
-]
+];
+
 SimpleXLSXGen::fromArray( $data )->saveAs('debug.xlsx');
 ```

src/SimpleXLSXGen.php

@@ -110,16 +110,32 @@ class SimpleXLSXGen {
 		// <si><t>Простой шаблон</t></si><si><t>Будем делать генератор</t></si>
 	}
 	public static function fromArray( array $rows, $sheetName = null ) {
-		$xlsx = new static();
-		return $xlsx->addSheet( $rows, $sheetName );
+        return (new static())->addSheet( $rows, $sheetName );
 	}
 
 	public function addSheet( array $rows, $name = null ) {
+
 		$this->curSheet++;
+		if ( $name === null ) { // autogenerated sheet names
+			$name = 'Sheet'.($this->curSheet+1);
+		} else {
+			$names = [];
+			foreach( $this->sheets as $sh ) {
+				$names[ mb_strtoupper( $sh['name']) ] = 1;
+			}
+			for( $i = 0; $i < 100; $i++ ) {
+				$new_name = ($i === 0) ? $name : $name .' ('.$i.')';
+				$NEW_NAME = mb_strtoupper( $new_name );
+				if ( !isset( $names[ $NEW_NAME ]) ) {
+					$name = $new_name;
+					break;
+				}
+			}
+		}
 
-		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1), 'hyperlinks' => []];
+		$this->sheets[$this->curSheet] = ['name' => $name, 'hyperlinks' => []];
 
-		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
+		if ( isset( $rows[0] ) && is_array($rows[0]) ) {
 			$this->sheets[$this->curSheet]['rows'] = $rows;
 		} else {
 			$this->sheets[$this->curSheet]['rows'] = [];
@@ -217,7 +233,7 @@ class SimpleXLSXGen {
 			} 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) . '"/>';
+					$s .= '<sheet name="' . $this->esc( $v['name'] ) . '" sheetId="' . ( $k + 1) . '" state="visible" r:id="rId' . ( $k + 2) . '"/>';
 				}
 				$template = str_replace('{SHEETS}', $s, $template);
 				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
@@ -232,8 +248,8 @@ class SimpleXLSXGen {
 					$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 );
+				$si = '<si><t>'.implode("</t></si>\r\n<si><t>", $this->SI).'</t></si>';
+				$template = str_replace(['{CNT}', '{STRINGS}'], [ $si_cnt, $si ], $template );
 				$this->_writeEntry($fh, $cdrec, $cfilename, $template);
 				$entries++;
 			} elseif ( $cfilename === 'xl/worksheets/sheet1.xml' ) {
@@ -250,7 +266,7 @@ class SimpleXLSXGen {
 						$RH = [];
 						$filename = 'xl/worksheets/_rels/sheet' . ( $k + 1 ) . '.xml.rels';
 						foreach ( $v['hyperlinks'] as $h ) {
-							$RH[] = '<Relationship Id="' . $h['ID'] . '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" Target="' . $h['H'] . '" TargetMode="External"/>';
+							$RH[] = '<Relationship Id="' . $h['ID'] . '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" Target="' . $this->esc($h['H']) . '" TargetMode="External"/>';
 						}
 						$xml = str_replace( '{HYPERLINKS}', implode( "\r\n", $RH ), $template );
 						$this->_writeEntry( $fh, $cdrec, $filename, $xml );
@@ -494,7 +510,7 @@ class SimpleXLSXGen {
 								$N = self::N_TIME; // time
 							} 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] );
-								$N = self::N_DATETIME; // [22] m/d/yy h:mm
+								$N = ((int) $m[1] === 0) ? self::N_TIME : self::N_DATETIME; // [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] );
 								$N = self::N_DATETIME; // [22] m/d/yy h:mm
@@ -504,10 +520,14 @@ class SimpleXLSXGen {
 								$h = explode( '#', $v );
 								$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $h[0], 'L' => isset( $h[1] ) ? $h[1] : ''];
 								$F = self::F_HYPERLINK; // Hyperlink
-							} elseif ( preg_match( "/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $v ) ) {
+							} elseif ( preg_match( "/^[a-zA-Z0-9_\.\-]+@([a-zA-Z0-9][a-zA-Z0-9\-]*\.)+[a-zA-Z]{2,}$/", $v ) ) {
 								$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => 'mailto:' . $v, 'L' => ''];
 								$F = self::F_HYPERLINK; // Hyperlink
 							}
+                            if ( ($N === self::N_DATE || $N === self::N_DATETIME) && $cv < 0 ) {
+                                $cv = null;
+                                $N = 0;
+                            }
 						}
 						if ( !$cv) {
 
@@ -608,15 +628,16 @@ class SimpleXLSXGen {
 	}
 
 	public function date2excel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
+
 	    $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
 
-	    if ( $year === 0 ) {
+	    if ( (int) $year === 0 ) {
 	        return $excelTime;
         }
 
 		// self::CALENDAR_WINDOWS_1900
 		$excel1900isLeapYear = True;
-		if (((int)$year === 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
+		if (($year === 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
 		$myExcelBaseDate = 2415020;
 
 		// Julian base date Adjustment
@@ -626,9 +647,9 @@ class SimpleXLSXGen {
 			$month += 9;
 			--$year;
 		}
-		//    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
 		$century = substr($year,0,2);
 		$decade = substr($year,2,2);
+		//    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
 		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myExcelBaseDate + $excel1900isLeapYear;
 
 		return (float) $excelDate + $excelTime;
@@ -642,6 +663,8 @@ class SimpleXLSXGen {
 		return $this;
 	}
 	public function esc( $str ) {
-		return str_replace( ['&', '<', '>', "\x03"], ['&amp;', '&lt;', '&gt;', ''], $str );
+		// XML UTF-8: #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+		// but we use fast version
+		return str_replace( ['&', '<', '>', "\x00","\x03","\x0B"], ['&amp;', '&lt;', '&gt;', '', '', ''], $str );
 	}
 }