mexon/friendica
1
0
Fork 0
Code Pull requests Activity

probe_url: Better detection for non-standard installations of GNU Social

Browse source
This commit is contained in:
Michael Vogel 2015-06-14 01:52:26 +02:00
parent e0147a24ad
commit b7f270de28
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/Scrape.php
View file

@ -335,7 +335,7 @@ function scrape_feed($url) {
define ( 'PROBE_NORMAL', 0); define ( 'PROBE_NORMAL', 0);
define ( 'PROBE_DIASPORA', 1); define ( 'PROBE_DIASPORA', 1);
function probe_url($url, $mode = PROBE_NORMAL) { function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
require_once('include/email.php'); require_once('include/email.php');
$result = array(); $result = array();
@ -804,15 +804,25 @@ function probe_url($url, $mode = PROBE_NORMAL) {
logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG); logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
if ($level == 1) {
// Trying if it maybe a diaspora account // Trying if it maybe a diaspora account
if (($result['network'] == NETWORK_FEED) OR ($result['addr'] == "")) { if (($result['network'] == NETWORK_FEED) OR ($result['addr'] == "")) {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
$address = GetProfileUsername($url, "", true); $address = GetProfileUsername($url, "", true);
$result2 = probe_url($address, $mode); $result2 = probe_url($address, $mode, ++$level);
if ($result2['network'] != "") if ($result2['network'] != "")
$result = $result2; $result = $result2;
} }
// Maybe it's some non standard GNU Social installation (Single user, subfolder or no uri rewrite)
if (($result['network'] == NETWORK_FEED) AND ($result['baseurl'] != "") AND ($result['nick'] != "")) {
$addr = $result['nick'].'@'.str_replace("http://", "", $result['baseurl']);
$result2 = probe_url($addr, $mode, ++$level);
if (($result2['network'] != "") AND ($result2['network'] != NETWORK_FEED))
$result = $result2;
}
}
Cache::set("probe_url:".$mode.":".$url,serialize($result)); Cache::set("probe_url:".$mode.":".$url,serialize($result));
return $result; return $result;