clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change called method names 

- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
This commit is contained in:
Hypolite Petovan 2017-11-19 17:03:39 -05:00
parent b92fc24ff0
commit ec02af593d
48 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -984,10 +984,10 @@ function public_contact()
if (!$public_contact_id && x($_SESSION, 'authenticated')) { if (!$public_contact_id && x($_SESSION, 'authenticated')) {
if (x($_SESSION, 'my_address')) { if (x($_SESSION, 'my_address')) {
// Local user // Local user
$public_contact_id = intval(get_contact($_SESSION['my_address'], 0)); $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0));
} elseif (x($_SESSION, 'visitor_home')) { } elseif (x($_SESSION, 'visitor_home')) {
// Remote user // Remote user
$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0)); $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0));
} }
} elseif (!x($_SESSION, 'authenticated')) { } elseif (!x($_SESSION, 'authenticated')) {
$public_contact_id = false; $public_contact_id = false;

2
include/acl_selectors.php
View File

@ -692,7 +692,7 @@ function acl_lookup(App $a, $out_type = 'json') {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $row) { foreach ($r as $row) {
$contact = get_contact_details_by_url($row['author-link']); $contact = Contact::getDetailsByURL($row['author-link']);
if (count($contact) > 0) { if (count($contact) > 0) {
$unknown_contacts[] = array( $unknown_contacts[] = array(

4
include/api.php
View File

@ -650,7 +650,7 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
'notifications' => false, 'notifications' => false,
'statusnet_profile_url' => $r[0]["url"], 'statusnet_profile_url' => $r[0]["url"],
'uid' => 0, 'uid' => 0,
'cid' => get_contact($r[0]["url"], api_user(), true), 'cid' => Contact::getIdForURL($r[0]["url"], api_user(), true),
'self' => 0, 'self' => 0,
'network' => $r[0]["network"], 'network' => $r[0]["network"],
); );
@ -738,7 +738,7 @@ function api_get_user(App $a, $contact_id = null, $type = "json")
$network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']); $network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
$pcontact_id = get_contact($uinfo[0]['url'], 0, true); $pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true);
$ret = array( $ret = array(
'id' => intval($pcontact_id), 'id' => intval($pcontact_id),

4
include/bb2diaspora.php
View File

@ -24,7 +24,7 @@ function diaspora_mention2bb($match) {
return; return;
} }
$data = get_contact_details_by_addr($match[2]); $data = Contact::getDetailsByAddr($match[2]);
$name = $match[1]; $name = $match[1];
@ -97,7 +97,7 @@ function diaspora2bb($s) {
*/ */
function diaspora_mentions($match) { function diaspora_mentions($match) {
$contact = get_contact_details_by_url($match[3]); $contact = Contact::getDetailsByURL($match[3]);
if (!x($contact, 'addr')) { if (!x($contact, 'addr')) {
$contact = Probe::uri($match[3]); $contact = Probe::uri($match[3]);

4
include/bbcode.php
View File

@ -493,9 +493,9 @@ function bb_ShareAttributes($share, $simplehtml) {
// We only call this so that a previously unknown contact can be added. // We only call this so that a previously unknown contact can be added.
// This is important for the function "get_contact_details_by_url". // This is important for the function "get_contact_details_by_url".
// This function then can fetch an entry from the contact table. // This function then can fetch an entry from the contact table.
get_contact($profile, 0); Contact::getIdForURL($profile, 0);
$data = get_contact_details_by_url($profile); $data = Contact::getDetailsByURL($profile);
if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != "")) if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != ""))
$userid_compact = $data["name"]." (".$data["addr"].")"; $userid_compact = $data["name"]." (".$data["addr"].")";

4
include/conversation.php
View File

@ -734,7 +734,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
} }
if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) { if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); $author_contact = Contact::getDetailsByURL($item['author-link'], $profile_owner);
if ($author_contact["thumb"]) { if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"]; $item['author-thumb'] = $author_contact["thumb"];
} else { } else {
@ -743,7 +743,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
} }
if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); $owner_contact = Contact::getDetailsByURL($item['owner-link'], $profile_owner);
if ($owner_contact["thumb"]) { if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"]; $item['owner-thumb'] = $owner_contact["thumb"];
} else { } else {

2
include/identity.php
View File

@ -346,7 +346,7 @@ function profile_sidebar($profile, $block = 0)
} }
// Fetch the account type // Fetch the account type
$account_type = account_type($profile); $account_type = Contact::getAccountType($profile);
if ((x($profile, 'address') == 1) if ((x($profile, 'address') == 1)
|| (x($profile, 'location') == 1) || (x($profile, 'location') == 1)

16
include/items.php
View File

@ -719,12 +719,12 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
* This is done only for comments (See below explanation at "gcontact-id") * This is done only for comments (See below explanation at "gcontact-id")
*/ */
if ($arr['parent-uri'] != $arr['uri']) { if ($arr['parent-uri'] != $arr['uri']) {
$arr["contact-id"] = get_contact($arr['author-link'], $uid); $arr["contact-id"] = Contact::getIdForURL($arr['author-link'], $uid);
} }
// If not present then maybe the owner was found // If not present then maybe the owner was found
if ($arr["contact-id"] == 0) { if ($arr["contact-id"] == 0) {
$arr["contact-id"] = get_contact($arr['owner-link'], $uid); $arr["contact-id"] = Contact::getIdForURL($arr['owner-link'], $uid);
} }
// Still missing? Then use the "self" contact of the current user // Still missing? Then use the "self" contact of the current user
@ -755,19 +755,19 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
} }
if ($arr["author-id"] == 0) { if ($arr["author-id"] == 0) {
$arr["author-id"] = get_contact($arr["author-link"], 0); $arr["author-id"] = Contact::getIdForURL($arr["author-link"], 0);
} }
if (blockedContact($arr["author-id"])) { if (Contact::isBlocked($arr["author-id"])) {
logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored'); logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored');
return 0; return 0;
} }
if ($arr["owner-id"] == 0) { if ($arr["owner-id"] == 0) {
$arr["owner-id"] = get_contact($arr["owner-link"], 0); $arr["owner-id"] = Contact::getIdForURL($arr["owner-link"], 0);
} }
if (blockedContact($arr["owner-id"])) { if (Contact::isBlocked($arr["owner-id"])) {
logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored'); logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored');
return 0; return 0;
} }
@ -1751,7 +1751,7 @@ function lose_follower($importer, $contact, array $datarray = array(), $item = "
if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
dba::update('contact', array('rel' => CONTACT_IS_SHARING), array('id' => $contact['id'])); dba::update('contact', array('rel' => CONTACT_IS_SHARING), array('id' => $contact['id']));
} else { } else {
contact_remove($contact['id']); Contact::remove($contact['id']);
} }
} }
@ -1760,7 +1760,7 @@ function lose_sharer($importer, $contact, array $datarray = array(), $item = "")
if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id'])); dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id']));
} else { } else {
contact_remove($contact['id']); Contact::remove($contact['id']);
} }
} }

