summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMeitar Moscovitz <meitarm@gmail.com>2009-02-02 19:59:48 +1100
committerMeitar Moscovitz <meitarm@gmail.com>2009-02-02 19:59:48 +1100
commita381bff4da077b84baaa56ef9780eb806e14b7dd (patch)
tree56ab5760bb79e5fbc829908398f5368f07857737 /lib
parent87b99540efb702d816ef0b14d0fef9126539254a (diff)
Link rtsp, mms & tel URI schemes, correct pseudo-protocol ones.
This patch builds on the work of user `candrews` at http://laconi.ca/trac/ticket/529#comment:2
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php
index 3690f0ad5..d7af3f204 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -370,8 +370,6 @@ function common_canonical_email($email)
return $email;
}
-define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))');
-
function common_render_content($text, $notice)
{
$r = common_render_text($text);
@@ -388,7 +386,8 @@ function common_render_text($text)
$r = htmlspecialchars($text);
$r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
- $r = preg_replace_callback('@https?://[^\]>\s]+@', 'common_render_uri_thingy', $r);
+ $r = preg_replace_callback('@(ftp|http|https|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|xmpp|irc)://[^\]>\s]+@', 'common_render_uri_thingy', $r);
+ $r = preg_replace_callback('@(mailto|aim|tel):[^\]>\s]+@', 'common_render_uri_thingy', $r); // Pseudo-protocols don't require '//' after ':'.
$r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
// XXX: machine tags
return $r;