diff --git a/CHANGELOG.md b/CHANGELOG.md index c42ebac..87ebd5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.18 (2021-07-28) + +* Fixed email regex + ## 1.0.17 (2021-07-28) * Fixed " and & in sheets names diff --git a/src/SimpleXLSXGen.php b/src/SimpleXLSXGen.php index ac3ea2b..95a43c6 100644 --- a/src/SimpleXLSXGen.php +++ b/src/SimpleXLSXGen.php @@ -504,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 }