kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

URL regex fix

Browse Source
This commit is contained in:
Michael Save 2012-03-11 11:29:33 +11:00
parent 842b4312c9
commit 32c8791ff8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inc/functions.php
View File

@ -1334,13 +1334,8 @@
function markup_url($matches) { function markup_url($matches) {
global $markup_urls; global $markup_urls;
$url = $matches[0]; $url = $matches[1];
$after = ''; $after = $matches[2];
if(preg_match('/([)\]][.,!;]?|[.,!;][)\]]?)$/', $url, $match)) {
$url = substr($url, 0, 0 - strlen($match[1]));
$after = $match[1];
}
$markup_urls[] = $url; $markup_urls[] = $url;
@ -1376,7 +1371,13 @@
if($config['markup_urls']) { if($config['markup_urls']) {
$markup_urls = Array(); $markup_urls = Array();
$body = preg_replace_callback($config['url_regex'], 'markup_url', $body, -1, $num_links); $body = preg_replace_callback(
'/((?:https?:\/\/|ftp:\/\/|irc:\/\/)[^\s<>()"]*?(?:\([^\s<>()"]*?\)[^\s<>()"]*?)*)((?:\s|<|>|"|\.||\]|!|\?|,|&#44;|&quot;)*(?:[\s<>()"]|$))/',
'markup_url',
$body,
-1,
$num_links);
if($num_links > $config['max_links']) if($num_links > $config['max_links'])
error($config['error']['toomanylinks']); error($config['error']['toomanylinks']);
} }