move linkifying so URL links come first

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 54a30a914df840bbca9f4f6002ef5d606352ce71..30bd4d3aec96dd11ef8f8282b223c0a56cacf71d 100644 (file)
--- 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('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
+       $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
+       $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
        # XXX: # tags
        # XXX: machine tags
        return $r;
@@ -365,7 +368,7 @@ function common_at_link($sender_id, $nickname) {
        $recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender_id.' and subscribed = id)', 'AND');
        $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
        if ($recipient->find(TRUE)) {
-               return '<a href="'.$recipient->profileurl.'" class="atlink tolistenee">'.$nickname.'</a>';
+               return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink tolistenee">'.$nickname.'</a>';
        }
        # Try to find profiles that listen to this profile and that have this nickname
        $recipient = new Profile();
@@ -373,7 +376,7 @@ function common_at_link($sender_id, $nickname) {
        $recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender_id.' and subscriber = id)', 'AND');
        $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
        if ($recipient->find(TRUE)) {
-               return '<a href="'.$recipient->profileurl.'" class="atlink tolistener">'.$nickname.'</a>';
+               return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink tolistener">'.$nickname.'</a>';
        }
        # If this is a local user, try to find a local user with that nickname.
        $sender = User::staticGet($sender_id);
@@ -381,7 +384,7 @@ function common_at_link($sender_id, $nickname) {
                $recipient_user = User::staticGet('nickname', $nickname);
                if ($recipient_user) {
                        $recipient = $recipient->getProfile();
-                       return '<a href="'.$recipient->profileurl.'" class="atlink usertouser">'.$nickname.'</a>';
+                       return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink usertouser">'.$nickname.'</a>';
                }
        }
        # Otherwise, no links. @messages from local users to remote users,