bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Moved the detection for centralized networks.

Browse source
This commit is contained in:
Michael Vogel 2015-07-29 06:31:18 +02:00
parent b7c9b942f1
commit 098ccd09fa
2 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/discover_poco.php
View file

@ -13,10 +13,10 @@ function discover_poco_run(&$argv, &$argc){
if(is_null($db)) { if(is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
require_once('include/session.php'); require_once('include/session.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
@ -53,12 +53,12 @@ function discover_poco_run(&$argv, &$argc){
if($pidfile->is_already_running()) { if($pidfile->is_already_running()) {
logger("discover_poco: Already running"); logger("discover_poco: Already running");
if ($pidfile->running_time() > 19*60) { if ($pidfile->running_time() > 19*60) {
$pidfile->kill(); $pidfile->kill();
logger("discover_poco: killed stale process"); logger("discover_poco: killed stale process");
// Calling a new instance // Calling a new instance
if ($mode == 0) if ($mode == 0)
proc_run('php','include/discover_poco.php'); proc_run('php','include/discover_poco.php');
} }
exit; exit;
} }
} }
@ -98,8 +98,28 @@ function discover_users() {
foreach ($users AS $user) { foreach ($users AS $user) {
if ($user[0]["server_url"] != "") $urlparts = parse_url($user["url"]);
$server_url = $user[0]["server_url"]; if (!isset($urlparts["scheme"])) {
q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
dbesc(NETWORK_PHANTOM), dbesc(normalise_link($user["url"])));
continue;
}
if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
"identi.ca", "alpha.app.net"))) {
$networks = array("www.facebook.com" => NETWORK_FACEBOOK,
"facebook.com" => NETWORK_FACEBOOK,
"twitter.com" => NETWORK_TWITTER,
"identi.ca" => NETWORK_PUMPIO,
"alpha.app.net" => NETWORK_APPNET);
q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
dbesc($networks[$urlparts["host"]]), dbesc(normalise_link($user["url"])));
continue;
}
if ($user["server_url"] != "")
$server_url = $user["server_url"];
else else
$server_url = poco_detect_server($user["url"]); $server_url = poco_detect_server($user["url"]);

17
include/socgraph.php
View file

@ -413,23 +413,6 @@ function poco_last_updated($profile, $force = false) {
q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'", q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'",
dbesc(datetime_convert()), dbesc(normalise_link($profile))); dbesc(datetime_convert()), dbesc(normalise_link($profile)));
$urlparts = parse_url($profile);
if (!isset($urlparts["scheme"]))
return;
if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
"identi.ca", "alpha.app.net"))) {
$networks = array("www.facebook.com" => NETWORK_FACEBOOK,
"facebook.com" => NETWORK_FACEBOOK,
"twitter.com" => NETWORK_TWITTER,
"identi.ca" => NETWORK_PUMPIO,
"alpha.app.net" => NETWORK_APPNET);
q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
dbesc($networks[$urlparts["host"]]), dbesc(normalise_link($profile)));
return;
}
if ($gcontacts[0]["server_url"] != "") if ($gcontacts[0]["server_url"] != "")
$server_url = $gcontacts[0]["server_url"]; $server_url = $gcontacts[0]["server_url"];
else else