1.0.19

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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

src/SimpleXLSXGen.php

@@ -117,6 +117,14 @@ class SimpleXLSXGen {
 	public function addSheet( array $rows, $name = null ) {
 		$this->curSheet++;
 
+		if ( $name !== null ) {
+			foreach( $this->sheets as $sh ) {
+				if ( $name === $sh['name'] ) {
+					$name .= ' ' . mt_rand( 100000, 999999 );
+				}
+			}
+		}
+
 		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1), 'hyperlinks' => []];
 
 		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
@@ -504,7 +512,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
 							}