2
include/like.php
View File

@ -116,7 +116,7 @@ function do_like($item_id, $verb) {
$item_contact_id = $owner_self_contact['id']; $item_contact_id = $owner_self_contact['id'];
$item_contact = $owner_self_contact; $item_contact = $owner_self_contact;
} else { } else {
$item_contact_id = get_contact($author_contact['url'], $item['uid']); $item_contact_id = Contact::getIdForURL($author_contact['url'], $item['uid']);
$contacts = q("SELECT * FROM `contact` WHERE `id` = %d", $contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
intval($item_contact_id) intval($item_contact_id)

4
include/post_update.php
View File

@ -210,8 +210,8 @@ function post_update_1198() {
// Set the "gcontact-id" in the item table and add a new gcontact entry if needed // Set the "gcontact-id" in the item table and add a new gcontact entry if needed
foreach ($item_arr AS $item) { foreach ($item_arr AS $item) {
$author_id = get_contact($item["author-link"], 0); $author_id = Contact::getIdForURL($item["author-link"], 0);
$owner_id = get_contact($item["owner-link"], 0); $owner_id = Contact::getIdForURL($item["owner-link"], 0);
if ($author_id == 0) if ($author_id == 0)
$author_id = -1; $author_id = -1;

6
include/threads.php
View File

@ -59,7 +59,7 @@ function add_shadow_thread($itemid) {
} }
// Is the public contact configured as hidden? // Is the public contact configured as hidden?
if (hiddenContact($item["owner-id"]) || hiddenContact($item["author-id"])) { if (Contact::isHidden($item["owner-id"]) || Contact::isHidden($item["author-id"])) {
return; return;
} }
@ -105,7 +105,7 @@ function add_shadow_thread($itemid) {
$item[0]['uid'] = 0; $item[0]['uid'] = 0;
$item[0]['origin'] = 0; $item[0]['origin'] = 0;
$item[0]['wall'] = 0; $item[0]['wall'] = 0;
$item[0]['contact-id'] = get_contact($item[0]['author-link'], 0); $item[0]['contact-id'] = Contact::getIdForURL($item[0]['author-link'], 0);
if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) { if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
$item[0]['type'] = 'remote-comment'; $item[0]['type'] = 'remote-comment';
@ -165,7 +165,7 @@ function add_shadow_entry($itemid) {
$item['uid'] = 0; $item['uid'] = 0;
$item['origin'] = 0; $item['origin'] = 0;
$item['wall'] = 0; $item['wall'] = 0;
$item['contact-id'] = get_contact($item['author-link'], 0); $item['contact-id'] = Contact::getIdForURL($item['author-link'], 0);
if (in_array($item['type'], array("net-comment", "wall-comment"))) { if (in_array($item['type'], array("net-comment", "wall-comment"))) {
$item['type'] = 'remote-comment'; $item['type'] = 'remote-comment';

4
mod/admin.php
View File

@ -1446,7 +1446,7 @@ function admin_page_users_post(App $a) {
if (x($_POST,'page_users_delete')) { if (x($_POST,'page_users_delete')) {
require_once("include/Contact.php"); require_once("include/Contact.php");
foreach ($users as $uid) { foreach ($users as $uid) {
user_remove($uid); User::remove($uid);
} }
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users))); notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
} }
@ -1493,7 +1493,7 @@ function admin_page_users(App $a) {
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
// delete user // delete user
require_once("include/Contact.php"); require_once("include/Contact.php");
user_remove($uid); User::remove($uid);
notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL); notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
break; break;

8
mod/allfriends.php
View File

@ -40,7 +40,7 @@ function allfriends_content(App $a) {
} }
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
$total = GlobalContact::countAllFriends(local_user(), $cid); $total = GlobalContact::countAllFriends(local_user(), $cid);
@ -59,7 +59,7 @@ function allfriends_content(App $a) {
foreach ($r as $rr) { foreach ($r as $rr) {
//get further details of the contact //get further details of the contact
$contact_details = get_contact_details_by_url($rr['url'], $uid, $rr); $contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
$photo_menu = ''; $photo_menu = '';
@ -67,7 +67,7 @@ function allfriends_content(App $a) {
// If the contact is not common to the user, Connect/Follow' will be added to the photo menu // If the contact is not common to the user, Connect/Follow' will be added to the photo menu
if ($rr[cid]) { if ($rr[cid]) {
$rr[id] = $rr[cid]; $rr[id] = $rr[cid];
$photo_menu = contact_photo_menu ($rr); $photo_menu = Contact::photoMenu ($rr);
} }
else { else {
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url']; $connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
@ -86,7 +86,7 @@ function allfriends_content(App $a) {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'network' => network_to_name($contact_details['network'], $contact_details['url']), 'network' => network_to_name($contact_details['network'], $contact_details['url']),
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
'conntxt' => t('Connect'), 'conntxt' => t('Connect'),

2
mod/cal.php
View File

@ -47,7 +47,7 @@ function cal_init(App $a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = get_profiledata_by_nick($nick, $a->profile_uid);
$account_type = account_type($profile); $account_type = Contact::getAccountType($profile);
$tpl = get_markup_template("vcard-widget.tpl"); $tpl = get_markup_template("vcard-widget.tpl");

8
mod/common.php
View File

@ -40,7 +40,7 @@ function common_content(App $a) {
); );
/// @TODO Handle $c with DBM::is_result() /// @TODO Handle $c with DBM::is_result()
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
} else { } else {
$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid) intval($uid)
@ -115,14 +115,14 @@ function common_content(App $a) {
foreach ($r as $rr) { foreach ($r as $rr) {
//get further details of the contact //get further details of the contact
$contact_details = get_contact_details_by_url($rr['url'], $uid); $contact_details = Contact::getDetailsByURL($rr['url'], $uid);
// $rr['id'] is needed to use contact_photo_menu() // $rr['id'] is needed to use contact_photo_menu()
/// @TODO Adding '/" here avoids E_NOTICE on missing constants /// @TODO Adding '/" here avoids E_NOTICE on missing constants
$rr['id'] = $rr['cid']; $rr['id'] = $rr['cid'];
$photo_menu = ''; $photo_menu = '';
$photo_menu = contact_photo_menu($rr); $photo_menu = Contact::photoMenu($rr);
$entry = array( $entry = array(
'url' => $rr['url'], 'url' => $rr['url'],
@ -133,7 +133,7 @@ function common_content(App $a) {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'network' => network_to_name($contact_details['network'], $contact_details['url']), 'network' => network_to_name($contact_details['network'], $contact_details['url']),
'photo_menu' => $photo_menu, 'photo_menu' => $photo_menu,
'id' => ++$id, 'id' => ++$id,

25
mod/contacts.php
View File

@ -59,7 +59,7 @@ function contacts_init(App $a) {
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
'$network_name' => $networkname, '$network_name' => $networkname,
'$network' => t('Network:'), '$network' => t('Network:'),
'$account_type' => account_type($a->data['contact']) '$account_type' => Contact::getAccountType($a->data['contact'])
)); ));
$finpeople_widget = ''; $finpeople_widget = '';
@ -132,7 +132,7 @@ function contacts_batch_actions(App $a) {
if ($r) $count_actions++; if ($r) $count_actions++;
} }
if (x($_POST, 'contacts_batch_drop')) { if (x($_POST, 'contacts_batch_drop')) {
_contact_drop($contact_id, $orig_record); _contact_drop($orig_record);
$count_actions++; $count_actions++;
} }
} }
@ -347,7 +347,9 @@ function _contact_archive($contact_id, $orig_record) {
} }
return $r; return $r;
} }
function _contact_drop($contact_id, $orig_record) {
function _contact_drop($orig_record)
{
$a = get_app(); $a = get_app();
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
@ -358,9 +360,8 @@ function _contact_drop($contact_id, $orig_record) {
return; return;
} }
$self = ""; // Unused parameter Contact::terminateFriendship($r[0], $orig_record);
terminate_friendship($r[0], $self, $orig_record); Contact::remove($orig_record['id']);
contact_remove($orig_record['id']);
} }
@ -480,7 +481,7 @@ function contacts_content(App $a) {
} }
} }
_contact_drop($contact_id, $orig_record[0]); _contact_drop($orig_record[0]);
info( t('Contact has been removed.') . EOL ); info( t('Contact has been removed.') . EOL );
if (x($_SESSION,'return_url')) { if (x($_SESSION,'return_url')) {
goaway('' . $_SESSION['return_url']); goaway('' . $_SESSION['return_url']);
@ -654,7 +655,7 @@ function contacts_content(App $a) {
'$url' => $url, '$url' => $url,
'$profileurllabel' => t('Profile URL'), '$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'], '$profileurl' => $contact['url'],
'$account_type' => account_type($contact), '$account_type' => Contact::getAccountType($contact),
'$location' => bbcode($contact["location"]), '$location' => bbcode($contact["location"]),
'$location_label' => t("Location:"), '$location_label' => t("Location:"),
'$xmpp' => bbcode($contact["xmpp"]), '$xmpp' => bbcode($contact["xmpp"]),
@ -917,7 +918,7 @@ function contact_posts($a, $contact_id) {
if ($r) { if ($r) {
$contact = $r[0]; $contact = $r[0];
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
} else } else
$profile = ""; $profile = "";
@ -925,7 +926,7 @@ function contact_posts($a, $contact_id) {
$o .= $tab_str; $o .= $tab_str;
$o .= posts_from_contact_url($a, $contact["url"]); $o .= Contact::getPostsFromUrl($contact["url"]);
return $o; return $o;
} }
@ -960,14 +961,14 @@ function _contact_detail_for_template($rr){
return array( return array(
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
'edit_hover' => t('Edit contact'), 'edit_hover' => t('Edit contact'),
'photo_menu' => contact_photo_menu($rr), 'photo_menu' => Contact::photoMenu($rr),
'id' => $rr['id'], 'id' => $rr['id'],
'alt_text' => $alt_text, 'alt_text' => $alt_text,
'dir_icon' => $dir_icon, 'dir_icon' => $dir_icon,
'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
'name' => htmlentities($rr['name']), 'name' => htmlentities($rr['name']),
'username' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']),
'account_type' => account_type($rr), 'account_type' => Contact::getAccountType($rr),
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']), 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
'url' => $url, 'url' => $url,

2
mod/crepair.php
View File

@ -32,7 +32,7 @@ function crepair_init(App $a) {
if($contact_id) { if($contact_id) {
$a->data['contact'] = $r[0]; $a->data['contact'] = $r[0];
$contact = $r[0]; $contact = $r[0];
profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
} }
} }

8
mod/dfrn_notify.php
View File

@ -128,13 +128,9 @@ function dfrn_notify_post(App $a) {
logger('dfrn_notify: data: ' . $data, LOGGER_DATA); logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
if ($dissolve == 1) { if ($dissolve == 1) {
/*
* Relationship is dissolved permanently
*/
require_once('include/Contact.php'); require_once('include/Contact.php');
contact_remove($importer['id']); // Relationship is dissolved permanently
Contact::remove($importer['id']);
logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']); logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
xml_status(0, 'relationship dissolved'); xml_status(0, 'relationship dissolved');
} }

2
mod/directory.php
View File

@ -162,7 +162,7 @@ function directory_content(App $a) {
'img_hover' => $rr['name'], 'img_hover' => $rr['name'],
'name' => $rr['name'], 'name' => $rr['name'],
'details' => $details, 'details' => $details,
'account_type' => account_type($rr), 'account_type' => Contact::getAccountType($rr),
'profile' => $profile, 'profile' => $profile,
'location' => $location_e, 'location' => $location_e,
'tags' => $rr['pub_keywords'], 'tags' => $rr['pub_keywords'],

10
mod/dirfind.php
View File

@ -76,7 +76,7 @@ function dirfind_content(App $a, $prefix = "") {
$objresult->tags = ""; $objresult->tags = "";
$objresult->network = $user_data["network"]; $objresult->network = $user_data["network"];
$contact = get_contact_details_by_url($user_data["url"], local_user()); $contact = Contact::getDetailsByURL($user_data["url"], local_user());
$objresult->cid = $contact["cid"]; $objresult->cid = $contact["cid"];
$j->results[] = $objresult; $j->results[] = $objresult;
@ -150,7 +150,7 @@ function dirfind_content(App $a, $prefix = "") {
continue; continue;
} }
$result = get_contact_details_by_url($result["url"], local_user(), $result); $result = Contact::getDetailsByURL($result["url"], local_user(), $result);
if ($result["name"] == "") { if ($result["name"] == "") {
$urlparts = parse_url($result["url"]); $urlparts = parse_url($result["url"]);
@ -194,7 +194,7 @@ function dirfind_content(App $a, $prefix = "") {
$alt_text = ""; $alt_text = "";
$contact_details = get_contact_details_by_url($jj->url, local_user()); $contact_details = Contact::getDetailsByURL($jj->url, local_user());
$itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url); $itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
@ -205,7 +205,7 @@ function dirfind_content(App $a, $prefix = "") {
$contact = q("SELECT * FROM `contact` WHERE `id` = %d", $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
intval($jj->cid)); intval($jj->cid));
if ($contact) { if ($contact) {
$photo_menu = contact_photo_menu($contact[0]); $photo_menu = Contact::photoMenu($contact[0]);
$details = _contact_detail_for_template($contact[0]); $details = _contact_detail_for_template($contact[0]);
$alt_text = $details['alt_text']; $alt_text = $details['alt_text'];
} else { } else {
@ -235,7 +235,7 @@ function dirfind_content(App $a, $prefix = "") {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'network' => network_to_name($jj->network, $jj->url), 'network' => network_to_name($jj->network, $jj->url),
'id' => ++$id, 'id' => ++$id,
); );

2
mod/display.php
View File

@ -182,7 +182,7 @@ function display_fetchauthor($a, $item) {
$profiledata["about"] = ""; $profiledata["about"] = "";
} }
$profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata); $profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]); $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);

4
mod/follow.php
View File

@ -177,7 +177,7 @@ function follow_content(App $a) {
)); ));
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($ret["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]));
if ($gcontact_id <> 0) { if ($gcontact_id <> 0) {
$o .= replace_macros(get_markup_template('section_title.tpl'), $o .= replace_macros(get_markup_template('section_title.tpl'),
@ -185,7 +185,7 @@ function follow_content(App $a) {
)); ));
// Show last public posts // Show last public posts
$o .= posts_from_contact_url($a, $ret["url"]); $o .= Contact::getPostsFromUrl($ret["url"]);
} }
return $o; return $o;

6
mod/hovercard.php
View File

@ -52,14 +52,14 @@ function hovercard_content() {
$nurl = normalise_link(GlobalContact::cleanContactUrl($profileurl)); $nurl = normalise_link(GlobalContact::cleanContactUrl($profileurl));
if($nurl) { if($nurl) {
// Search for contact data // Search for contact data
$contact = get_contact_details_by_url($nurl); $contact = Contact::getDetailsByURL($nurl);
} }
if(!is_array($contact)) if(!is_array($contact))
return; return;
// Get the photo_menu - the menu if possible contact actions // Get the photo_menu - the menu if possible contact actions
if(local_user()) if(local_user())
$actions = contact_photo_menu($contact); $actions = Contact::photoMenu($contact);
// Move the contact data to the profile array so we can deliver it to // Move the contact data to the profile array so we can deliver it to
@ -81,7 +81,7 @@ function hovercard_content() {
// 'server_url' => $contact["server_url"], // 'server_url' => $contact["server_url"],
'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]), 'bd' => (($contact["birthday"] <= '0001-01-01') ? "" : $contact["birthday"]),
// 'generation' => $contact["generation"], // 'generation' => $contact["generation"],
'account_type' => account_type($contact), 'account_type' => Contact::getAccountType($contact),
'actions' => $actions, 'actions' => $actions,
); );
if($datatype == "html") { if($datatype == "html") {

6
mod/item.php
View File

@ -147,7 +147,7 @@ function item_post(App $a) {
$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent)); $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS) if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
&& (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); $parent_contact = Contact::getDetailsByURL($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) { if (!isset($parent_contact["nick"])) {
$probed_contact = Probe::uri($thrparent[0]["author-link"]); $probed_contact = Probe::uri($thrparent[0]["author-link"]);
@ -704,11 +704,11 @@ function item_post(App $a) {
$datarray['owner-name'] = $contact_record['name']; $datarray['owner-name'] = $contact_record['name'];
$datarray['owner-link'] = $contact_record['url']; $datarray['owner-link'] = $contact_record['url'];
$datarray['owner-avatar'] = $contact_record['thumb']; $datarray['owner-avatar'] = $contact_record['thumb'];
$datarray['owner-id'] = get_contact($datarray['owner-link'], 0); $datarray['owner-id'] = Contact::getIdForURL($datarray['owner-link'], 0);
$datarray['author-name'] = $author['name']; $datarray['author-name'] = $author['name'];
$datarray['author-link'] = $author['url']; $datarray['author-link'] = $author['url'];
$datarray['author-avatar'] = $author['thumb']; $datarray['author-avatar'] = $author['thumb'];
$datarray['author-id'] = get_contact($datarray['author-link'], 0); $datarray['author-id'] = Contact::getIdForURL($datarray['author-link'], 0);
$datarray['created'] = datetime_convert(); $datarray['created'] = datetime_convert();
$datarray['edited'] = datetime_convert(); $datarray['edited'] = datetime_convert();
$datarray['commented'] = datetime_convert(); $datarray['commented'] = datetime_convert();

4
mod/match.php
View File

@ -87,7 +87,7 @@ function match_content(App $a)
'follow' => array(t("Connect/Follow"), $connlnk) 'follow' => array(t("Connect/Follow"), $connlnk)
); );
$contact_details = get_contact_details_by_url($jj->url, local_user()); $contact_details = Contact::getDetailsByURL($jj->url, local_user());
$entry = array( $entry = array(
'url' => zrl($jj->url), 'url' => zrl($jj->url),
@ -96,7 +96,7 @@ function match_content(App $a)
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'inttxt' => ' ' . t('is interested in:'), 'inttxt' => ' ' . t('is interested in:'),
'conntxt' => t('Connect'), 'conntxt' => t('Connect'),

4
mod/message.php
View File

@ -462,7 +462,7 @@ function message_content(App $a) {
$to_name_e = $message['name']; $to_name_e = $message['name'];
} }
$contact = get_contact_details_by_url($message['from-url']); $contact = Contact::getDetailsByURL($message['from-url']);
if (isset($contact["thumb"])) if (isset($contact["thumb"]))
$from_photo = $contact["thumb"]; $from_photo = $contact["thumb"];
else else
@ -576,7 +576,7 @@ function render_messages(array $msg, $t) {
$to_name_e = $rr['name']; $to_name_e = $rr['name'];
} }
$contact = get_contact_details_by_url($rr['url']); $contact = Contact::getDetailsByURL($rr['url']);
if (isset($contact["thumb"])) if (isset($contact["thumb"]))
$from_photo = $contact["thumb"]; $from_photo = $contact["thumb"];
else else

2
mod/network.php
View File

@ -677,7 +677,7 @@ function networkThreadedView(App $a, $update = 0) {
'details' => $r['location'], 'details' => $r['location'],
); );
$entries[0]["account_type"] = account_type($r); $entries[0]["account_type"] = Contact::getAccountType($r);
$o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array(
'contacts' => $entries, 'contacts' => $entries,

8
mod/nogroup.php
View File

@ -33,19 +33,19 @@ function nogroup_content(App $a)
} }
require_once 'include/Contact.php'; require_once 'include/Contact.php';
$r = contacts_not_grouped(local_user()); $r = Contact::getUngroupedList(local_user());
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
} }
$r = contacts_not_grouped(local_user(), $a->pager['start'], $a->pager['itemspage']); $r = Contact::getUngroupedList(local_user(), $a->pager['start'], $a->pager['itemspage']);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr); $contact_details = Contact::getDetailsByURL($rr['url'], local_user(), $rr);
$contacts[] = array( $contacts[] = array(
'img_hover' => sprintf(t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']), 'img_hover' => sprintf(t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
'edit_hover' => t('Edit contact'), 'edit_hover' => t('Edit contact'),
'photo_menu' => contact_photo_menu($rr), 'photo_menu' => Contact::photoMenu($rr),
'id' => $rr['id'], 'id' => $rr['id'],
'alt_text' => $alt_text, 'alt_text' => $alt_text,
'dir_icon' => $dir_icon, 'dir_icon' => $dir_icon,

2
mod/photos.php
View File

@ -46,7 +46,7 @@ function photos_init(App $a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = get_profiledata_by_nick($nick, $a->profile_uid);
$account_type = account_type($profile); $account_type = Contact::getAccountType($profile);
$tpl = get_markup_template("vcard-widget.tpl"); $tpl = get_markup_template("vcard-widget.tpl");

2
mod/ping.php
View File

@ -350,7 +350,7 @@ function ping_init(App $a)
$notif['message'] = str_replace("{0}", $notif['name'], $notif['message']); $notif['message'] = str_replace("{0}", $notif['name'], $notif['message']);
} }
$contact = get_contact_details_by_url($notif['url']); $contact = Contact::getDetailsByURL($notif['url']);
if (isset($contact['micro'])) { if (isset($contact['micro'])) {
$notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO); $notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO);
} else { } else {

2
mod/profiles.php
View File

@ -491,7 +491,7 @@ function profiles_post(App $a) {
} }
if ($is_default) { if ($is_default) {
$location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name)); $location = Profile::formatLocation(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d", q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
dbesc($about), dbesc($about),

2
mod/randprof.php
View File

@ -7,7 +7,7 @@ use Friendica\Model\GlobalContact;
function randprof_init(App $a) { function randprof_init(App $a) {
require_once('include/Contact.php'); require_once('include/Contact.php');
$x = random_profile(); $x = GlobalContact::getRandomUrl();
if ($x) { if ($x) {
goaway(zrl($x)); goaway(zrl($x));

2
mod/removeme.php
View File

@ -30,7 +30,7 @@ function removeme_post(App $a) {
if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) { if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
require_once('include/Contact.php'); require_once('include/Contact.php');
user_remove($a->user['uid']); User::remove($a->user['uid']);
// NOTREACHED // NOTREACHED
} }

4
mod/suggest.php
View File

@ -88,7 +88,7 @@ function suggest_content(App $a) {
'hide' => array(t('Ignore/Hide'), $ignlnk) 'hide' => array(t('Ignore/Hide'), $ignlnk)
); );
$contact_details = get_contact_details_by_url($rr["url"], local_user(), $rr); $contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
$entry = array( $entry = array(
'url' => zrl($rr['url']), 'url' => zrl($rr['url']),
@ -99,7 +99,7 @@ function suggest_content(App $a) {
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'ignlnk' => $ignlnk, 'ignlnk' => $ignlnk,
'ignid' => $rr['id'], 'ignid' => $rr['id'],
'conntxt' => t('Connect'), 'conntxt' => t('Connect'),

7
mod/unfollow.php
View File

@ -39,8 +39,7 @@ function unfollow_post(App $a) {
intval($uid) intval($uid)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$self = ""; // Unused parameter Contact::terminateFriendship($r[0], $contact);
terminate_friendship($r[0], $self, $contact);
} }
} }
dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id'])); dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id']));
@ -128,14 +127,14 @@ function unfollow_content(App $a) {
)); ));
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
$o .= replace_macros(get_markup_template('section_title.tpl'), $o .= replace_macros(get_markup_template('section_title.tpl'),
array('$title' => t('Status Messages and Posts') array('$title' => t('Status Messages and Posts')
)); ));
// Show last public posts // Show last public posts
$o .= posts_from_contact_url($a, $contact["url"]); $o .= Contact::getPostsFromUrl($contact["url"]);
return $o; return $o;
} }

