*/
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);
}
/**
$uid = $r[0]['uid'];
}
}
- if (! $uid)
+ if (! $uid) {
return;
+ }
}
- if (! $url)
+ if (! $url) {
return;
+ }
$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG);
- if (($a->get_curl_code() > 299) || (! $s))
+ if (($a->get_curl_code() > 299) || (! $s)) {
return;
+ }
$j = json_decode($s);
logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
- if (! isset($j->entry))
+ if (! isset($j->entry)) {
return;
+ }
$total = 0;
foreach ($j->entry as $entry) {
}
}
- if (isset($entry->contactType) && ($entry->contactType >= 0))
+ if (isset($entry->contactType) && ($entry->contactType >= 0)) {
$contact_type = $entry->contactType;
+ }
$gcontact = array("url" => $profile_url,
"name" => $name,
dbesc(normalise_link($gcontact['url']))
);
- if (count($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 ($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($gcid),
intval($zcid)
);
+
if (!dbm::is_result($r)) {
q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
intval($cid),
$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;
function poco_do_update($created, $updated, $last_failure, $last_contact) {
$now = strtotime(datetime_convert());
- if ($updated > $last_contact)
+ if ($updated > $last_contact) {
$contact_time = strtotime($updated);
- else
+ } else {
$contact_time = strtotime($last_contact);
+ }
$failure_time = strtotime($last_failure);
$created_time = strtotime($created);
// If there is no "created" time then use the current time
- if ($created_time <= 0)
+ if ($created_time <= 0) {
$created_time = $now;
+ }
// If the last contact was less than 24 hours then don't update
- if (($now - $contact_time) < (60 * 60 * 24))
+ if (($now - $contact_time) < (60 * 60 * 24)) {
return false;
+ }
// If the last failure was less than 24 hours then don't update
- if (($now - $failure_time) < (60 * 60 * 24))
+ if (($now - $failure_time) < (60 * 60 * 24)) {
return false;
+ }
// If the last contact was less than a week ago and the last failure is older than a week then don't update
//if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time))
// return false;
// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
- if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7)))
+ if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) {
return false;
+ }
// If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
- if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30)))
+ if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) {
return false;
+ }
return true;
}
function poco_to_boolean($val) {
- if (($val == "true") || ($val == 1))
- return(true);
- if (($val == "false") || ($val == 0))
- return(false);
+ if (($val == "true") || ($val == 1)) {
+ return true;
+ } elseif (($val == "false") || ($val == 0)) {
+ return false;
+ }
- return ($val);
+ return $val;
}
/**
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;
}
$attr[$attribute->name] = $attribute->value;
}
}
- if ($attr['property'] == 'generator') {
- if (in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
- $server = array();
- $server["platform"] = $attr['content'];
- $server["version"] = "";
- $server["network"] = NETWORK_DIASPORA;
- }
+ if ($attr['property'] == 'generator' && in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) {
+ $server = array();
+ $server["platform"] = $attr['content'];
+ $server["version"] = "";
+ $server["network"] = NETWORK_DIASPORA;
}
}
}
$server_url = trim($server_url, "/");
$server_url = str_replace("/index.php", "", $server_url);
- if ($server_url == "")
+ if ($server_url == "") {
return false;
+ }
$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
if (dbm::is_result($servers)) {
$poco = $servers[0]["poco"];
$noscrape = $servers[0]["noscrape"];
- if ($network == "")
+ if ($network == "") {
$network = $servers[0]["network"];
+ }
$last_contact = $servers[0]["last_contact"];
$last_failure = $servers[0]["last_failure"];
}
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;
+ }
+ $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;
+ }
}
}
}
if (($last_contact <= $last_failure) && !$failure) {
logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG);
- } else if (($last_contact >= $last_failure) && $failure) {
+ } elseif (($last_contact >= $last_failure) && $failure) {
logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG);
}
dbesc(datetime_convert())
);
}
- logger("End discovery for server ".$server_url, LOGGER_DEBUG);
+ logger("End discovery for server " . $server_url, LOGGER_DEBUG);
return !$failure;
}
-function count_common_friends($uid,$cid) {
+function count_common_friends($uid, $cid) {
$r = q("SELECT count(*) as `total`
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
intval($cid)
);
-// logger("count_common_friends: $uid $cid {$r[0]['total']}");
- if (dbm::is_result($r))
+ // logger("count_common_friends: $uid $cid {$r[0]['total']}");
+ if (dbm::is_result($r)) {
return $r[0]['total'];
+ }
return 0;
}
-function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
+function common_friends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false) {
if ($shuffle) {
$sql_extra = " order by rand() ";
}
-function count_common_friends_zcid($uid,$zcid) {
+function count_common_friends_zcid($uid, $zcid) {
$r = q("SELECT count(*) as `total`
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
intval($uid)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
return $r[0]['total'];
+ }
return 0;
}
-function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) {
+function common_friends_zcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle = false) {
- if ($shuffle)
+ if ($shuffle) {
$sql_extra = " order by rand() ";
- else
+ } else {
$sql_extra = " order by `gcontact`.`name` asc ";
+ }
$r = q("SELECT `gcontact`.*
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
}
-function count_all_friends($uid,$cid) {
+function count_all_friends($uid, $cid) {
$r = q("SELECT count(*) as `total`
FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
}
-function all_friends($uid,$cid,$start = 0, $limit = 80) {
+function all_friends($uid, $cid, $start = 0, $limit = 80) {
$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
FROM `glink`
return array();
}
-// 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.
-// $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
-// if (!is_null($list)) {
-// return $list;
-// }
+ /*
+ * 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.
+ */
+ //$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit);
+ //if (!is_null($list)) {
+ // return $list;
+ //}
$network = array(NETWORK_DFRN);
);
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.
-// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
+ /*
+ * 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.
+ */
+ //Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
return $r;
}
);
$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;
}
array_pop($list);
}
-// 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.
-// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
+ /*
+ * 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.
+ */
+ //Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES);
return $list;
}
$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, App::get_baseurl() . '/poco');
$done[] = App::get_baseurl() . '/poco';
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 ($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];
}
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;
"country-name" => $r[0]["country-name"]));
// The "addr" field was added in 3.4.3 so it can be empty for older users
- if ($r[0]["addr"] != "")
+ if ($r[0]["addr"] != "") {
$addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
- else
+ } else {
$addr = $r[0]["addr"];
+ }
$gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"],
"gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"],
$url = $server."/main/statistics";
$result = z_fetch_url($url);
- if (!$result["success"])
+ if (!$result["success"]) {
return false;
+ }
$statistics = json_decode($result["body"]);
if (is_object($statistics->config)) {
- if ($statistics->config->instance_with_ssl)
+ if ($statistics->config->instance_with_ssl) {
$server = "https://";
- else
+ } else {
$server = "http://";
+ }
$server .= $statistics->config->instance_address;
$hostname = $statistics->config->instance_address;
} else {
- if ($statistics->instance_with_ssl)
+ /// @TODO is_object() above means here no object, still $statistics is being used as object
+ if ($statistics->instance_with_ssl) {
$server = "https://";
- else
+ } else {
$server = "http://";
+ }
$server .= $statistics->instance_address;
$hostname = $statistics->instance_address;
}
- if (is_object($statistics->users))
- foreach ($statistics->users AS $nick => $user) {
+ if (is_object($statistics->users)) {
+ foreach ($statistics->users as $nick => $user) {
$profile_url = $server."/".$user->nickname;
$contact = array("url" => $profile_url,
"photo" => App::get_baseurl()."/images/person-175.jpg");
get_gcontact_id($contact);
}
+ }
}
/**
$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 (!$r)
+ if (!dbm::is_result($r)) {
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"]));
}
if (!dbm::is_result($r)) {
return false;
}
+
return $r;
}
projects / friendica.git / blobdiff