2017-11-12 13:50:35 -05:00
|
|
|
<?php
|
2017-11-15 10:53:16 -05:00
|
|
|
/**
|
|
|
|
* @file src/Worker/OnePoll.php
|
|
|
|
*/
|
2017-11-12 13:50:35 -05:00
|
|
|
namespace Friendica\Worker;
|
|
|
|
|
2018-07-19 22:15:21 -04:00
|
|
|
use Friendica\BaseObject;
|
2018-02-03 12:25:58 -05:00
|
|
|
use Friendica\Content\Text\BBCode;
|
2017-11-12 13:50:35 -05:00
|
|
|
use Friendica\Core\Config;
|
|
|
|
use Friendica\Core\PConfig;
|
2018-08-11 16:40:44 -04:00
|
|
|
use Friendica\Core\Protocol;
|
2018-07-20 08:19:26 -04:00
|
|
|
use Friendica\Database\DBA;
|
2017-12-07 09:04:24 -05:00
|
|
|
use Friendica\Model\Contact;
|
2018-01-28 06:18:08 -05:00
|
|
|
use Friendica\Model\Item;
|
2017-12-01 14:41:27 -05:00
|
|
|
use Friendica\Protocol\Email;
|
2017-11-15 09:47:28 -05:00
|
|
|
use Friendica\Protocol\PortableContact;
|
2018-02-03 12:25:58 -05:00
|
|
|
use Friendica\Util\DateTimeFormat;
|
2018-01-26 23:18:38 -05:00
|
|
|
use Friendica\Util\Network;
|
2018-01-27 11:13:41 -05:00
|
|
|
use Friendica\Util\XML;
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-12-17 15:24:57 -05:00
|
|
|
require_once 'include/dba.php';
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-15 20:16:14 -05:00
|
|
|
class OnePoll
|
2017-11-15 09:47:28 -05:00
|
|
|
{
|
2018-07-09 22:39:59 -04:00
|
|
|
public static function execute($contact_id = 0, $command = '')
|
|
|
|
{
|
2018-07-19 22:15:21 -04:00
|
|
|
$a = BaseObject::getApp();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
require_once 'include/items.php';
|
|
|
|
|
2017-12-03 03:59:24 -05:00
|
|
|
logger('start');
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
$manual_id = 0;
|
|
|
|
$generation = 0;
|
|
|
|
$hub_update = false;
|
|
|
|
$force = false;
|
|
|
|
$restart = false;
|
|
|
|
|
|
|
|
if ($command == "force") {
|
|
|
|
$force = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!$contact_id) {
|
2017-12-03 03:59:24 -05:00
|
|
|
logger('no contact');
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-01-26 21:38:34 -05:00
|
|
|
$d = DateTimeFormat::utcNow();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($contact)) {
|
2017-11-12 13:50:35 -05:00
|
|
|
logger('Contact not found or cannot be used.');
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$importer_uid = $contact['uid'];
|
|
|
|
|
|
|
|
// load current friends if possible.
|
|
|
|
if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) {
|
|
|
|
$r = q("SELECT count(*) AS total FROM glink
|
|
|
|
WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
|
|
|
|
intval($contact['id'])
|
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($r)) {
|
2017-11-12 13:50:35 -05:00
|
|
|
if (!$r[0]['total']) {
|
2017-11-15 09:47:28 -05:00
|
|
|
PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-06 09:23:38 -05:00
|
|
|
// Diaspora users, archived users and followers are only checked if they still exist.
|
2018-08-11 16:40:44 -04:00
|
|
|
if ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
|
2017-12-18 07:51:29 -05:00
|
|
|
$last_updated = PortableContact::lastUpdated($contact["url"], true);
|
2018-01-26 21:38:34 -05:00
|
|
|
$updated = DateTimeFormat::utcNow();
|
2018-07-24 22:53:46 -04:00
|
|
|
|
2017-12-06 09:23:38 -05:00
|
|
|
if ($last_updated) {
|
|
|
|
logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
|
|
|
|
|
|
|
|
// The last public item can be older than the last item we got
|
|
|
|
if ($last_updated < $contact['last-item']) {
|
|
|
|
$last_updated = $contact['last-item'];
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
2017-12-06 09:23:38 -05:00
|
|
|
|
2018-05-03 16:48:35 -04:00
|
|
|
$fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
|
2017-12-06 09:23:38 -05:00
|
|
|
self::updateContact($contact, $fields);
|
|
|
|
Contact::unmarkForArchival($contact);
|
|
|
|
} else {
|
2018-01-15 08:05:12 -05:00
|
|
|
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
|
2017-12-06 09:23:38 -05:00
|
|
|
Contact::markForArchival($contact);
|
|
|
|
logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
2018-07-24 22:53:46 -04:00
|
|
|
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$xml = false;
|
|
|
|
|
|
|
|
$t = $contact['last-update'];
|
|
|
|
|
|
|
|
if ($contact['subhub']) {
|
2017-12-06 15:25:36 -05:00
|
|
|
$poll_interval = Config::get('system', 'pushpoll_frequency', 3);
|
|
|
|
$contact['priority'] = intval($poll_interval);
|
2017-11-12 13:50:35 -05:00
|
|
|
$hub_update = false;
|
|
|
|
|
2018-01-26 21:38:34 -05:00
|
|
|
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$hub_update = true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
$hub_update = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
$last_update = (($contact['last-update'] <= NULL_DATE)
|
2018-01-26 21:38:34 -05:00
|
|
|
? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
|
|
|
|
: DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
|
2017-11-12 13:50:35 -05:00
|
|
|
);
|
|
|
|
|
|
|
|
// Update the contact entry
|
2018-08-11 16:40:44 -04:00
|
|
|
if (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) || ($contact['network'] === Protocol::DFRN)) {
|
2017-11-15 10:53:16 -05:00
|
|
|
if (!PortableContact::reachable($contact['url'])) {
|
2017-11-12 13:50:35 -05:00
|
|
|
logger("Skipping probably dead contact ".$contact['url']);
|
2017-12-03 03:59:24 -05:00
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-01-09 11:23:26 -05:00
|
|
|
if (!Contact::updateFromProbe($contact["id"])) {
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
logger('Contact is marked dead');
|
2017-12-03 03:59:24 -05:00
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
} else {
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::unmarkForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($importer_uid == 0) {
|
|
|
|
logger('Ignore public contacts');
|
2017-12-03 03:59:24 -05:00
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
|
|
|
intval($importer_uid)
|
|
|
|
);
|
|
|
|
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($r)) {
|
2017-11-12 13:50:35 -05:00
|
|
|
logger('No self contact for user '.$importer_uid);
|
2017-12-03 03:59:24 -05:00
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$importer = $r[0];
|
2018-02-14 00:05:00 -05:00
|
|
|
$url = '';
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-12-03 03:59:24 -05:00
|
|
|
logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
if ($contact['network'] === Protocol::DFRN) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
|
|
|
if (intval($contact['duplex']) && $contact['dfrn-id']) {
|
|
|
|
$idtosend = '0:' . $orig_id;
|
|
|
|
}
|
|
|
|
if (intval($contact['duplex']) && $contact['issued-id']) {
|
|
|
|
$idtosend = '1:' . $orig_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
// they have permission to write to us. We already filtered this in the contact query.
|
|
|
|
$perm = 'rw';
|
|
|
|
|
|
|
|
// But this may be our first communication, so set the writable flag if it isn't set already.
|
|
|
|
|
|
|
|
if (!intval($contact['writable'])) {
|
2018-01-15 08:05:12 -05:00
|
|
|
$fields = ['writable' => true];
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
|
|
|
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
|
|
|
. '&type=data&last_update=' . $last_update
|
|
|
|
. '&perm=' . $perm ;
|
|
|
|
|
2018-10-10 15:08:43 -04:00
|
|
|
$curlResult = Network::curl($url);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-10-10 15:08:43 -04:00
|
|
|
if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
|
2017-12-03 03:59:24 -05:00
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-12-03 03:59:24 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-10-10 15:08:43 -04:00
|
|
|
$handshake_xml = $curlResult->getBody();
|
|
|
|
$html_code = $curlResult->getReturnCode();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-12-03 03:59:24 -05:00
|
|
|
logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger("$url appears to be dead - marking for death ");
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// dead connection - might be a transient event, or this might
|
|
|
|
// mean the software was uninstalled or the domain expired.
|
|
|
|
// Will keep trying for one month.
|
|
|
|
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
|
2017-12-05 02:08:20 -05:00
|
|
|
self::updateContact($contact, $fields);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strstr($handshake_xml, '<')) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger('response from ' . $url . ' did not contain XML.');
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
|
2017-12-05 02:08:20 -05:00
|
|
|
self::updateContact($contact, $fields);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-01-27 11:13:41 -05:00
|
|
|
$res = XML::parseString($handshake_xml);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
if (intval($res->status) == 1) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger("$url replied status 1 - marking for death ");
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// we may not be friends anymore. Will keep trying for one month.
|
|
|
|
// set the last-update so we don't keep polling
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
|
2017-12-05 02:08:20 -05:00
|
|
|
self::updateContact($contact, $fields);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
} elseif ($contact['term-date'] > NULL_DATE) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger("$url back from the dead - removing mark for death");
|
2017-11-19 17:03:39 -05:00
|
|
|
Contact::unmarkForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
|
2017-12-03 03:59:24 -05:00
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
2018-01-15 08:05:12 -05:00
|
|
|
$fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
2018-01-15 08:05:12 -05:00
|
|
|
$postvars = [];
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
|
|
|
|
$challenge = hex2bin((string) $res->challenge);
|
|
|
|
|
|
|
|
$final_dfrn_id = '';
|
|
|
|
|
|
|
|
if ($contact['duplex'] && strlen($contact['prvkey'])) {
|
|
|
|
openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
|
|
|
|
openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
|
|
|
|
} else {
|
|
|
|
openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
|
|
|
|
openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
|
|
|
|
}
|
|
|
|
|
|
|
|
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
|
|
|
|
|
|
|
|
if (strpos($final_dfrn_id, ':') == 1) {
|
|
|
|
$final_dfrn_id = substr($final_dfrn_id, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($final_dfrn_id != $orig_id) {
|
|
|
|
// did not decode properly - cannot trust this site
|
2017-12-03 03:59:24 -05:00
|
|
|
logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
|
|
|
|
|
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-12-03 03:59:24 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$postvars['dfrn_id'] = $idtosend;
|
|
|
|
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
|
|
|
|
$postvars['perm'] = 'rw';
|
|
|
|
|
2018-01-27 11:13:41 -05:00
|
|
|
$xml = Network::post($contact['poll'], $postvars);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
} elseif (($contact['network'] === Protocol::OSTATUS)
|
|
|
|
|| ($contact['network'] === Protocol::DIASPORA)
|
|
|
|
|| ($contact['network'] === Protocol::FEED)) {
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// Upgrading DB fields from an older Friendica version
|
|
|
|
// Will only do this once per notify-enabled OStatus contact
|
|
|
|
// or if relationship changes
|
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// Contacts from OStatus are always writable
|
2018-08-11 16:40:44 -04:00
|
|
|
if ($contact['network'] === Protocol::OSTATUS) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$stat_writeable = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($stat_writeable != $contact['writable']) {
|
2018-01-15 08:05:12 -05:00
|
|
|
$fields = ['writable' => $stat_writeable];
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Are we allowed to import from this person?
|
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
|
2017-12-03 03:59:24 -05:00
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
|
2018-10-10 15:08:43 -04:00
|
|
|
$curlResult = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
|
2017-12-04 01:54:08 -05:00
|
|
|
unlink($cookiejar);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-10-10 15:08:43 -04:00
|
|
|
if (!$curlResult->isTimeout()) {
|
2017-12-03 03:59:24 -05:00
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-12-03 03:59:24 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-10-10 15:08:43 -04:00
|
|
|
$xml = $curlResult->getBody();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
} elseif ($contact['network'] === Protocol::MAIL) {
|
2017-11-12 13:50:35 -05:00
|
|
|
logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);
|
|
|
|
|
|
|
|
$mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1);
|
|
|
|
if ($mail_disabled) {
|
2017-12-03 03:59:24 -05:00
|
|
|
// set the last-update so we don't keep polling
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
|
2017-12-03 03:59:24 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
logger("Mail: Enabled", LOGGER_DEBUG);
|
|
|
|
|
|
|
|
$mbox = null;
|
2018-07-20 08:19:26 -04:00
|
|
|
$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-09 22:20:33 -05:00
|
|
|
$condition = ["`server` != '' AND `uid` = ?", $importer_uid];
|
2018-07-20 08:19:26 -04:00
|
|
|
$mailconf = DBA::selectFirst('mailacct', [], $condition);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($user) && DBA::isResult($mailconf)) {
|
2017-12-01 14:41:27 -05:00
|
|
|
$mailbox = Email::constructMailboxName($mailconf);
|
2017-11-12 13:50:35 -05:00
|
|
|
$password = '';
|
2018-01-09 22:20:33 -05:00
|
|
|
openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
|
2017-12-01 21:05:06 -05:00
|
|
|
$mbox = Email::connect($mailbox, $mailconf['user'], $password);
|
2017-11-12 13:50:35 -05:00
|
|
|
unset($password);
|
|
|
|
logger("Mail: Connect to " . $mailconf['user']);
|
|
|
|
if ($mbox) {
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['last_check' => DateTimeFormat::utcNow()];
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
logger("Mail: Connected to " . $mailconf['user']);
|
|
|
|
} else {
|
|
|
|
logger("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($mbox) {
|
2017-12-01 21:05:06 -05:00
|
|
|
$msgs = Email::poll($mbox, $contact['addr']);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
if (count($msgs)) {
|
|
|
|
logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG);
|
|
|
|
|
2017-12-01 21:05:06 -05:00
|
|
|
$metas = Email::messageMeta($mbox, implode(',', $msgs));
|
2018-07-24 22:53:46 -04:00
|
|
|
|
2017-11-12 13:50:35 -05:00
|
|
|
if (count($metas) != count($msgs)) {
|
2017-12-03 03:59:24 -05:00
|
|
|
logger("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
|
2017-11-12 13:50:35 -05:00
|
|
|
} else {
|
|
|
|
$msgs = array_combine($msgs, $metas);
|
|
|
|
|
|
|
|
foreach ($msgs as $msg_uid => $meta) {
|
|
|
|
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
|
|
|
|
|
2018-01-15 08:05:12 -05:00
|
|
|
$datarray = [];
|
2017-11-12 13:50:35 -05:00
|
|
|
$datarray['verb'] = ACTIVITY_POST;
|
|
|
|
$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
|
2018-08-11 16:40:44 -04:00
|
|
|
$datarray['network'] = Protocol::MAIL;
|
2017-12-01 21:05:06 -05:00
|
|
|
// $meta = Email::messageMeta($mbox, $msg_uid);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2017-12-01 14:41:27 -05:00
|
|
|
$datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// Have we seen it before?
|
2018-01-09 22:20:33 -05:00
|
|
|
$fields = ['deleted', 'id'];
|
|
|
|
$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
|
2018-06-27 14:09:13 -04:00
|
|
|
$item = Item::selectFirst($fields, $condition);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($item)) {
|
2017-11-12 13:50:35 -05:00
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
|
|
|
|
|
|
|
|
// Only delete when mails aren't automatically moved or deleted
|
|
|
|
if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
|
2018-01-11 03:26:30 -05:00
|
|
|
if ($meta->deleted && ! $item['deleted']) {
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()];
|
2018-02-06 07:40:22 -05:00
|
|
|
Item::update($fields, ['id' => $item['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
switch ($mailconf['action']) {
|
|
|
|
case 0:
|
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", LOGGER_DEBUG);
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
logger("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
imap_delete($mbox, $msg_uid, FT_UID);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
|
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
|
|
if ($mailconf['movetofolder'] != "") {
|
|
|
|
imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
|
|
|
|
$raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : '');
|
|
|
|
if (!trim($raw_refs)) {
|
|
|
|
$raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : '');
|
|
|
|
}
|
|
|
|
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
|
|
|
|
|
|
|
|
if ($raw_refs) {
|
|
|
|
$refs_arr = explode(' ', $raw_refs);
|
|
|
|
if (count($refs_arr)) {
|
|
|
|
for ($x = 0; $x < count($refs_arr); $x ++) {
|
2018-06-27 14:09:13 -04:00
|
|
|
$refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
}
|
2018-06-21 02:21:51 -04:00
|
|
|
$condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
|
|
|
|
$parent = Item::selectFirst(['parent-uri'], $condition);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($parent)) {
|
2018-06-21 02:21:51 -04:00
|
|
|
$datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Decoding the header
|
|
|
|
$subject = imap_mime_header_decode($meta->subject);
|
|
|
|
$datarray['title'] = "";
|
|
|
|
foreach ($subject as $subpart) {
|
|
|
|
if ($subpart->charset != "default") {
|
|
|
|
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
|
|
|
|
} else {
|
|
|
|
$datarray['title'] .= $subpart->text;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$datarray['title'] = notags(trim($datarray['title']));
|
|
|
|
|
|
|
|
//$datarray['title'] = notags(trim($meta->subject));
|
2018-01-26 21:38:34 -05:00
|
|
|
$datarray['created'] = DateTimeFormat::utc($meta->date);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
// Is it a reply?
|
|
|
|
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
|
|
|
|
(substr(strtolower($datarray['title']), 0, 3) == "re-") ||
|
|
|
|
($raw_refs != ""));
|
|
|
|
|
|
|
|
// Remove Reply-signs in the subject
|
|
|
|
$datarray['title'] = self::RemoveReply($datarray['title']);
|
|
|
|
|
|
|
|
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
|
|
|
|
if (empty($datarray['parent-uri']) && $reply) {
|
2018-08-11 16:40:44 -04:00
|
|
|
$condition = ['title' => $datarray['title'], 'uid' => importer_uid, 'network' => Protocol::MAIL];
|
2018-06-21 02:21:51 -04:00
|
|
|
$params = ['order' => ['created' => true]];
|
|
|
|
$parent = Item::selectFirst(['parent-uri'], $condition, $params);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($parent)) {
|
2018-06-21 02:21:51 -04:00
|
|
|
$datarray['parent-uri'] = $parent['parent-uri'];
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (empty($datarray['parent-uri'])) {
|
|
|
|
$datarray['parent-uri'] = $datarray['uri'];
|
|
|
|
}
|
|
|
|
|
2017-12-01 21:05:06 -05:00
|
|
|
$r = Email::getMessage($mbox, $msg_uid, $reply);
|
2017-11-12 13:50:35 -05:00
|
|
|
if (!$r) {
|
|
|
|
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
$datarray['body'] = escape_tags($r['body']);
|
2018-01-28 12:36:37 -05:00
|
|
|
$datarray['body'] = BBCode::limitBodySize($datarray['body']);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
logger("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
|
|
|
|
/// @TODO Adding a gravatar for the original author would be cool
|
|
|
|
|
|
|
|
$from = imap_mime_header_decode($meta->from);
|
|
|
|
$fromdecoded = "";
|
|
|
|
foreach ($from as $frompart) {
|
|
|
|
if ($frompart->charset != "default") {
|
|
|
|
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
|
|
|
|
} else {
|
|
|
|
$fromdecoded .= $frompart->text;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-09 13:58:58 -04:00
|
|
|
$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName());
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
|
|
|
|
|
|
|
|
if (isset($fromarr[0]->personal)) {
|
|
|
|
$fromname = $fromarr[0]->personal;
|
|
|
|
} else {
|
|
|
|
$fromname = $frommail;
|
|
|
|
}
|
|
|
|
|
|
|
|
$datarray['author-name'] = $fromname;
|
|
|
|
$datarray['author-link'] = "mailto:".$frommail;
|
|
|
|
$datarray['author-avatar'] = $contact['photo'];
|
|
|
|
|
|
|
|
$datarray['owner-name'] = $contact['name'];
|
|
|
|
$datarray['owner-link'] = "mailto:".$contact['addr'];
|
|
|
|
$datarray['owner-avatar'] = $contact['photo'];
|
|
|
|
|
|
|
|
$datarray['uid'] = $importer_uid;
|
|
|
|
$datarray['contact-id'] = $contact['id'];
|
|
|
|
if ($datarray['parent-uri'] === $datarray['uri']) {
|
|
|
|
$datarray['private'] = 1;
|
|
|
|
}
|
2018-08-11 16:40:44 -04:00
|
|
|
if (($contact['network'] === Protocol::MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$datarray['private'] = 1;
|
|
|
|
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
|
|
|
}
|
|
|
|
|
2018-01-28 06:18:08 -05:00
|
|
|
$stored_item = Item::insert($datarray);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
switch ($mailconf['action']) {
|
|
|
|
case 0:
|
|
|
|
logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", LOGGER_DEBUG);
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
logger("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
imap_delete($mbox, $msg_uid, FT_UID);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
|
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
|
|
|
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
|
|
if ($mailconf['movetofolder'] != "") {
|
|
|
|
imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
logger("Mail: no mails for ".$mailconf['user']);
|
|
|
|
}
|
|
|
|
|
|
|
|
logger("Mail: closing connection for ".$mailconf['user']);
|
|
|
|
imap_close($mbox);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($xml) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger('received xml : ' . $xml, LOGGER_DATA);
|
2017-11-12 13:50:35 -05:00
|
|
|
if (!strstr($xml, '<')) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger('post_handshake: response from ' . $url . ' did not contain XML.');
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-26 21:38:34 -05:00
|
|
|
$fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
|
2017-12-05 02:08:20 -05:00
|
|
|
self::updateContact($contact, $fields);
|
2017-12-03 03:59:24 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
logger("Consume feed of contact ".$contact['id']);
|
|
|
|
|
2018-03-14 16:53:03 -04:00
|
|
|
consume_feed($xml, $importer, $contact, $hub);
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-03-14 16:53:03 -04:00
|
|
|
// do it a second time for DFRN so that any children find their parents.
|
2018-08-11 16:40:44 -04:00
|
|
|
if ($contact['network'] === Protocol::DFRN) {
|
2018-03-14 16:53:03 -04:00
|
|
|
consume_feed($xml, $importer, $contact, $hub);
|
|
|
|
}
|
2017-11-12 13:50:35 -05:00
|
|
|
|
|
|
|
$hubmode = 'subscribe';
|
2018-08-11 16:40:44 -04:00
|
|
|
if ($contact['network'] === Protocol::DFRN || $contact['blocked']) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$hubmode = 'unsubscribe';
|
|
|
|
}
|
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
if (($contact['network'] === Protocol::OSTATUS || $contact['network'] == Protocol::FEED) && (! $contact['hub-verify'])) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$hub_update = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($force) {
|
|
|
|
$hub_update = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
|
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) {
|
2017-11-19 16:47:21 -05:00
|
|
|
logger('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
2017-11-12 13:50:35 -05:00
|
|
|
$hubs = explode(',', $hub);
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2017-11-12 13:50:35 -05:00
|
|
|
if (count($hubs)) {
|
|
|
|
foreach ($hubs as $h) {
|
|
|
|
$h = trim($h);
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2017-11-12 13:50:35 -05:00
|
|
|
if (!strlen($h)) {
|
|
|
|
continue;
|
|
|
|
}
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2017-11-12 13:50:35 -05:00
|
|
|
subscribe_to_hub($h, $importer, $contact, $hubmode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-26 21:38:34 -05:00
|
|
|
$updated = DateTimeFormat::utcNow();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-15 08:05:12 -05:00
|
|
|
self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
|
2017-12-04 01:54:08 -05:00
|
|
|
Contact::unmarkForArchival($contact);
|
2018-08-11 16:40:44 -04:00
|
|
|
} elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
|
2018-01-26 21:38:34 -05:00
|
|
|
$updated = DateTimeFormat::utcNow();
|
2017-11-12 13:50:35 -05:00
|
|
|
|
2018-01-15 08:05:12 -05:00
|
|
|
self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
|
2017-12-04 01:54:08 -05:00
|
|
|
Contact::markForArchival($contact);
|
2017-11-12 13:50:35 -05:00
|
|
|
} else {
|
2018-01-26 21:38:34 -05:00
|
|
|
$updated = DateTimeFormat::utcNow();
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-07-09 22:39:59 -04:00
|
|
|
private static function RemoveReply($subject)
|
|
|
|
{
|
2018-01-15 08:05:12 -05:00
|
|
|
while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
|
2017-11-12 13:50:35 -05:00
|
|
|
$subject = trim(substr($subject, 4));
|
|
|
|
}
|
|
|
|
|
|
|
|
return $subject;
|
|
|
|
}
|
2017-12-05 02:08:20 -05:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Updates a personal contact entry and the public contact entry
|
|
|
|
*
|
|
|
|
* @param array $contact The personal contact entry
|
|
|
|
* @param array $fields The fields that are updated
|
|
|
|
*/
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
private static function updateContact(array $contact, array $fields)
|
2018-07-09 22:39:59 -04:00
|
|
|
{
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', $fields, ['id' => $contact['id']]);
|
|
|
|
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
|
2017-12-05 02:08:20 -05:00
|
|
|
}
|
2017-11-12 13:50:35 -05:00
|
|
|
}
|