*/
use Friendica\App;
+use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Network\Probe;
*/
function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
// Call the function "poco_load_worker" via the worker
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url));
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
}
/**
$alternate = poco_alternate_ostatus_url($gcontact['url']);
// The global contacts should contain the original picture, not the cached one
- if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
+ if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(System::baseUrl()."/photo/"))) {
$gcontact['photo'] = "";
}
$last_updated = "";
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
return false;
}
- foreach ($data->entry[0]->urls AS $url) {
+ foreach ($data->entry[0]->urls as $url) {
if ($url->type == 'zot') {
$server = array();
$server["platform"] = 'Hubzilla';
$nodeinfo_url = '';
- foreach ($nodeinfo->links AS $link) {
+ foreach ($nodeinfo->links as $link) {
if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
$nodeinfo_url = $link->href;
}
$gnusocial = false;
if (is_array($nodeinfo->protocols->inbound)) {
- foreach ($nodeinfo->protocols->inbound AS $inbound) {
+ foreach ($nodeinfo->protocols->inbound as $inbound) {
if ($inbound == 'diaspora') {
$diaspora = true;
}
if (dbm::is_result($servers) && ($orig_server_url == $server_url) &&
($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
- dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
+ dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
return false;
}
// Quit if there is a timeout
if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
- dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
+ dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
return false;
}
}
// Test for Mastodon
+ $orig_version = $version;
$serverret = z_fetch_url($server_url."/api/v1/instance");
if ($serverret["success"] && ($serverret["body"] != '')) {
$data = json_decode($serverret["body"]);
$network = NETWORK_OSTATUS;
}
}
+ if (strstr($orig_version.$version, 'Pleroma')) {
+ $platform = 'Pleroma';
+ $version = trim(str_replace('Pleroma', '', $version));
+ }
}
if (!$failure) {
- // Test for Hubzilla, Redmatrix or Friendica
- $serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+ // Test for Hubzilla and Red
+ $serverret = z_fetch_url($server_url."/siteinfo.json");
if ($serverret["success"]) {
$data = json_decode($serverret["body"]);
- if (isset($data->site->server)) {
- if (isset($data->site->platform)) {
- $platform = $data->site->platform->PLATFORM_NAME;
- $version = $data->site->platform->STD_VERSION;
- $network = NETWORK_DIASPORA;
- }
- if (isset($data->site->BlaBlaNet)) {
- $platform = $data->site->BlaBlaNet->PLATFORM_NAME;
- $version = $data->site->BlaBlaNet->STD_VERSION;
- $network = NETWORK_DIASPORA;
- }
- if (isset($data->site->hubzilla)) {
- $platform = $data->site->hubzilla->PLATFORM_NAME;
- $version = $data->site->hubzilla->RED_VERSION;
- $network = NETWORK_DIASPORA;
- }
- if (isset($data->site->redmatrix)) {
- if (isset($data->site->redmatrix->PLATFORM_NAME)) {
- $platform = $data->site->redmatrix->PLATFORM_NAME;
- } elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
- $platform = $data->site->redmatrix->RED_PLATFORM;
+ if (isset($data->url)) {
+ $platform = $data->platform;
+ $version = $data->version;
+ $network = NETWORK_DIASPORA;
+ }
+ if (!empty($data->site_name)) {
+ $site_name = $data->site_name;
+ }
+ switch ($data->register_policy) {
+ case "REGISTER_OPEN":
+ $register_policy = REGISTER_OPEN;
+ break;
+ case "REGISTER_APPROVE":
+ $register_policy = REGISTER_APPROVE;
+ break;
+ case "REGISTER_CLOSED":
+ default:
+ $register_policy = REGISTER_CLOSED;
+ break;
+ }
+ } else {
+ // Test for Hubzilla, Redmatrix or Friendica
+ $serverret = z_fetch_url($server_url."/api/statusnet/config.json");
+ if ($serverret["success"]) {
+ $data = json_decode($serverret["body"]);
+ if (isset($data->site->server)) {
+ if (isset($data->site->platform)) {
+ $platform = $data->site->platform->PLATFORM_NAME;
+ $version = $data->site->platform->STD_VERSION;
+ $network = NETWORK_DIASPORA;
+ }
+ if (isset($data->site->BlaBlaNet)) {
+ $platform = $data->site->BlaBlaNet->PLATFORM_NAME;
+ $version = $data->site->BlaBlaNet->STD_VERSION;
+ $network = NETWORK_DIASPORA;
}
+ if (isset($data->site->hubzilla)) {
+ $platform = $data->site->hubzilla->PLATFORM_NAME;
+ $version = $data->site->hubzilla->RED_VERSION;
+ $network = NETWORK_DIASPORA;
+ }
+ if (isset($data->site->redmatrix)) {
+ if (isset($data->site->redmatrix->PLATFORM_NAME)) {
+ $platform = $data->site->redmatrix->PLATFORM_NAME;
+ } elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
+ $platform = $data->site->redmatrix->RED_PLATFORM;
+ }
- $version = $data->site->redmatrix->RED_VERSION;
- $network = NETWORK_DIASPORA;
- }
- if (isset($data->site->friendica)) {
- $platform = $data->site->friendica->FRIENDICA_PLATFORM;
- $version = $data->site->friendica->FRIENDICA_VERSION;
- $network = NETWORK_DFRN;
- }
+ $version = $data->site->redmatrix->RED_VERSION;
+ $network = NETWORK_DIASPORA;
+ }
+ if (isset($data->site->friendica)) {
+ $platform = $data->site->friendica->FRIENDICA_PLATFORM;
+ $version = $data->site->friendica->FRIENDICA_VERSION;
+ $network = NETWORK_DFRN;
+ }
- $site_name = $data->site->name;
+ $site_name = $data->site->name;
- $data->site->closed = poco_to_boolean($data->site->closed);
- $data->site->private = poco_to_boolean($data->site->private);
- $data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
+ $data->site->closed = poco_to_boolean($data->site->closed);
+ $data->site->private = poco_to_boolean($data->site->private);
+ $data->site->inviteonly = poco_to_boolean($data->site->inviteonly);
- if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
- $register_policy = REGISTER_APPROVE;
- } elseif (!$data->site->closed && !$data->site->private) {
- $register_policy = REGISTER_OPEN;
- } else {
- $register_policy = REGISTER_CLOSED;
+ if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
+ $register_policy = REGISTER_APPROVE;
+ } elseif (!$data->site->closed && !$data->site->private) {
+ $register_policy = REGISTER_OPEN;
+ } else {
+ $register_policy = REGISTER_CLOSED;
+ }
}
}
}
$version = preg_replace("=(.+)-(.{4,})=ism", "$1", $version);
}
- $site_name = $data->name;
+ if (!empty($data->name)) {
+ $site_name = $data->name;
+ }
- if (isset($data->network)) {
+ if (!empty($data->network)) {
$platform = $data->network;
}
);
$list = array();
- foreach ($r2 AS $suggestion) {
+ foreach ($r2 as $suggestion) {
$list[$suggestion["nurl"]] = $suggestion;
}
- foreach ($r AS $suggestion) {
+ foreach ($r as $suggestion) {
$list[$suggestion["nurl"]] = $suggestion;
}
$done = array();
/// @TODO Check if it is really neccessary to poll the own server
- poco_load(0, 0, 0, App::get_baseurl() . '/poco');
+ poco_load(0, 0, 0, System::baseUrl() . '/poco');
- $done[] = App::get_baseurl() . '/poco';
+ $done[] = System::baseUrl() . '/poco';
if (strlen(get_config('system','directory'))) {
$x = fetch_url(get_server()."/pubsites");
return;
}
- foreach ($serverlist AS $server) {
+ foreach ($serverlist as $server) {
$server_url = str_replace("/index.php", "", $server->url);
$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
if (!dbm::is_result($r)) {
logger("Call server check for server ".$server_url, LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server_url));
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
}
}
}
if ($serverdata) {
$servers = json_decode($serverdata);
- foreach ($servers->pods AS $server) {
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host));
+ foreach ($servers->pods as $server) {
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
}
}
if ($serverdata) {
$servers = json_decode($serverdata);
- foreach ($servers AS $server) {
+ foreach ($servers as $server) {
$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url));
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
}
}
}
// if ($result["success"]) {
// $servers = json_decode($result["body"]);
- // foreach($servers->data AS $server)
+ // foreach($servers->data as $server)
// poco_check_server($server->instance_address);
// }
//}
$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
if (dbm::is_result($r)) {
- foreach ($r AS $server) {
+ foreach ($r as $server) {
if (!poco_check_server($server["url"], $server["network"])) {
// The server is not reachable? Okay, then we will try it later
}
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id']));
+ proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
if (!$complete && (--$no_of_queries == 0)) {
break;
return;
}
- foreach ($data->entry AS $entry) {
+ foreach ($data->entry as $entry) {
$username = "";
if (isset($entry->urls)) {
foreach ($entry->urls as $url) {
$success = false;
- foreach ($data->entry AS $entry) {
+ foreach ($data->entry as $entry) {
$profile_url = '';
$profile_photo = '';
$connect_url = '';
}
if ($new_url != $url) {
- logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG);
+ logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".System::callstack(), LOGGER_DEBUG);
}
return $new_url;
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
$data = probe_url($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
- logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+ logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"];
$contact["addr"] = $data["addr"];
$contact["alias"] = $data["alias"];
$doprobing = false;
if (in_array($contact["network"], array(NETWORK_PHANTOM))) {
- logger("Invalid network for contact url ".$contact["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+ logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
return false;
}
if ($doprobing) {
logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
+ proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
}
return $gcontact_id;
// Get all field names
$fields = array();
- foreach ($r[0] AS $field => $data) {
+ foreach ($r[0] as $field => $data) {
$fields[$field] = $data;
}
}
// assign all unassigned fields from the database entry
- foreach ($fields as $field => $data)
+ foreach ($fields as $field => $data) {
if (!isset($contact[$field]) || ($contact[$field] == "")) {
$contact[$field] = $r[0][$field];
}
$contact["updated"] = dbm::date();
}
- if ($contact["server_url"] == "") {
- $server_url = $contact["url"];
-
- $server_url = matching_url($server_url, $contact["alias"]);
- if ($server_url != "") {
- $contact["server_url"] = $server_url;
- }
-
- $server_url = matching_url($server_url, $contact["photo"]);
- if ($server_url != "") {
- $contact["server_url"] = $server_url;
- }
+ if ($contact["network"] == NETWORK_TWITTER) {
+ $contact["server_url"] = 'http://twitter.com';
+ }
- $server_url = matching_url($server_url, $contact["notify"]);
- if ($server_url != "") {
- $contact["server_url"] = $server_url;
+ if ($contact["server_url"] == "") {
+ $data = Probe::uri($contact["url"]);
+ if ($data["network"] != NETWORK_PHANTOM) {
+ $contact["server_url"] = $data['baseurl'];
}
} else {
$contact["server_url"] = normalise_link($contact["server_url"]);
unset($fields["generation"]);
if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) {
- foreach ($fields AS $field => $data) {
+ foreach ($fields as $field => $data) {
if ($contact[$field] != $r[0][$field]) {
logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true;
if ($update) {
logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
-
- q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
- `birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
- `contact-type` = %d, `alias` = '%s', `notify` = '%s', `url` = '%s',
- `location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
- `server_url` = '%s', `connect` = '%s'
- WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)",
- dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]),
- dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]),
- dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
- intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
- dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
- dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
- dbesc($contact["server_url"]), dbesc($contact["connect"]),
- dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
-
+ $condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
+ normalise_link($contact["url"]), $contact["generation"]);
+ $contact["updated"] = dbm::date($contact["updated"]);
+
+ $updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
+ 'nick' => $contact['nick'], 'addr' => $contact['addr'],
+ 'network' => $contact['network'], 'birthday' => $contact['birthday'],
+ 'gender' => $contact['gender'], 'keywords' => $contact['keywords'],
+ 'hide' => $contact['hide'], 'nsfw' => $contact['nsfw'],
+ 'contact-type' => $contact['contact-type'], 'alias' => $contact['alias'],
+ 'notify' => $contact['notify'], 'url' => $contact['url'],
+ 'location' => $contact['location'], 'about' => $contact['about'],
+ 'generation' => $contact['generation'], 'updated' => $contact['updated'],
+ 'server_url' => $contact['server_url'], 'connect' => $contact['connect']);
+
+ dba::update('gcontact', $updated, $condition, $fields);
// Now update the contact entry with the user id "0" as well.
// This is used for the shadow copies of public items.
dbesc(normalise_link($contact["url"])));
if (dbm::is_result($r)) {
- logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
+ logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
- q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
- `network` = '%s', `bd` = '%s', `gender` = '%s',
- `keywords` = '%s', `alias` = '%s', `contact-type` = %d,
- `url` = '%s', `location` = '%s', `about` = '%s'
- WHERE `id` = %d",
- dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
- dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]),
- dbesc($contact["keywords"]), dbesc($contact["alias"]), intval($contact["contact-type"]),
- dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
- intval($r[0]["id"]));
+ $fields = array('name', 'nick', 'addr',
+ 'network', 'bd', 'gender',
+ 'keywords', 'alias', 'contact-type',
+ 'url', 'location', 'about');
+ $old_contact = dba::select('contact', $fields, array('id' => $r[0]["id"]), array('limit' => 1));
+
+ // Update it with the current values
+ $fields = array('name' => $contact['name'], 'nick' => $contact['nick'],
+ 'addr' => $contact['addr'], 'network' => $contact['network'],
+ 'bd' => $contact['birthday'], 'gender' => $contact['gender'],
+ 'keywords' => $contact['keywords'], 'alias' => $contact['alias'],
+ 'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
+ 'location' => $contact['location'], 'about' => $contact['about']);
+
+ dba::update('contact', $fields, array('id' => $r[0]["id"]), $old_contact);
}
}
$data = probe_url($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) {
- logger("Invalid network for contact url ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+ logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
return;
}
// The "addr" field was added in 3.4.3 so it can be empty for older users
if ($r[0]["addr"] != "") {
- $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
+ $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", System::baseUrl());
} else {
$addr = $r[0]["addr"];
}
"notify" => $r[0]["notify"], "url" => $r[0]["url"],
"hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
"nick" => $r[0]["nickname"], "addr" => $addr,
- "connect" => $addr, "server_url" => App::get_baseurl(),
+ "connect" => $addr, "server_url" => System::baseUrl(),
"generation" => 1, "network" => NETWORK_DFRN);
update_gcontact($gcontact);
}
if (is_object($statistics->users)) {
- foreach ($statistics->users AS $nick => $user) {
+ foreach ($statistics->users as $nick => $user) {
$profile_url = $server."/".$user->nickname;
$contact = array("url" => $profile_url,
"nick" => $user->nickname,
"about" => $user->bio,
"network" => NETWORK_OSTATUS,
- "photo" => App::get_baseurl()."/images/person-175.jpg");
+ "photo" => System::baseUrl()."/images/person-175.jpg");
get_gcontact_id($contact);
}
}
return;
}
- foreach ($r AS $server) {
+ foreach ($r as $server) {
gs_fetch_users($server["url"]);
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
}
projects / friendica.git / blobdiff