1.0.18

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 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([
+	['Mailto hyperlink', '<a href="mailto:sergey.shuchkin@gmail.com">Please email me</a>']
+])->saveAs('test.xlsx');
+```
 ## 1.0.13 (2021-05-29)
 
 * Fixed hyperlinks in several sheets

src/SimpleXLSXGen.php

@@ -217,7 +217,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);
@@ -250,7 +250,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 );
@@ -460,6 +460,10 @@ class SimpleXLSXGen {
 									$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
 								}
+								if ( preg_match( '/<a href="(mailto?:[^"]+)">(.*?)<\/a>/i', $v, $m ) ) {
+									$this->sheets[ $idx ]['hyperlinks'][] = ['ID' => 'rId' . ( count( $this->sheets[ $idx ]['hyperlinks'] ) + 1 ), 'R' => $cname, 'H' => $m[1], 'L' => ''];
+									$F = self::F_HYPERLINK; // mailto hyperlink
+								}
 								$v = strip_tags( $v );
 							} // tags
 							$vl = mb_strlen( $v );
@@ -500,7 +504,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
 							}