use Friendica\App;
use Friendica\Core\System;
use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
use Friendica\Network\Probe;
require_once 'include/datetime.php';
-require_once 'include/probe.php';
require_once 'include/network.php';
require_once 'include/html2bbcode.php';
require_once 'include/Contact.php';
*/
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", (int)$cid, (int)$uid, (int)$zcid, $url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
}
/**
$r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
intval($cid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$url = $r[0]['poco'];
$uid = $r[0]['uid'];
}
$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'] = "";
}
$r = q("SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$gcontact['network'] = $r[0]["network"];
}
$r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$gcontact['network'] = $r[0]["network"];
}
}
dbesc(normalise_link($gcontact['url']))
);
- if (dbm::is_result($x)) {
+ if (DBM::is_result($x)) {
if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
$gcontact['network'] = $x[0]["network"];
}
if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
// Delete the old entry - if it exists
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
}
intval($zcid)
);
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
intval($cid),
intval($uid),
$r = q("SELECT `id` FROM `gserver` WHERE `nurl` = '%s' AND `last_contact` > `last_failure`",
dbesc(normalise_link($server_url)));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
return $server_url;
}
$gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($profile)));
- if (!dbm::is_result($gcontacts)) {
+ if (!DBM::is_result($gcontacts)) {
return false;
}
}
}
q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
- dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
+ dbesc(DBM::date($last_updated)), dbesc(DBM::date()), dbesc(normalise_link($profile)));
if (($gcontacts[0]["generation"] == 0)) {
q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
}
$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
- if (dbm::is_result($servers)) {
+ if (DBM::is_result($servers)) {
if ($servers[0]["created"] <= NULL_DATE) {
q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
// Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits.
- if (dbm::is_result($servers) && ($orig_server_url == $server_url) &&
+ 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::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
}
// 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) {
$version = $data->version;
$network = NETWORK_DIASPORA;
}
- $site_name = $data->site_name;
+ if (!empty($data->site_name)) {
+ $site_name = $data->site_name;
+ }
switch ($data->register_policy) {
case "REGISTER_OPEN":
$register_policy = REGISTER_OPEN;
$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;
}
);
// logger("count_common_friends: $uid $cid {$r[0]['total']}");
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
intval($limit)
);
- /// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+ /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
return $r;
}
intval($uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
intval($limit)
);
- /// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+ /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
return $r;
}
intval($uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
return $r[0]['total'];
}
return 0;
intval($limit)
);
- /// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+ /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
return $r;
}
$network = array(NETWORK_DFRN);
- if (get_config('system','diaspora_enabled')) {
+ if (Config::get('system','diaspora_enabled')) {
$network[] = NETWORK_DIASPORA;
}
- if (!get_config('system','ostatus_disabled')) {
+ if (!Config::get('system','ostatus_disabled')) {
$network[] = NETWORK_OSTATUS;
}
intval($limit)
);
- if (dbm::is_result($r) && count($r) >= ($limit -1)) {
+ if (DBM::is_result($r) && count($r) >= ($limit -1)) {
/*
* Uncommented because the result of the queries are to big to store it in the cache.
* We need to decide if we want to change the db column type or if we want to delete it.
$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'))) {
+ if (strlen(Config::get('system','directory'))) {
$x = fetch_url(get_server()."/pubsites");
if ($x) {
$j = json_decode($x);
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $rr) {
$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
if (! in_array($base,$done)) {
$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)) {
+ if (!DBM::is_result($r)) {
logger("Call server check for server ".$server_url, LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
}
}
}
function poco_discover_federation() {
- $last = get_config('poco','last_federation_discovery');
+ $last = Config::get('poco','last_federation_discovery');
if ($last) {
$next = $last + (24 * 60 * 60);
$servers = json_decode($serverdata);
foreach ($servers->pods as $server) {
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", "https://".$server->host);
}
}
foreach ($servers as $server) {
$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
+ Worker::add(PRIORITY_LOW, "discover_poco", "server", $url);
}
}
}
// Currently disabled, since the service isn't available anymore.
// It is not removed since I hope that there will be a successor.
// Discover GNU Social Servers.
- //if (!get_config('system','ostatus_disabled')) {
+ //if (!Config::get('system','ostatus_disabled')) {
// $serverdata = "http://gstools.org/api/get_open_instances/";
// $result = z_fetch_url($serverdata);
// }
//}
- set_config('poco','last_federation_discovery', time());
+ Config::set('poco','last_federation_discovery', time());
}
function poco_discover_single_server($id) {
$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
return false;
}
poco_discover_server($data, 2);
- if (get_config('system','poco_discovery') > 1) {
+ if (Config::get('system','poco_discovery') > 1) {
- $timeframe = get_config('system','poco_discovery_since');
+ $timeframe = Config::get('system','poco_discovery_since');
if ($timeframe == 0) {
$timeframe = 30;
}
$success = poco_discover_server(json_decode($retdata["body"]));
}
- if (!$success && (get_config('system','poco_discovery') > 2)) {
+ if (!$success && (Config::get('system','poco_discovery') > 2)) {
logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server);
}
$no_of_queries = 5;
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
if ($requery_days == 0) {
$requery_days = 7;
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
$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)) {
+ if (DBM::is_result($r)) {
foreach ($r as $server) {
if (!poco_check_server($server["url"], $server["network"])) {
}
logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
- proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
+ Worker::add(PRIORITY_LOW, "discover_poco", "update_server_directory", (int)$server['id']);
if (!$complete && (--$no_of_queries == 0)) {
break;
}
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;
*/
function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
- $data = probe_url($contact["url"]);
+ $data = Probe::uri($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;
}
$r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($contact["url"])));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$gcontact_id = $r[0]["id"];
// Update every 90 days
$r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
dbesc(normalise_link($contact["url"])));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$gcontact_id = $r[0]["id"];
$doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
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', $contact["url"]);
+ Worker::add(PRIORITY_LOW, 'gprobe', $contact["url"]);
}
return $gcontact_id;
fix_alternate_contact_address($contact);
if (!isset($contact["updated"])) {
- $contact["updated"] = dbm::date();
+ $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"]);
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.
$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
dbesc(normalise_link($contact["url"])));
- if (dbm::is_result($r)) {
- logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
+ if (DBM::is_result($r)) {
+ 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);
}
}
* @param str $url profile link
*/
function update_gcontact_from_probe($url) {
- $data = probe_url($url);
+ $data = Probe::uri($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);
"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);
}
}
*/
function gs_discover() {
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
$r = q("SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
dbesc(NETWORK_OSTATUS), dbesc($last_update));
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
return;
}
ORDER BY `last_contact`
LIMIT 1000",
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
return false;
}
projects / friendica.git / blobdiff