keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed parameter order for "getbyURLForUser"

Browse source
This commit is contained in:
Michael 2020-07-15 17:22:12 +00:00
parent fc0312451d
commit e374aecc46
11 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/common.php
View file

@ -57,7 +57,7 @@ function common_content(App $a)
if (DBA::isResult($contact)) {
DI::page()['aside'] = "";
Model\Profile::load($a, "", Model\Contact::getByURLForUser($contact["url"], 0, [], false));
Model\Profile::load($a, "", Model\Contact::getByURL($contact["url"], false));
}
} else {
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
@ -124,7 +124,7 @@ function common_content(App $a)
$entries = [];
foreach ($common_friends as $common_friend) {
//get further details of the contact
$contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid, [], false);
$contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid, false);
// $rr['id'] is needed to use contact_photo_menu()
/// @TODO Adding '/" here avoids E_NOTICE on missing constants

2
mod/display.php
View file

@ -164,7 +164,7 @@ function display_fetchauthor($a, $item)
$profiledata["about"] = "";
}
$profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), [], false));
$profiledata = array_merge($profiledata, Contact::getByURLForUser($profiledata["url"], local_user(), false));
if (!empty($profiledata["photo"])) {
$profiledata["photo"] = DI::baseUrl()->remove($profiledata["photo"]);

2
mod/suggest.php
View file

@ -104,7 +104,7 @@ function suggest_content(App $a)
'hide' => [DI::l10n()->t('Ignore/Hide'), $ignlnk]
];
$contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user(), [], false));
$contact_details = array_merge($rr, Contact::getByURLForUser($rr["url"], local_user(), false));
$entry = [
'url' => Contact::magicLink($rr['url']),

2
src/Content/Item.php
View file

@ -150,7 +150,7 @@ class Item
// Try to detect the contact in various ways
if (strpos($name, 'http://') || strpos($name, '@')) {
$contact = Contact::getByURLForUser($name, $profile_uid, []);
$contact = Contact::getByURLForUser($name, $profile_uid);
} else {
$contact = false;
$fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];

6
src/Core/Search.php
View file

@ -77,7 +77,7 @@ class Search
// Ensure that we do have a contact entry
Contact::getIdForURL($user_data['url'] ?? '');
$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), [], false);
$contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user(), false);
$result = new ContactResult(
$user_data['name'] ?? '',
@ -143,7 +143,7 @@ class Search
foreach ($profiles as $profile) {
$profile_url = $profile['url'] ?? '';
$contactDetails = Contact::getByURLForUser($profile_url, local_user(), [], false);
$contactDetails = Contact::getByURLForUser($profile_url, local_user(), false);
$result = new ContactResult(
$profile['name'] ?? '',
@ -232,7 +232,7 @@ class Search
continue;
}
$contact = Contact::getByURLForUser($row["nurl"], local_user(), [], false);
$contact = Contact::getByURLForUser($row["nurl"], local_user(), false);
if ($contact["name"] == "") {
$contact["name"] = end(explode("/", $urlParts["path"]));

2
src/Model/Contact.php
View file

@ -238,7 +238,7 @@ class Contact
* @param boolean $update true = always update, false = never update, null = update when not found or outdated
* @return array contact array
*/
public static function getByURLForUser(string $url, int $uid = 0, array $fields = [], $update = null)
public static function getByURLForUser(string $url, int $uid = 0, $update = null, array $fields = [])
{
if ($uid != 0) {
$contact = self::getByURL($url, $update, $fields, $uid);

2
src/Model/GContact.php
View file

@ -111,7 +111,7 @@ class GContact
continue;
}
$gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user(), [], false);
$gcontacts[] = Contact::getByURLForUser($result['nurl'], local_user(), false);
}
DBA::close($results);
return $gcontacts;

2
src/Module/AllFriends.php
View file

@ -79,7 +79,7 @@ class AllFriends extends BaseModule
$entries = [];
foreach ($friends as $friend) {
//get further details of the contact
$contactDetails = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid, [], false));
$contactDetails = array_merge($friend, Model\Contact::getByURLForUser($friend['url'], $uid, false));
$connlnk = '';
// $friend[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photoMenu

2
src/Module/Contact/Hovercard.php
View file

@ -65,7 +65,7 @@ class Hovercard extends BaseModule
// Search for contact data
// Look if the local user has got the contact
if (Session::isAuthenticated()) {
$contact = Contact::getByURLForUser($contact_url, local_user(), [], false);
$contact = Contact::getByURLForUser($contact_url, local_user(), false);
} else {
$contact = Contact::getByURL($contact_url, false);
}

2
src/Module/Profile/Contacts.php
View file

@ -103,7 +103,7 @@ class Contacts extends BaseProfile
continue;
}
$contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid'], [], false));
$contact_details = array_merge($contact, Contact::getByURLForUser($contact['url'], $a->profile['uid'], false));
$contacts[] = [
'id' => $contact['id'],

2
src/Protocol/DFRN.php
View file

@ -755,7 +755,7 @@ class DFRN
{
$author = $doc->createElement($element);
$contact = Contact::getByURLForUser($contact_url, $item["uid"], ['url', 'name', 'addr', 'photo']);
$contact = Contact::getByURLForUser($contact_url, $item["uid"], null, ['url', 'name', 'addr', 'photo']);
if (!empty($contact)) {
XML::addElement($doc, $author, "name", $contact["name"]);
XML::addElement($doc, $author, "uri", $contact["url"]);