2
mod/videos.php
View File

@ -40,7 +40,7 @@ function videos_init(App $a) {
$profile = get_profiledata_by_nick($nick, $a->profile_uid); $profile = get_profiledata_by_nick($nick, $a->profile_uid);
$account_type = account_type($profile); $account_type = Contact::getAccountType($profile);
$tpl = get_markup_template("vcard-widget.tpl"); $tpl = get_markup_template("vcard-widget.tpl");

6
mod/viewcontacts.php
View File

@ -101,19 +101,19 @@ function viewcontacts_content(App $a) {
else else
$url = zrl($url); $url = zrl($url);
$contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid'], $rr); $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
$contacts[] = array( $contacts[] = array(
'id' => $rr['id'], 'id' => $rr['id'],
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']), 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $contact_details['name'], $rr['url']),
'photo_menu' => contact_photo_menu($rr), 'photo_menu' => Contact::photoMenu($rr),
'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
'name' => htmlentities(substr($contact_details['name'],0,20)), 'name' => htmlentities(substr($contact_details['name'],0,20)),
'username' => htmlentities($contact_details['name']), 'username' => htmlentities($contact_details['name']),
'details' => $contact_details['location'], 'details' => $contact_details['location'],
'tags' => $contact_details['keywords'], 'tags' => $contact_details['keywords'],
'about' => $contact_details['about'], 'about' => $contact_details['about'],
'account_type' => account_type($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'url' => $url, 'url' => $url,
'sparkle' => '', 'sparkle' => '',
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),

4
src/Core/NotificationsManager.php
View File

@ -775,7 +775,7 @@ class NotificationsManager
$sql_extra = " AND `ignore` = 0 "; $sql_extra = " AND `ignore` = 0 ";
} }
/// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
$r = q( $r = q(
"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, "SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
@ -904,7 +904,7 @@ class NotificationsManager
// If the network and addr is still not available // If the network and addr is still not available
// get the missing data data from other sources // get the missing data data from other sources
if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") { if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
$ret = get_contact_details_by_url($arr['url']); $ret = Contact::getDetailsByURL($arr['url']);
if ($arr['gnetwork'] == "" && $ret['network'] != "") { if ($arr['gnetwork'] == "" && $ret['network'] != "") {
$arr['gnetwork'] = $ret['network']; $arr['gnetwork'] = $ret['network'];

14
src/Model/GlobalContact.php
View File

@ -895,7 +895,7 @@ class GlobalContact
intval($uid) intval($uid)
); );
$location = formatted_location( $location = Profile::formatLocation(
array("locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]) array("locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"])
); );
@ -1002,4 +1002,16 @@ class GlobalContact
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
} }
} }
public static function getRandomUrl() {
$r = q("SELECT `url` FROM `gcontact` WHERE `network` = '%s'
AND `last_contact` >= `last_failure`
AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
ORDER BY rand() LIMIT 1",
dbesc(NETWORK_DFRN));
if (DBM::is_result($r))
return dirname($r[0]['url']);
return '';
}
} }

