urlencode the message-id component of generated /display/ links; in most cases this will be a no-op, unless the message-id is a url of some kind from a different provider.

7 files changed, 11 insertions, 16 deletions

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 91a8b1a47..d5fac306b 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -935,7 +935,7 @@ class Item extends \Zotlabs\Web\Controller {
 						'from_xchan'   => $datarray['author_xchan'],
 						'to_xchan'     => $datarray['owner_xchan'],
 						'item'         => $datarray,
-						'link'		   => z_root() . '/display/' . $datarray['mid'],
+						'link'		   => z_root() . '/display/' . urlencode($datarray['mid']),
 						'verb'         => ACTIVITY_POST,
 						'otype'        => 'item',
 						'parent'       => $parent,
@@ -953,7 +953,7 @@ class Item extends \Zotlabs\Web\Controller {
 						'from_xchan'   => $datarray['author_xchan'],
 						'to_xchan'     => $datarray['owner_xchan'],
 						'item'         => $datarray,
-						'link'		   => z_root() . '/display/' . $datarray['mid'],
+						'link'		   => z_root() . '/display/' . urlencode($datarray['mid']),
 						'verb'         => ACTIVITY_POST,
 						'otype'        => 'item'
 					));
@@ -1005,7 +1005,7 @@ class Item extends \Zotlabs\Web\Controller {
 		}
 	
 		$datarray['id']    = $post_id;
-		$datarray['llink'] = z_root() . '/display/' . $channel['channel_address'] . '/' . $post_id;
+		$datarray['llink'] = z_root() . '/display/' . urlencode($datarray['mid']);
 	
 		call_hooks('post_local_end', $datarray);
 	
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 43d318623..c1fefcb89 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -447,7 +447,7 @@ class Like extends \Zotlabs\Web\Controller {
 			$arr['thr_parent']   = $item['mid'];
 			$ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
 			$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
-			$plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]';
+			$plink = '[zrl=' . z_root() . '/display/' . urlencode($item['mid']) . ']' . $post_type . '[/zrl]';
 			$allow_cid       = $item['allow_cid'];
 			$allow_gid       = $item['allow_gid'];
 			$deny_cid        = $item['deny_cid'];
diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
index 0226664d7..2fced8f48 100644
--- a/Zotlabs/Module/Subthread.php
+++ b/Zotlabs/Module/Subthread.php
@@ -138,7 +138,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 	
 		$ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
 		$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
-		$plink = '[zrl=' . z_root() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]';
+		$plink = '[zrl=' . z_root() . '/display/' . urlencode($item['mid']) . ']' . $post_type . '[/zrl]';
 		
 		$arr['body']          =  sprintf( $bodyverb, $alink, $ulink, $plink );
 	
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php
index 25f518d53..f6ef66647 100644
--- a/Zotlabs/Module/Tagger.php
+++ b/Zotlabs/Module/Tagger.php
@@ -60,7 +60,7 @@ class Tagger extends \Zotlabs\Web\Controller {
 	
 	
 		$links = array(array('rel' => 'alternate','type' => 'text/html', 
-			'href' => z_root() . '/display/' . $item['mid']));
+			'href' => z_root() . '/display/' . urlencode($item['mid'])));
 	
 		$target = json_encode(array(
 			'type'    => $targettype,
@@ -81,11 +81,6 @@ class Tagger extends \Zotlabs\Web\Controller {
 				),
 		));
 	
-	
-	
-		$link = xmlify('<link rel="alternate" type="text/html" href="' 
-			. z_root() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
-	
 		$tagid = z_root() . '/search?tag=' . $term;
 		$objtype = ACTIVITY_OBJ_TAGTERM;
 	
diff --git a/include/conversation.php b/include/conversation.php
index 0ff368e6e..94cd9168e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -733,7 +733,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'like' => '',
 					'dislike' => '',
 					'comment' => '',
-					'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . $item['mid'], 'title'=> t('View in context'))),
+					'conv' => (($preview) ? '' : array('href'=> z_root() . '/display/' . urlencode($item['mid']), 'title'=> t('View in context'))),
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
 					'thread_level' => 1,
diff --git a/include/event.php b/include/event.php
index f3366fb69..85f14c5f9 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1016,9 +1016,9 @@ function event_store_item($arr, $event) {
 		// otherwise we'll fallback to /display/$message_id
 
 		if($wall)
-			$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . $item_arr['mid'];
+			$item_arr['plink'] = z_root() . '/channel/' . $z[0]['channel_address'] . '/?f=&mid=' . urlencode($item_arr['mid']);
 		else
-			$item_arr['plink'] = z_root() . '/display/' . $item_arr['mid'];
+			$item_arr['plink'] = z_root() . '/display/' . urlencode($item_arr['mid']);
 
 		$x = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($arr['event_xchan'])
diff --git a/include/items.php b/include/items.php
index 7fb5dc5da..da49df397 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1624,7 +1624,7 @@ logger('revision: ' . $arr['revision']);
 	if($d2 > $d1)
 		$arr['item_delayed'] = 1;
 
-	$arr['llink'] = z_root() . '/display/' . $arr['mid'];
+	$arr['llink'] = z_root() . '/display/' . urlencode($arr['mid']);
 
 	if(! $arr['plink'])
 		$arr['plink'] = $arr['llink'];
@@ -2279,7 +2279,7 @@ function send_status_notifications($post_id,$item) {
 	if($unfollowed)
 		return;
 
-	$link =  z_root() . '/display/' . $item['mid'];
+	$link =  z_root() . '/display/' . urlencode($item['mid']);
 
 	$y = q("select id from notify where link = '%s' and uid = %d limit 1",
 		dbesc($link),