From 3ec6970d09270ebe57f75fc7295d38b8df1f5675 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 9 Aug 2014 09:13:13 +0200 Subject: [PATCH] The GUID in the link to the items has to be encoded, since it could contain special characters --- appnet/appnet.php | 9 ++++----- fbsync/fbsync.php | 3 +-- gpluspost/.gitignore | 1 + pumpio/pumpio.php | 3 +-- statusnet/statusnet.php | 6 ++---- twitter/twitter.php | 6 ++---- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/appnet/appnet.php b/appnet/appnet.php index 3a6046b36..a8335d7bf 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -716,8 +716,7 @@ function appnet_fetchstream($a, $uid) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], @@ -761,7 +760,8 @@ function appnet_fetchstream($a, $uid) { $lastid = $post["id"]; - if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) { + //if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) { + if ($item != 0) { require_once('include/enotify.php'); notification(array( 'type' => NOTIFY_TAGSELF, @@ -771,8 +771,7 @@ function appnet_fetchstream($a, $uid) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index fe5b6faf0..78ecea1dd 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -625,8 +625,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], diff --git a/gpluspost/.gitignore b/gpluspost/.gitignore index 721166b77..4e76a242d 100644 --- a/gpluspost/.gitignore +++ b/gpluspost/.gitignore @@ -1 +1,2 @@ postToGooglePlus.php +nxs-http.php diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 936f0c141..0d7786c15 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1243,8 +1243,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index b7ba8d7d6..f941531e3 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -1237,8 +1237,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], @@ -1419,8 +1418,7 @@ function statusnet_fetchhometimeline($a, $uid) { 'to_email' => $u[0]['email'], 'uid' => $u[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], diff --git a/twitter/twitter.php b/twitter/twitter.php index c961b6a99..6731e324f 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1452,8 +1452,7 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) { 'to_email' => $user[0]['email'], 'uid' => $user[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], @@ -1614,8 +1613,7 @@ function twitter_fetchhometimeline($a, $uid) { 'to_email' => $u[0]['email'], 'uid' => $u[0]['uid'], 'item' => $postarray, - //'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item, - 'link' => $a->get_baseurl().'/display/'.get_item_guid($item), + 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)), 'source_name' => $postarray['author-name'], 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'],