From 58219416ca65a67ac4c63727a2c899c307448142 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 29 May 2008 14:12:44 -0400 Subject: [PATCH] linkify URLs darcs-hash:20080529181244-84dde-6b51042c5c92581d8aecfbb83630646afc078793.gz --- lib/util.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util.php b/lib/util.php index 0fa3178c89..20c8834c1b 100644 --- a/lib/util.php +++ b/lib/util.php @@ -349,10 +349,13 @@ 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 = htmlspecialchars($text); $id = $notice->profile_id; $r = preg_replace('/(^|\s)@([\w-]+)($|\s)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r); + $r = preg_replace('/'.URL_REGEX.'/', '\\0', $r); # XXX: # tags # XXX: machine tags return $r;