Merge pull request #207 from annando/master

Encode the URLs with GUIDs
This commit is contained in:
tobiasd 2014-08-12 09:02:12 +02:00
commit d26e98059a
6 changed files with 11 additions and 17 deletions

View file

@ -716,8 +716,7 @@ function appnet_fetchstream($a, $uid) {
'to_email' => $user['email'], 'to_email' => $user['email'],
'uid' => $user['uid'], 'uid' => $user['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],
@ -761,7 +760,8 @@ function appnet_fetchstream($a, $uid) {
$lastid = $post["id"]; $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'); require_once('include/enotify.php');
notification(array( notification(array(
'type' => NOTIFY_TAGSELF, 'type' => NOTIFY_TAGSELF,
@ -771,8 +771,7 @@ function appnet_fetchstream($a, $uid) {
'to_email' => $user['email'], 'to_email' => $user['email'],
'uid' => $user['uid'], 'uid' => $user['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],

View file

@ -625,8 +625,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
'to_email' => $user[0]['email'], 'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'], 'uid' => $user[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],

View file

@ -1 +1,2 @@
postToGooglePlus.php postToGooglePlus.php
nxs-http.php

View file

@ -1243,8 +1243,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
'to_email' => $user[0]['email'], 'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'], 'uid' => $user[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],

View file

@ -1237,8 +1237,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
'to_email' => $user[0]['email'], 'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'], 'uid' => $user[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],
@ -1419,8 +1418,7 @@ function statusnet_fetchhometimeline($a, $uid) {
'to_email' => $u[0]['email'], 'to_email' => $u[0]['email'],
'uid' => $u[0]['uid'], 'uid' => $u[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],

View file

@ -1452,8 +1452,7 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
'to_email' => $user[0]['email'], 'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'], 'uid' => $user[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($top_item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],
@ -1614,8 +1613,7 @@ function twitter_fetchhometimeline($a, $uid) {
'to_email' => $u[0]['email'], 'to_email' => $u[0]['email'],
'uid' => $u[0]['uid'], 'uid' => $u[0]['uid'],
'item' => $postarray, 'item' => $postarray,
//'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item, 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
'link' => $a->get_baseurl().'/display/'.get_item_guid($item),
'source_name' => $postarray['author-name'], 'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'], 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'], 'source_photo' => $postarray['author-avatar'],