2
src/Network/Probe.php
View File

@ -793,7 +793,7 @@ class Probe {
} }
} }
$location = formatted_location($json); $location = Profile::formatLocation($json);
if ($location) { if ($location) {
$data["location"] = $location; $data["location"] = $location;
} }

4
src/Object/Contact.php
View File

@ -538,7 +538,7 @@ class Contact extends BaseObject
* *
* @return integer Contact ID * @return integer Contact ID
*/ */
public static function getIdForUrl($url, $uid = 0, $no_update = false) public static function getIdForURL($url, $uid = 0, $no_update = false)
{ {
logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG); logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG);
@ -603,7 +603,7 @@ class Contact extends BaseObject
} }
if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) { if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) {
$contact_id = self::getIdForUrl($data["alias"], $uid, true); $contact_id = self::getIdForURL($data["alias"], $uid, true);
} }
$url = $data["url"]; $url = $data["url"];

8
src/Protocol/DFRN.php
View File

@ -708,7 +708,7 @@ class DFRN
if (trim($profile["locality"].$profile["region"].$profile["country-name"]) != "") { if (trim($profile["locality"].$profile["region"].$profile["country-name"]) != "") {
$element = $doc->createElement("poco:address"); $element = $doc->createElement("poco:address");
XML::add_element($doc, $element, "poco:formatted", formatted_location($profile)); XML::add_element($doc, $element, "poco:formatted", Profile::formatLocation($profile));
if (trim($profile["locality"]) != "") { if (trim($profile["locality"]) != "") {
XML::add_element($doc, $element, "poco:locality", $profile["locality"]); XML::add_element($doc, $element, "poco:locality", $profile["locality"]);
@ -742,8 +742,7 @@ class DFRN
*/ */
private static function add_entry_author($doc, $element, $contact_url, $item) private static function add_entry_author($doc, $element, $contact_url, $item)
{ {
$contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
$contact = get_contact_details_by_url($contact_url, $item["uid"]);
$author = $doc->createElement($element); $author = $doc->createElement($element);
XML::add_element($doc, $author, "name", $contact["name"]); XML::add_element($doc, $author, "name", $contact["name"]);
@ -1373,8 +1372,7 @@ class DFRN
if ($contact['term-date'] > NULL_DATE) { if ($contact['term-date'] > NULL_DATE) {
logger("dfrn_deliver: $url back from the dead - removing mark for death"); logger("dfrn_deliver: $url back from the dead - removing mark for death");
include_once 'include/Contact.php'; Contact::unmarkForArchival($contact);
unmark_for_death($contact);
} }
$res = parse_xml_string($xml); $res = parse_xml_string($xml);

16
src/Protocol/Diaspora.php
View File

@ -950,7 +950,7 @@ class Diaspora
* We haven't found it? * We haven't found it?
* We use another function for it that will possibly create a contact entry. * We use another function for it that will possibly create a contact entry.
*/ */
$cid = get_contact($handle, $uid); $cid = Contact::getIdForURL($handle, $uid);
if ($cid > 0) { if ($cid > 0) {
/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact` /// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
@ -1342,7 +1342,7 @@ class Diaspora
// We are receiving content from a user that possibly is about to be terminated // We are receiving content from a user that possibly is about to be terminated
// This means the user is vital, so we remove a possible termination date. // This means the user is vital, so we remove a possible termination date.
unmark_for_death($r[0]); Contact::unmarkForArchival($r[0]);
} else { } else {
$cid = $contact["id"]; $cid = $contact["id"];
$network = NETWORK_DIASPORA; $network = NETWORK_DIASPORA;
@ -1521,7 +1521,7 @@ class Diaspora
} }
// We now remove the contact // We now remove the contact
contact_remove($contact["id"]); Contact::remove($contact["id"]);
return true; return true;
} }
@ -2810,7 +2810,7 @@ class Diaspora
case "Person": case "Person":
/// @todo What should we do with an "unshare"? /// @todo What should we do with an "unshare"?
// Removing the contact isn't correct since we still can read the public items // Removing the contact isn't correct since we still can read the public items
contact_remove($contact["id"]); Contact::remove($contact["id"]);
return true; return true;
default: default:
@ -3151,11 +3151,11 @@ class Diaspora
add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch); add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
// The message could not be delivered. We mark the contact as "dead" // The message could not be delivered. We mark the contact as "dead"
mark_for_death($contact); Contact::markForArchival($contact);
} }
} elseif (($return_code >= 200) && ($return_code <= 299)) { } elseif (($return_code >= 200) && ($return_code <= 299)) {
// We successfully delivered a message, the contact is alive // We successfully delivered a message, the contact is alive
unmark_for_death($contact); Contact::unmarkForArchival($contact);
} }
return(($return_code) ? $return_code : (-1)); return(($return_code) ? $return_code : (-1));
@ -3291,7 +3291,7 @@ class Diaspora
* *
* @return int The result of the transmission * @return int The result of the transmission
*/ */
public static function send_unshare($owner, $contact) public static function sendUnshare($owner, $contact)
{ {
$message = array("author" => self::my_handle($owner), $message = array("author" => self::my_handle($owner),
"recipient" => $contact["addr"], "recipient" => $contact["addr"],
@ -4007,7 +4007,7 @@ class Diaspora
$about = $profile['about']; $about = $profile['about'];
$about = strip_tags(bbcode($about)); $about = strip_tags(bbcode($about));
$location = formatted_location($profile); $location = Profile::formatLocation($profile);
$tags = ''; $tags = '';
if ($profile['pub_keywords']) { if ($profile['pub_keywords']) {
$kw = str_replace(',', ' ', $profile['pub_keywords']); $kw = str_replace(',', ' ', $profile['pub_keywords']);

6
src/Protocol/OStatus.php
View File

@ -153,7 +153,7 @@ class OStatus
// Only update the contacts if it is an OStatus contact // Only update the contacts if it is an OStatus contact
if ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) { if ($r && ($r['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
// This contact is vital, so we awake it from the dead // This contact is vital, so we awake it from the dead
unmark_for_death($contact); Contact::unmarkForArchival($contact);
// Update contact data // Update contact data
@ -208,7 +208,7 @@ class OStatus
} }
// Ensure that we are having this contact (with uid=0) // Ensure that we are having this contact (with uid=0)
$cid = get_contact($aliaslink, 0); $cid = Contact::getIdForURL($aliaslink, 0);
if ($cid) { if ($cid) {
$fields = array('url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'); $fields = array('url', 'nurl', 'name', 'nick', 'alias', 'about', 'location');
@ -2098,7 +2098,7 @@ class OStatus
} }
$check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s'); $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
$authorid = get_contact($owner["url"], 0); $authorid = Contact::getIdForURL($owner["url"], 0);
$items = q( $items = q(
"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)

2
src/Protocol/PortableContact.php
View File

@ -401,7 +401,7 @@ class PortableContact
} }
} }
$location = formatted_location($noscrape); $location = Profile::formatLocation($noscrape);
if ($location) { if ($location) {
$contact["location"] = $location; $contact["location"] = $location;
} }

4
src/Worker/Delivery.php
View File

@ -354,10 +354,10 @@ class Delivery {
add_to_queue($contact['id'],NETWORK_DFRN,$atom); add_to_queue($contact['id'],NETWORK_DFRN,$atom);
// The message could not be delivered. We mark the contact as "dead" // The message could not be delivered. We mark the contact as "dead"
mark_for_death($contact); Contact::markForArchival($contact);
} else { } else {
// We successfully delivered a message, the contact is alive // We successfully delivered a message, the contact is alive
unmark_for_death($contact); Contact::unmarkForArchival($contact);
} }
break; break;

8
src/Worker/Notifier.php
View File

@ -120,19 +120,13 @@ class Notifier {
$user = $r[0]; $user = $r[0];
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($item_id));
if (!$r)
return;
$self = $r[0];
$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id)); $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
if (!$r) { if (!$r) {
return; return;
} }
require_once 'include/Contact.php'; require_once 'include/Contact.php';
foreach ($r as $contact) { foreach ($r as $contact) {
terminate_friendship($user, $self, $contact); Contact::terminateFriendship($user, $contact);
} }
return; return;
} elseif ($cmd === 'relocate') { } elseif ($cmd === 'relocate') {

12
src/Worker/OnePoll.php
View File

@ -127,11 +127,11 @@ Class OnePoll
} }
if (!update_contact($contact["id"])) { if (!update_contact($contact["id"])) {
mark_for_death($contact); Contact::markForArchival($contact);
logger('Contact is marked dead'); logger('Contact is marked dead');
return; return;
} else { } else {
unmark_for_death($contact); Contact::unmarkForArchival($contact);
} }
} }
@ -197,7 +197,7 @@ Class OnePoll
// mean the software was uninstalled or the domain expired. // mean the software was uninstalled or the domain expired.
// Will keep trying for one month. // Will keep trying for one month.
mark_for_death($contact); Contact::markForArchival($contact);
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert()); $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
@ -209,7 +209,7 @@ Class OnePoll
if (!strstr($handshake_xml, '<')) { if (!strstr($handshake_xml, '<')) {
logger('poller: response from ' . $url . ' did not contain XML.'); logger('poller: response from ' . $url . ' did not contain XML.');
mark_for_death($contact); Contact::markForArchival($contact);
$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert()); $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
dba::update('contact', $fields, array('id' => $contact['id'])); dba::update('contact', $fields, array('id' => $contact['id']));
@ -228,10 +228,10 @@ Class OnePoll
$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert()); $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
dba::update('contact', $fields, array('id' => $contact['id'])); dba::update('contact', $fields, array('id' => $contact['id']));
mark_for_death($contact); Contact::markForArchival($contact);
} elseif ($contact['term-date'] > NULL_DATE) { } elseif ($contact['term-date'] > NULL_DATE) {
logger("poller: $url back from the dead - removing mark for death"); logger("poller: $url back from the dead - removing mark for death");
unmark_for_death($contact); Contact::unmarkForArchival($contact);
} }
if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) { if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {