1.0.22

CHANGELOG.md

@@ -1,19 +1,30 @@
 # Changelog
 
-## 1.0.17 (2021-07-28)
+## 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 " and & in sheets names
 
 ## 1.0.16 (2021-07-01)
-
 * Fixed "&" 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([
@@ -21,86 +32,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

src/SimpleXLSXGen.php

@@ -115,9 +115,26 @@ class SimpleXLSXGen {
 	}
 
 	public function addSheet( array $rows, $name = null ) {
-		$this->curSheet++;
 
-		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1), 'hyperlinks' => []];
+		$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, 'hyperlinks' => []];
 
 		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
 			$this->sheets[$this->curSheet]['rows'] = $rows;
@@ -232,8 +249,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' ) {
@@ -504,7 +521,7 @@ 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
 							}
@@ -642,6 +659,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 );
 	}
 }