X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=30bd4d3aec96dd11ef8f8282b223c0a56cacf71d;hb=a63208b3dab1a2d1c9b924dabb86be2edc90ebed;hp=93bf37191309996fe39110e7996d502dc381801e;hpb=0fde1097f3112d87d5777c72b0732b3a95984108;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 93bf371913..30bd4d3aec 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,26 +349,26 @@ function common_canonical_email($email) {
 	return $email;
 }
 
-function common_render_content($text, $notice=NULL) {
+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);
-	if ($notice) {
-		$id = $notice->profile_id;
-		$r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id, '\\1')", $r);
-	}
+	$id = $notice->profile_id;
+	$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;
 }
 
 function common_at_link($sender_id, $nickname) {
-	print_r('atlink generator got called');
 	# Try to find profiles this profile is subscribed to that have this nickname
 	$recipient = new Profile();
 	# XXX: chokety and bad
 	$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();
@@ -376,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);
@@ -384,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,