MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New Diaspora detection

Browse source
This commit is contained in:
Michael Vogel 2015-07-23 00:32:41 +02:00
parent 749a646480
commit 56a43dcbdf
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/socgraph.php
View file

@ -464,7 +464,11 @@ function poco_last_updated($profile) {
q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'",
dbesc($noscrape["about"]), dbesc(normalise_link($profile))); dbesc($noscrape["about"]), dbesc(normalise_link($profile)));
$keywords = implode(" ", $noscrape["tags"]); if (isset($noscrape["tags"]))
$keywords = implode(" ", $noscrape["tags"]);
else
$keywords = "";
if (($keywords != "") AND ($keywords != $gcontacts[0]["keywords"])) if (($keywords != "") AND ($keywords != $gcontacts[0]["keywords"]))
q("UPDATE `gcontact` SET `keywords` = '%s' WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `keywords` = '%s' WHERE `nurl` = '%s'",
dbesc($keywords), dbesc(normalise_link($profile))); dbesc($keywords), dbesc(normalise_link($profile)));
@ -683,6 +687,23 @@ function poco_check_server($server_url, $network = "", $force = false) {
} elseif ($network == NETWORK_DIASPORA) } elseif ($network == NETWORK_DIASPORA)
$last_contact = datetime_convert(); $last_contact = datetime_convert();
if (!$failure) {
// Test for Diaspora
$serverret = z_fetch_url($server_url);
$lines = explode("\n",$serverret["header"]);
if(count($lines))
foreach($lines as $line) {
$line = trim($line);
if(stristr($line,'X-Diaspora-Version:')) {
$platform = "Diaspora";
$version = trim(str_replace("X-Diaspora-Version:", "", $line));
$version = trim(str_replace("x-diaspora-version:", "", $version));
$network = NETWORK_DIASPORA;
}
}
}
if (!$failure) { if (!$failure) {
// Test for Statusnet // Test for Statusnet
// Will also return data for Friendica and GNU Social - but it will be overwritten later // Will also return data for Friendica and GNU Social - but it will be overwritten later
@ -758,6 +779,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
if (isset($data->network) AND ($platform == "")) if (isset($data->network) AND ($platform == ""))
$platform = $data->network; $platform = $data->network;
if ($platform == "Diaspora")
$network = NETWORK_DIASPORA;
if ($data->registrations_open) if ($data->registrations_open)
$register_policy = REGISTER_OPEN; $register_policy = REGISTER_OPEN;
else else
@ -773,6 +797,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) { if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
$serverret = z_fetch_url($server_url."/friendica/json"); $serverret = z_fetch_url($server_url."/friendica/json");
if (!$serverret["success"])
$serverret = z_fetch_url($server_url."/friendika/json");
if ($serverret["success"]) { if ($serverret["success"]) {
$data = json_decode($serverret["body"]); $data = json_decode($serverret["body"]);
@ -1220,6 +1247,10 @@ function poco_discover($complete = false) {
} }
function poco_discover_server_users($data, $server) { function poco_discover_server_users($data, $server) {
if (!isset($data->entry))
return;
foreach ($data->entry AS $entry) { foreach ($data->entry AS $entry) {
$username = ""; $username = "";
if (isset($entry->urls)) { if (isset($entry->urls)) {