<?php
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
-require_once('include/socgraph.php');
-require_once('include/datetime.php');
+require_once 'include/probe.php';
+require_once 'include/socgraph.php';
+require_once 'include/datetime.php';
function discover_poco_run(&$argv, &$argc) {
continue;
}
+ $server_url = poco_detect_server($user["url"]);
+ $force_update = false;
+
if ($user["server_url"] != "") {
+
+ $force_update = (normalise_link($user["server_url"]) != normalise_link($server_url));
+
$server_url = $user["server_url"];
- } else {
- $server_url = poco_detect_server($user["url"]);
}
- if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR poco_check_server($server_url, $user["network"])) {
+
+ if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) {
logger('Check profile '.$user["url"]);
proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
$j = json_decode($x);
if (count($j->results)) {
- foreach($j->results as $jj) {
+ foreach ($j->results as $jj) {
// Check if the contact already exists
$exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
- if ($exists) {
+ if (dbm::is_result($exists)) {
logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
if ($data["network"] == NETWORK_DFRN) {
logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
- poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
+
+ if ($jj->tags != "") {
+ $data["keywords"] = $jj->tags;
+ }
+
+ $data["server_url"] = $data["baseurl"];
+
+ update_gcontact($data);
} else {
logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
}
if (!$result["success"]) {
return false;
}
+
$contacts = json_decode($result["body"]);
if ($contacts->status == 'ERROR') {
return false;
}
- foreach($contacts->data AS $user) {
- //update_gcontact_from_probe($user->site_address."/".$user->name);
+
+ /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case)
+ /// @TODO find all those and convert to all lower-case which is a keyword then
+ foreach ($contacts->data AS $user) {
$contact = probe_url($user->site_address."/".$user->name);
if ($contact["network"] != NETWORK_PHANTOM) {
$contact["about"] = $user->description;