Stopped using deprecated constants NETWORK_* (#5537)
* Rewrite: - stopped using deprecated NETWORK_* constants, now Protocol::* should be used - still left them intact for slow/lazy developers ... * Removed deprecated NETWORK_* constants as per code reviewer's request.
This commit is contained in:
Roland Häder
Hypolite Petovan
parent
c623465df2
commit
e06fc2aa69
59 changed files with 527 additions and 492 deletions
|
|
@ -8,6 +8,7 @@ namespace Friendica\Model;
|
|||
|
||||
use Exception;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
|
|
@ -39,15 +40,15 @@ class GContact
|
|||
|
||||
// check supported networks
|
||||
if (Config::get('system', 'diaspora_enabled')) {
|
||||
$diaspora = NETWORK_DIASPORA;
|
||||
$diaspora = Protocol::DIASPORA;
|
||||
} else {
|
||||
$diaspora = NETWORK_DFRN;
|
||||
$diaspora = Protocol::DFRN;
|
||||
}
|
||||
|
||||
if (!Config::get('system', 'ostatus_disabled')) {
|
||||
$ostatus = NETWORK_OSTATUS;
|
||||
$ostatus = Protocol::OSTATUS;
|
||||
} else {
|
||||
$ostatus = NETWORK_DFRN;
|
||||
$ostatus = Protocol::DFRN;
|
||||
}
|
||||
|
||||
// check if we search only communities or every contact
|
||||
|
|
@ -64,7 +65,7 @@ class GContact
|
|||
((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
|
||||
(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
|
||||
GROUP BY `nurl` ORDER BY `nurl` DESC LIMIT 1000",
|
||||
NETWORK_DFRN, $ostatus, $diaspora, $search, $search, $search
|
||||
Protocol::DFRN, $ostatus, $diaspora, $search, $search, $search
|
||||
);
|
||||
|
||||
$gcontacts = [];
|
||||
|
|
@ -156,13 +157,13 @@ class GContact
|
|||
}
|
||||
|
||||
// Don't store the statusnet connector as network
|
||||
// We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
|
||||
if ($gcontact['network'] == NETWORK_STATUSNET) {
|
||||
// We can't simply set this to Protocol::OSTATUS since the connector could have fetched posts from friendica as well
|
||||
if ($gcontact['network'] == Protocol::STATUSNET) {
|
||||
$gcontact['network'] = "";
|
||||
}
|
||||
|
||||
// Assure that there are no parameter fragments in the profile url
|
||||
if (in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
|
||||
if (in_array($gcontact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
|
||||
$gcontact['url'] = self::cleanContactUrl($gcontact['url']);
|
||||
}
|
||||
|
||||
|
|
@ -177,18 +178,18 @@ class GContact
|
|||
$r = q(
|
||||
"SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
|
||||
DBA::escape(normalise_link($gcontact['url'])),
|
||||
DBA::escape(NETWORK_STATUSNET)
|
||||
DBA::escape(Protocol::STATUSNET)
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
$gcontact['network'] = $r[0]["network"];
|
||||
}
|
||||
|
||||
if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) {
|
||||
if (($gcontact['network'] == "") || ($gcontact['network'] == Protocol::OSTATUS)) {
|
||||
$r = q(
|
||||
"SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
|
||||
DBA::escape($gcontact['url']),
|
||||
DBA::escape(normalise_link($gcontact['url'])),
|
||||
DBA::escape(NETWORK_STATUSNET)
|
||||
DBA::escape(Protocol::STATUSNET)
|
||||
);
|
||||
if (DBA::isResult($r)) {
|
||||
$gcontact['network'] = $r[0]["network"];
|
||||
|
|
@ -205,7 +206,7 @@ class GContact
|
|||
);
|
||||
|
||||
if (DBA::isResult($x)) {
|
||||
if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
|
||||
if (!isset($gcontact['network']) && ($x[0]["network"] != Protocol::STATUSNET)) {
|
||||
$gcontact['network'] = $x[0]["network"];
|
||||
}
|
||||
if ($gcontact['updated'] <= NULL_DATE) {
|
||||
|
|
@ -224,7 +225,7 @@ class GContact
|
|||
) {
|
||||
$data = Probe::uri($gcontact['url']);
|
||||
|
||||
if ($data["network"] == NETWORK_PHANTOM) {
|
||||
if ($data["network"] == Protocol::PHANTOM) {
|
||||
throw new Exception('Probing for URL '.$gcontact['url'].' failed');
|
||||
}
|
||||
|
||||
|
|
@ -234,7 +235,7 @@ class GContact
|
|||
|
||||
$gcontact = array_merge($gcontact, $data);
|
||||
|
||||
if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
|
||||
if ($alternate && ($gcontact['network'] == Protocol::OSTATUS)) {
|
||||
// Delete the old entry - if it exists
|
||||
if (DBA::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
|
||||
DBA::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
|
||||
|
|
@ -246,7 +247,7 @@ class GContact
|
|||
throw new Exception('No name and photo for URL '.$gcontact['url']);
|
||||
}
|
||||
|
||||
if (!in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
|
||||
if (!in_array($gcontact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
|
||||
throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
|
||||
}
|
||||
|
||||
|
|
@ -460,14 +461,14 @@ class GContact
|
|||
// return $list;
|
||||
//}
|
||||
|
||||
$network = [NETWORK_DFRN];
|
||||
$network = [Protocol::DFRN];
|
||||
|
||||
if (Config::get('system', 'diaspora_enabled')) {
|
||||
$network[] = NETWORK_DIASPORA;
|
||||
$network[] = Protocol::DIASPORA;
|
||||
}
|
||||
|
||||
if (!Config::get('system', 'ostatus_disabled')) {
|
||||
$network[] = NETWORK_OSTATUS;
|
||||
$network[] = Protocol::OSTATUS;
|
||||
}
|
||||
|
||||
$sql_network = implode("', '", $network);
|
||||
|
|
@ -580,8 +581,8 @@ class GContact
|
|||
// Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
|
||||
$r = q(
|
||||
"SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
|
||||
DBA::escape(NETWORK_DFRN),
|
||||
DBA::escape(NETWORK_DIASPORA)
|
||||
DBA::escape(Protocol::DFRN),
|
||||
DBA::escape(Protocol::DIASPORA)
|
||||
);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
|
|
@ -634,9 +635,9 @@ class GContact
|
|||
*/
|
||||
public static function fixAlternateContactAddress(&$contact)
|
||||
{
|
||||
if (($contact["network"] == NETWORK_OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
|
||||
if (($contact["network"] == Protocol::OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
|
||||
$data = Probe::uri($contact["url"]);
|
||||
if ($contact["network"] == NETWORK_OSTATUS) {
|
||||
if ($contact["network"] == Protocol::OSTATUS) {
|
||||
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
|
||||
$contact["url"] = $data["url"];
|
||||
$contact["addr"] = $data["addr"];
|
||||
|
|
@ -665,13 +666,13 @@ class GContact
|
|||
return false;
|
||||
}
|
||||
|
||||
if (in_array($contact["network"], [NETWORK_PHANTOM])) {
|
||||
if (in_array($contact["network"], [Protocol::PHANTOM])) {
|
||||
logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($contact["network"] == NETWORK_STATUSNET) {
|
||||
$contact["network"] = NETWORK_OSTATUS;
|
||||
if ($contact["network"] == Protocol::STATUSNET) {
|
||||
$contact["network"] = Protocol::OSTATUS;
|
||||
}
|
||||
|
||||
// All new contacts are hidden by default
|
||||
|
|
@ -683,7 +684,7 @@ class GContact
|
|||
self::fixAlternateContactAddress($contact);
|
||||
|
||||
// Remove unwanted parts from the contact url (e.g. "?zrl=...")
|
||||
if (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
|
||||
if (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
|
||||
$contact["url"] = self::cleanContactUrl($contact["url"]);
|
||||
}
|
||||
|
||||
|
|
@ -697,7 +698,7 @@ class GContact
|
|||
$gcontact_id = $r[0]["id"];
|
||||
|
||||
// Update every 90 days
|
||||
if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
|
||||
if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
|
||||
$last_failure_str = $r[0]["last_failure"];
|
||||
$last_failure = strtotime($r[0]["last_failure"]);
|
||||
$last_contact_str = $r[0]["last_contact"];
|
||||
|
|
@ -735,7 +736,7 @@ class GContact
|
|||
if (DBA::isResult($r)) {
|
||||
$gcontact_id = $r[0]["id"];
|
||||
|
||||
$doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
|
||||
$doprobing = in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""]);
|
||||
}
|
||||
}
|
||||
DBA::unlock();
|
||||
|
|
@ -810,8 +811,8 @@ class GContact
|
|||
|
||||
$fields["hide"] = $public_contact[0]["hide"];
|
||||
|
||||
if ($contact["network"] == NETWORK_STATUSNET) {
|
||||
$contact["network"] = NETWORK_OSTATUS;
|
||||
if ($contact["network"] == Protocol::STATUSNET) {
|
||||
$contact["network"] = Protocol::OSTATUS;
|
||||
}
|
||||
|
||||
// Replace alternate OStatus user format with the primary one
|
||||
|
|
@ -821,13 +822,13 @@ class GContact
|
|||
$contact["updated"] = DateTimeFormat::utcNow();
|
||||
}
|
||||
|
||||
if ($contact["network"] == NETWORK_TWITTER) {
|
||||
if ($contact["network"] == Protocol::TWITTER) {
|
||||
$contact["server_url"] = 'http://twitter.com';
|
||||
}
|
||||
|
||||
if ($contact["server_url"] == "") {
|
||||
$data = Probe::uri($contact["url"]);
|
||||
if ($data["network"] != NETWORK_PHANTOM) {
|
||||
if ($data["network"] != Protocol::PHANTOM) {
|
||||
$contact["server_url"] = $data['baseurl'];
|
||||
}
|
||||
} else {
|
||||
|
|
@ -923,7 +924,7 @@ class GContact
|
|||
{
|
||||
$data = Probe::uri($url);
|
||||
|
||||
if (in_array($data["network"], [NETWORK_PHANTOM])) {
|
||||
if (in_array($data["network"], [Protocol::PHANTOM])) {
|
||||
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
|
||||
return;
|
||||
}
|
||||
|
|
@ -972,7 +973,7 @@ class GContact
|
|||
"hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
|
||||
"nick" => $r[0]["nickname"], "addr" => $addr,
|
||||
"connect" => $addr, "server_url" => System::baseUrl(),
|
||||
"generation" => 1, "network" => NETWORK_DFRN];
|
||||
"generation" => 1, "network" => Protocol::DFRN];
|
||||
|
||||
self::update($gcontact);
|
||||
}
|
||||
|
|
@ -1028,7 +1029,7 @@ class GContact
|
|||
"name" => $user->fullname,
|
||||
"addr" => $user->nickname."@".$hostname,
|
||||
"nick" => $user->nickname,
|
||||
"network" => NETWORK_OSTATUS,
|
||||
"network" => Protocol::OSTATUS,
|
||||
"photo" => System::baseUrl()."/images/person-175.jpg"];
|
||||
|
||||
if (isset($user->bio)) {
|
||||
|
|
@ -1052,7 +1053,7 @@ class GContact
|
|||
|
||||
$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",
|
||||
DBA::escape(NETWORK_OSTATUS),
|
||||
DBA::escape(Protocol::OSTATUS),
|
||||
DBA::escape($last_update)
|
||||
);
|
||||
|
||||
|
|
@ -1076,7 +1077,7 @@ class GContact
|
|||
AND `last_contact` >= `last_failure`
|
||||
AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
|
||||
ORDER BY rand() LIMIT 1",
|
||||
DBA::escape(NETWORK_DFRN)
|
||||
DBA::escape(Protocol::DFRN)
|
||||
);
|
||||
|
||||
if (DBA::isResult($r)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue