harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
Conflicts:
	mod/events.php
	view/css/mod_events.css
This commit is contained in:
friendica
2015-02-08 20:57:37 -08:00
parent 4b348d2489 247579ebf1
commit 08b757a22c
97 changed files with 9030 additions and 7689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/diaspora.php
View File

@@ -772,7 +772,6 @@ function diaspora_request($importer,$xml) {
function diaspora_post($importer,$xml,$msg) {
$a = get_app();
@@ -898,8 +897,8 @@ function diaspora_post($importer,$xml,$msg) {
}
// this won't work for Friendica or Redmatrix but it's probably the best we can do.
$plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid;
$plink = service_plink($contact,$guid);
$datarray['uid'] = $importer['channel_id'];
@@ -1116,8 +1115,7 @@ function diaspora_reshare($importer,$xml,$msg) {
}
}
// This won't work on redmatrix
$plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid;
$plink = service_plink($contact,$guid);
$datarray['uid'] = $importer['channel_id'];
$datarray['mid'] = $datarray['parent_mid'] = $guid;
@@ -1198,7 +1196,7 @@ function diaspora_asphoto($importer,$xml,$msg) {
return;
}
$plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid;
$plink = service_plink($contact,$guid);
$datarray = array();

24
include/network.php
View File

@@ -1522,3 +1522,27 @@ function scrape_feed($url) {
return $ret;
}
function service_plink($contact, $guid) {
$plink = '';
$m = parse_url($contact['xchan_url']);
if($m) {
$url = $scheme . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
}
else
$url = 'https://' . substr($contact['xchan_addr'],strpos($contact['xchan_addr'],'@')+1);
$handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'],'@'));
if($contact['xchan_network'] === 'diaspora')
$plink = $url . '/posts/' . $guid;
if($contact['xchan_network'] === 'friendica-over-diaspora')
$plink = $url . '/display/' . $handle . '/' . $guid;
if($contact['xchan_network'] === 'zot')
$plink = $url . '/channel/' . $handle . '?f=&mid=' . $guid;
return $plink;
}

2
include/text.php
View File

@@ -1947,7 +1947,7 @@ function find_xchan_in_array($xchan,$arr) {
function get_rel_link($j,$rel) {
if(is_array($j) && ($j))
foreach($j as $l)
if(array_key_exists('rel',$j) && $l['rel'] === $rel && array_key_exists('href',$l))
if(array_key_exists('rel',$l) && $l['rel'] === $rel && array_key_exists('href',$l))
return $l['href'];
return '';