Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 22:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change called method names

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

12
src/Worker/OnePoll.php
View file

@ -127,11 +127,11 @@ Class OnePoll
}
if (!update_contact($contact["id"])) {
mark_for_death($contact);
Contact::markForArchival($contact);
logger('Contact is marked dead');
return;
} else {
unmark_for_death($contact);
Contact::unmarkForArchival($contact);
}
}
@ -197,7 +197,7 @@ Class OnePoll
// mean the software was uninstalled or the domain expired.
// Will keep trying for one month.
mark_for_death($contact);
Contact::markForArchival($contact);
// set the last-update so we don't keep polling
$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
@ -209,7 +209,7 @@ Class OnePoll
if (!strstr($handshake_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());
dba::update('contact', $fields, array('id' => $contact['id']));
@ -228,10 +228,10 @@ Class OnePoll
$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
dba::update('contact', $fields, array('id' => $contact['id']));
mark_for_death($contact);
Contact::markForArchival($contact);
} elseif ($contact['term-date'] > NULL_DATE) {
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)) {