From: Michael Date: Thu, 6 Aug 2020 10:31:05 +0000 (+0000) Subject: Renamed function X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=2cbc9359446625c679352dfd759638d45339885b;p=friendica.git Renamed function --- diff --git a/src/Model/FContact.php b/src/Model/FContact.php index 07e8af4075..c4d6251c3b 100644 --- a/src/Model/FContact.php +++ b/src/Model/FContact.php @@ -40,7 +40,7 @@ class FContact * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function getByUrl($handle, $update = null) + public static function getByURL($handle, $update = null) { $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]); if (!DBA::isResult($person)) { @@ -77,7 +77,7 @@ class FContact if ($r && ($r["network"] === Protocol::DIASPORA)) { self::updateFContact($r); - $person = self::getByUrl($handle, false); + $person = self::getByURL($handle, false); } } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e10cc6915c..96b1450aed 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1410,7 +1410,7 @@ class DFRN } } - $fcontact = FContact::getByUrl($contact['addr']); + $fcontact = FContact::getByURL($contact['addr']); if (empty($fcontact)) { Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); return -22; diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index be32eb88b4..c77e1610d0 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -937,7 +937,7 @@ class Diaspora Logger::log("Fetching diaspora key for: ".$handle); - $r = FContact::getByUrl($handle); + $r = FContact::getByURL($handle); if ($r) { return $r["pubkey"]; } @@ -1020,7 +1020,7 @@ class Diaspora */ public static function isSupportedByContactUrl($url, $update = null) { - return !empty(FContact::getByUrl($url, $update)); + return !empty(FContact::getByURL($url, $update)); } /** @@ -1379,7 +1379,7 @@ class Diaspora $item = Item::selectFirst($fields, $condition); if (!DBA::isResult($item)) { - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); $result = self::storeByGuid($guid, $person["url"], $uid); // We don't have an url for items that arrived at the public dispatcher @@ -1602,7 +1602,7 @@ class Diaspora if (DBA::isResult($item)) { return $item["uri"]; } elseif (!$onlyfound) { - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); $parts = parse_url($person['url']); unset($parts['path']); @@ -1658,7 +1658,7 @@ class Diaspora continue; } - $person = FContact::getByUrl($match[3]); + $person = FContact::getByURL($match[3]); if (empty($person)) { continue; } @@ -1714,7 +1714,7 @@ class Diaspora return false; } - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); if (!is_array($person)) { Logger::log("unable to find author details"); return false; @@ -1829,7 +1829,7 @@ class Diaspora $body = Markdown::toBBCode($msg_text); $message_uri = $msg_author.":".$msg_guid; - $person = FContact::getByUrl($msg_author); + $person = FContact::getByURL($msg_author); return Mail::insert([ 'uid' => $importer['uid'], @@ -1946,7 +1946,7 @@ class Diaspora return false; } - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); if (!is_array($person)) { Logger::log("unable to find author details"); return false; @@ -2052,7 +2052,7 @@ class Diaspora $message_uri = $author.":".$guid; - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); if (!$person) { Logger::log("unable to find author details"); return false; @@ -2118,7 +2118,7 @@ class Diaspora return false; } - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); if (!is_array($person)) { Logger::log("Person not found: ".$author); return false; @@ -2392,7 +2392,7 @@ class Diaspora Logger::log("Author ".$author." wants to listen to us.", Logger::DEBUG); } - $ret = FContact::getByUrl($author); + $ret = FContact::getByURL($author); if (!$ret || ($ret["network"] != Protocol::DIASPORA)) { Logger::log("Cannot resolve diaspora handle ".$author." for ".$recipient); @@ -2680,7 +2680,7 @@ class Diaspora $target_guid = Strings::escapeTags(XML::unescape($data->target_guid)); $target_type = Strings::escapeTags(XML::unescape($data->target_type)); - $person = FContact::getByUrl($author); + $person = FContact::getByURL($author); if (!is_array($person)) { Logger::log("unable to find author detail for ".$author); return false; @@ -3083,7 +3083,7 @@ class Diaspora // We always try to use the data from the fcontact table. // This is important for transmitting data to Friendica servers. if (!empty($contact['addr'])) { - $fcontact = FContact::getByUrl($contact['addr']); + $fcontact = FContact::getByURL($contact['addr']); if (!empty($fcontact)) { $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]); } diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 5278a7647f..9027598c4e 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -268,7 +268,7 @@ class Delivery private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora - if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByUrl($contact['addr'], false))) { + if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) { Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return;