bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Better version transformation for nodeinfo and statistics.json

Browse source
This commit is contained in:
Michael 2017-03-16 21:34:53 +00:00
parent a211c8cb77
commit 24a57020b9
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
include/socgraph.php
View file

@ -823,6 +823,9 @@ function poco_fetch_nodeinfo($server_url) {
if (isset($nodeinfo->software->version)) { if (isset($nodeinfo->software->version)) {
$server['version'] = $nodeinfo->software->version; $server['version'] = $nodeinfo->software->version;
// Version numbers on Nodeinfo are presented with additional info, e.g.:
// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
$server['version'] = preg_replace("=(.+)-(.{4,})=ism", "$1", $server['version']);
} }
} }
@ -1186,21 +1189,28 @@ function poco_check_server($server_url, $network = "", $force = false) {
$serverret = z_fetch_url($server_url."/statistics.json"); $serverret = z_fetch_url($server_url."/statistics.json");
if ($serverret["success"]) { if ($serverret["success"]) {
$data = json_decode($serverret["body"]); $data = json_decode($serverret["body"]);
if ($version == "") if (isset($data->version)) {
$version = $data->version; $version = $data->version;
// Version numbers on statistics.json are presented with additional info, e.g.:
// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
$version = preg_replace("=(.+)-(.{4,})=ism", "$1", $version);
}
$site_name = $data->name; $site_name = $data->name;
if (isset($data->network) AND ($platform == "")) if (isset($data->network)) {
$platform = $data->network; $platform = $data->network;
}
if ($platform == "Diaspora") if ($platform == "Diaspora") {
$network = NETWORK_DIASPORA; $network = NETWORK_DIASPORA;
}
if ($data->registrations_open) if ($data->registrations_open) {
$register_policy = REGISTER_OPEN; $register_policy = REGISTER_OPEN;
else } else {
$register_policy = REGISTER_CLOSED; $register_policy = REGISTER_CLOSED;
}
if (isset($data->version)) if (isset($data->version))
$last_contact = datetime_convert(); $last_contact = datetime_convert();
@ -1212,14 +1222,22 @@ function poco_check_server($server_url, $network = "", $force = false) {
$server = poco_fetch_nodeinfo($server_url); $server = poco_fetch_nodeinfo($server_url);
if ($server) { if ($server) {
$register_policy = $server['register_policy']; $register_policy = $server['register_policy'];
$platform = $server['platform'];
$network = $server['network'];
if ($version == "") { if (isset($server['platform'])) {
$platform = $server['platform'];
}
if (isset($server['network'])) {
$network = $server['network'];
}
if (isset($server['version'])) {
$version = $server['version']; $version = $server['version'];
} }
if (isset($server['site_name'])) {
$site_name = $server['site_name']; $site_name = $server['site_name'];
}
$last_contact = datetime_convert(); $last_contact = datetime_convert();
} }