fix: auto_link() regexp

kenjis · kenjis · commit ea12427c627a · 2024-09-05T16:40:33.000+09:00
From CI3. See https://github.com/bcit-ci/CodeIgniter/blob/2042929bab8ffc14faf6193de0107b7f95abbdaf/system/helpers/url_helper.php#L397
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -351,7 +351,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
     function auto_link(string $str, string $type = 'both', bool $popup = false): string
     {
         // Find and replace any URLs.
-        if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[a-z0-9]+(-+[a-z0-9]+)*(\.[a-z0-9]+(-+[a-z0-9]+)*)+(/([^\s()<>;]+\w)?/?)?#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
             // Set our target HTML if using popup links.
             $target = ($popup) ? ' target="_blank"' : '';
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin`
`351`	`351`	`function auto_link(string $str, string $type = 'both', bool $popup = false): string`
`352`	`352`	`{`
`353`	`353`	`// Find and replace any URLs.`
`354`		`- if ($type !== 'email' && preg_match_all('#(\w*://\|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE \| PREG_SET_ORDER)) {`
	`354`	`+ if ($type !== 'email' && preg_match_all('#(\w://\|www\.)[a-z0-9]+(-+[a-z0-9]+)(\.[a-z0-9]+(-+[a-z0-9]+)*)+(/([^\s()<>;]+\w)?/?)?#i', $str, $matches, PREG_OFFSET_CAPTURE \| PREG_SET_ORDER)) {`
`355`	`355`	`// Set our target HTML if using popup links.`
`356`	`356`	`$target = ($popup) ? ' target="_blank"' : '';`
`357`	`357`