2011-08-26 10:29:22 -04:00
|
|
|
<?php
|
2017-11-16 07:32:31 -05:00
|
|
|
/**
|
2017-11-19 13:59:55 -05:00
|
|
|
* @file src/Worker/Delivery.php
|
2017-11-16 07:32:31 -05:00
|
|
|
*/
|
2017-11-19 13:59:55 -05:00
|
|
|
namespace Friendica\Worker;
|
|
|
|
|
2018-04-26 18:30:43 -04:00
|
|
|
use Friendica\BaseObject;
|
2017-04-30 00:01:26 -04:00
|
|
|
use Friendica\Core\Config;
|
2018-01-22 09:54:13 -05:00
|
|
|
use Friendica\Core\L10n;
|
2018-10-29 17:20:46 -04:00
|
|
|
use Friendica\Core\Logger;
|
2018-08-11 16:40:44 -04:00
|
|
|
use Friendica\Core\Protocol;
|
2018-01-30 21:14:44 -05:00
|
|
|
use Friendica\Core\System;
|
2018-07-20 08:19:26 -04:00
|
|
|
use Friendica\Database\DBA;
|
2019-03-06 23:17:58 -05:00
|
|
|
use Friendica\Model;
|
2017-11-07 22:57:46 -05:00
|
|
|
use Friendica\Protocol\DFRN;
|
2018-01-30 21:14:44 -05:00
|
|
|
use Friendica\Protocol\Diaspora;
|
2017-12-01 14:41:27 -05:00
|
|
|
use Friendica\Protocol\Email;
|
2018-11-08 10:46:50 -05:00
|
|
|
use Friendica\Util\Strings;
|
2018-11-22 17:09:22 -05:00
|
|
|
use Friendica\Util\Network;
|
2019-04-04 16:51:12 -04:00
|
|
|
use Friendica\Core\Worker;
|
2017-01-18 16:45:32 -05:00
|
|
|
|
2018-04-27 08:40:52 -04:00
|
|
|
class Delivery extends BaseObject
|
|
|
|
{
|
2018-10-01 01:44:56 -04:00
|
|
|
const MAIL = 'mail';
|
|
|
|
const SUGGESTION = 'suggest';
|
|
|
|
const RELOCATION = 'relocate';
|
|
|
|
const DELETION = 'drop';
|
|
|
|
const POST = 'wall-new';
|
2019-06-06 00:26:02 -04:00
|
|
|
const POKE = 'poke';
|
2019-06-10 10:19:24 -04:00
|
|
|
const UPLINK = 'uplink';
|
2018-10-01 01:44:56 -04:00
|
|
|
const REMOVAL = 'removeme';
|
|
|
|
const PROFILEUPDATE = 'profileupdate';
|
2018-04-26 22:52:12 -04:00
|
|
|
|
2018-12-07 00:37:17 -05:00
|
|
|
public static function execute($cmd, $target_id, $contact_id)
|
2018-04-27 08:40:52 -04:00
|
|
|
{
|
2018-12-07 00:37:17 -05:00
|
|
|
Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG);
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2012-05-19 05:42:11 -04:00
|
|
|
$top_level = false;
|
2015-12-13 18:39:20 -05:00
|
|
|
$followup = false;
|
2018-04-26 01:45:05 -04:00
|
|
|
$public_message = false;
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-10-16 18:26:43 -04:00
|
|
|
$items = [];
|
2018-04-26 22:52:12 -04:00
|
|
|
if ($cmd == self::MAIL) {
|
2018-12-07 00:37:17 -05:00
|
|
|
$target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($target_item)) {
|
2015-12-13 18:39:20 -05:00
|
|
|
return;
|
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
$uid = $target_item['uid'];
|
2018-04-26 22:52:12 -04:00
|
|
|
} elseif ($cmd == self::SUGGESTION) {
|
2018-12-07 00:37:17 -05:00
|
|
|
$target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($target_item)) {
|
2015-12-13 18:39:20 -05:00
|
|
|
return;
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
$uid = $target_item['uid'];
|
2018-04-26 22:52:12 -04:00
|
|
|
} elseif ($cmd == self::RELOCATION) {
|
2018-12-07 00:37:17 -05:00
|
|
|
$uid = $target_id;
|
2018-10-22 22:24:24 -04:00
|
|
|
$target_item = [];
|
2015-12-13 18:39:20 -05:00
|
|
|
} else {
|
2019-03-06 23:17:58 -05:00
|
|
|
$item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($item) || empty($item['parent'])) {
|
2017-11-19 13:59:55 -05:00
|
|
|
return;
|
2012-05-19 05:42:11 -04:00
|
|
|
}
|
2018-04-26 03:11:18 -04:00
|
|
|
$parent_id = intval($item['parent']);
|
2011-08-28 22:22:27 -04:00
|
|
|
|
2019-03-15 16:31:07 -04:00
|
|
|
$condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
|
2018-06-17 17:35:33 -04:00
|
|
|
$params = ['order' => ['id']];
|
2019-03-06 23:17:58 -05:00
|
|
|
$itemdata = Model\Item::select([], $condition, $params);
|
2018-06-17 17:35:33 -04:00
|
|
|
|
2019-03-06 23:17:58 -05:00
|
|
|
while ($item = Model\Item::fetch($itemdata)) {
|
2018-04-26 03:11:18 -04:00
|
|
|
if ($item['id'] == $parent_id) {
|
|
|
|
$parent = $item;
|
2018-04-26 02:23:01 -04:00
|
|
|
}
|
2018-12-07 00:37:17 -05:00
|
|
|
if ($item['id'] == $target_id) {
|
2018-04-26 03:11:18 -04:00
|
|
|
$target_item = $item;
|
|
|
|
}
|
|
|
|
$items[] = $item;
|
2012-05-19 05:42:11 -04:00
|
|
|
}
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::close($itemdata);
|
2018-04-26 03:11:18 -04:00
|
|
|
|
2018-07-31 01:54:25 -04:00
|
|
|
if (empty($target_item)) {
|
2018-12-07 00:37:17 -05:00
|
|
|
Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
|
2018-07-31 01:54:25 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (empty($parent)) {
|
2018-12-07 00:37:17 -05:00
|
|
|
Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
|
2018-07-31 01:54:25 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-01-17 18:06:27 -05:00
|
|
|
if (!empty($target_item['contact-uid'])) {
|
|
|
|
$uid = $target_item['contact-uid'];
|
|
|
|
} elseif (!empty($target_item['uid'])) {
|
|
|
|
$uid = $target_item['uid'];
|
|
|
|
} else {
|
2019-01-21 16:56:48 -05:00
|
|
|
Logger::log('Only public users for item ' . $target_id, Logger::DEBUG);
|
2019-01-17 18:06:27 -05:00
|
|
|
return;
|
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2012-05-19 05:42:11 -04:00
|
|
|
// avoid race condition with deleting entries
|
2016-03-13 14:47:02 -04:00
|
|
|
if ($items[0]['deleted']) {
|
2017-01-10 11:11:08 -05:00
|
|
|
foreach ($items as $item) {
|
2012-05-19 05:42:11 -04:00
|
|
|
$item['deleted'] = 1;
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2012-05-19 05:42:11 -04:00
|
|
|
}
|
|
|
|
|
2017-01-10 02:40:57 -05:00
|
|
|
// When commenting too fast after delivery, a post wasn't recognized as top level post.
|
|
|
|
// The count then showed more than one entry. The additional check should help.
|
|
|
|
// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
|
2018-12-07 00:37:17 -05:00
|
|
|
if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Top level post');
|
2012-05-19 05:42:11 -04:00
|
|
|
$top_level = true;
|
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2012-05-19 05:42:11 -04:00
|
|
|
// This is IMPORTANT!!!!
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2012-05-19 05:42:11 -04:00
|
|
|
// We will only send a "notify owner to relay" or followup message if the referenced post
|
|
|
|
// originated on our system by virtue of having our hostname somewhere
|
|
|
|
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
|
|
|
|
// if $parent['wall'] == 1 we will already have the parent message in our array
|
|
|
|
// and we will relay the whole lot.
|
2014-08-07 01:59:43 -04:00
|
|
|
|
2018-10-09 13:58:58 -04:00
|
|
|
$localhost = self::getApp()->getHostName();
|
2018-04-26 01:45:05 -04:00
|
|
|
if (strpos($localhost, ':')) {
|
|
|
|
$localhost = substr($localhost, 0, strpos($localhost, ':'));
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2015-12-13 18:39:20 -05:00
|
|
|
/**
|
|
|
|
*
|
|
|
|
* Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
|
|
|
|
* have been known to cause runaway conditions which affected several servers, along with
|
|
|
|
* permissions issues.
|
|
|
|
*
|
|
|
|
*/
|
2014-08-07 01:59:43 -04:00
|
|
|
|
2018-01-17 18:22:01 -05:00
|
|
|
if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
|
2018-10-30 09:58:45 -04:00
|
|
|
Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG);
|
2015-12-13 18:39:20 -05:00
|
|
|
// local followup to remote post
|
|
|
|
$followup = true;
|
|
|
|
}
|
|
|
|
|
2018-04-26 01:45:05 -04:00
|
|
|
if (empty($parent['allow_cid'])
|
|
|
|
&& empty($parent['allow_gid'])
|
|
|
|
&& empty($parent['deny_cid'])
|
|
|
|
&& empty($parent['deny_gid'])
|
|
|
|
&& !$parent["private"]) {
|
|
|
|
$public_message = true;
|
2015-12-13 18:39:20 -05:00
|
|
|
}
|
2012-05-19 05:42:11 -04:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-07-15 14:36:20 -04:00
|
|
|
if (empty($items)) {
|
2018-12-07 00:37:17 -05:00
|
|
|
Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
|
2018-07-15 14:36:20 -04:00
|
|
|
}
|
|
|
|
|
2019-03-06 23:17:58 -05:00
|
|
|
$owner = Model\User::getOwnerDataById($uid);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($owner)) {
|
2018-04-26 01:45:05 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-14 00:05:00 -05:00
|
|
|
// We don't deliver our items to blocked or pending contacts, and not to ourselves either
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', [],
|
2018-02-14 00:05:00 -05:00
|
|
|
['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
|
2012-05-19 05:42:11 -04:00
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($contact)) {
|
2017-11-19 13:59:55 -05:00
|
|
|
return;
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2018-02-14 00:05:00 -05:00
|
|
|
|
2018-11-22 17:09:22 -05:00
|
|
|
if (Network::isUrlBlocked($contact['url'])) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-04-26 01:45:05 -04:00
|
|
|
// Transmit via Diaspora if the thread had started as Diaspora post
|
|
|
|
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
|
2018-08-11 16:40:44 -04:00
|
|
|
if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) {
|
|
|
|
$contact['network'] = Protocol::DIASPORA;
|
2018-04-26 01:45:05 -04:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
|
2015-12-13 18:39:20 -05:00
|
|
|
|
2018-01-04 14:48:56 -05:00
|
|
|
switch ($contact['network']) {
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
case Protocol::DFRN:
|
2018-04-26 01:45:05 -04:00
|
|
|
self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
2018-04-25 17:18:21 -04:00
|
|
|
break;
|
2016-11-19 15:10:29 -05:00
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
case Protocol::DIASPORA:
|
2018-04-26 01:45:05 -04:00
|
|
|
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
2011-08-26 10:29:22 -04:00
|
|
|
break;
|
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
case Protocol::OSTATUS:
|
2012-05-19 05:42:11 -04:00
|
|
|
// Do not send to otatus if we are not configured to send to public networks
|
2017-01-10 11:11:08 -05:00
|
|
|
if ($owner['prvnets']) {
|
2012-05-19 05:42:11 -04:00
|
|
|
break;
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2017-11-06 21:22:52 -05:00
|
|
|
if (Config::get('system','ostatus_disabled') || Config::get('system','dfrn_only')) {
|
2012-05-19 05:42:11 -04:00
|
|
|
break;
|
2017-01-10 11:11:08 -05:00
|
|
|
}
|
2011-09-22 07:11:39 -04:00
|
|
|
|
2015-12-13 18:39:20 -05:00
|
|
|
// There is currently no code here to distribute anything to OStatus.
|
|
|
|
// This is done in "notifier.php" (See "url_recipients" and "push_notify")
|
2011-08-26 10:29:22 -04:00
|
|
|
break;
|
|
|
|
|
2018-08-11 16:40:44 -04:00
|
|
|
case Protocol::MAIL:
|
2018-04-25 17:18:21 -04:00
|
|
|
self::deliverMail($cmd, $contact, $owner, $target_item);
|
|
|
|
break;
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-04-26 23:08:13 -04:00
|
|
|
/**
|
|
|
|
* @brief Deliver content via DFRN
|
|
|
|
*
|
|
|
|
* @param string $cmd Command
|
|
|
|
* @param array $contact Contact record of the receiver
|
|
|
|
* @param array $owner Owner record of the sender
|
|
|
|
* @param array $items Item record of the content and the parent
|
|
|
|
* @param array $target_item Item record of the content
|
|
|
|
* @param boolean $public_message Is the content public?
|
|
|
|
* @param boolean $top_level Is it a thread starter?
|
|
|
|
* @param boolean $followup Is it an answer to a remote post?
|
2019-01-06 16:06:53 -05:00
|
|
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
|
|
|
* @throws \ImagickException
|
2018-04-26 23:08:13 -04:00
|
|
|
*/
|
2018-04-26 01:45:05 -04:00
|
|
|
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
|
2018-04-25 17:18:21 -04:00
|
|
|
{
|
2018-11-11 07:15:17 -05:00
|
|
|
Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
|
2018-04-25 17:18:21 -04:00
|
|
|
|
2018-04-26 22:52:12 -04:00
|
|
|
if ($cmd == self::MAIL) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$item = $target_item;
|
2019-03-06 23:17:58 -05:00
|
|
|
$item['body'] = Model\Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
|
2018-04-25 17:18:21 -04:00
|
|
|
$atom = DFRN::mail($item, $owner);
|
2018-04-26 22:52:12 -04:00
|
|
|
} elseif ($cmd == self::SUGGESTION) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$item = $target_item;
|
|
|
|
$atom = DFRN::fsuggest($item, $owner);
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::delete('fsuggest', ['id' => $item['id']]);
|
2018-04-26 22:52:12 -04:00
|
|
|
} elseif ($cmd == self::RELOCATION) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$atom = DFRN::relocate($owner, $owner['uid']);
|
|
|
|
} elseif ($followup) {
|
2018-04-26 02:23:01 -04:00
|
|
|
$msgitems = [$target_item];
|
2018-04-25 17:18:21 -04:00
|
|
|
$atom = DFRN::entries($msgitems, $owner);
|
|
|
|
} else {
|
|
|
|
$msgitems = [];
|
|
|
|
foreach ($items as $item) {
|
2018-04-26 01:45:05 -04:00
|
|
|
// Only add the parent when we don't delete other items.
|
2018-04-26 22:52:12 -04:00
|
|
|
if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$item["entry:comment-allow"] = true;
|
2018-04-26 01:45:05 -04:00
|
|
|
$item["entry:cid"] = ($top_level ? $contact['id'] : 0);
|
2018-04-25 17:18:21 -04:00
|
|
|
$msgitems[] = $item;
|
|
|
|
}
|
|
|
|
}
|
2018-04-26 17:16:16 -04:00
|
|
|
$atom = DFRN::entries($msgitems, $owner);
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
2012-01-31 23:03:46 -05:00
|
|
|
|
2018-11-11 07:15:17 -05:00
|
|
|
Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA);
|
2012-01-31 23:03:46 -05:00
|
|
|
|
2018-04-26 17:16:16 -04:00
|
|
|
$basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3));
|
2012-01-31 23:03:46 -05:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
// perform local delivery if we are on the same site
|
2012-02-24 01:11:26 -05:00
|
|
|
|
2018-11-08 10:46:50 -05:00
|
|
|
if (Strings::compareLink($basepath, System::baseUrl())) {
|
2018-11-08 11:28:29 -05:00
|
|
|
$condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
|
2018-07-20 08:19:26 -04:00
|
|
|
$target_self = DBA::selectFirst('contact', ['uid'], $condition);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($target_self)) {
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
$target_uid = $target_self['uid'];
|
|
|
|
|
|
|
|
// Check if the user has got this contact
|
2019-03-06 23:17:58 -05:00
|
|
|
$cid = Model\Contact::getIdForURL($owner['url'], $target_uid);
|
2018-04-25 17:18:21 -04:00
|
|
|
if (!$cid) {
|
|
|
|
// Otherwise there should be a public contact
|
2019-03-06 23:17:58 -05:00
|
|
|
$cid = Model\Contact::getIdForURL($owner['url']);
|
2018-04-25 17:18:21 -04:00
|
|
|
if (!$cid) {
|
|
|
|
return;
|
2011-08-26 10:29:22 -04:00
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-08-19 09:37:56 -04:00
|
|
|
$target_importer = DFRN::getImporter($cid, $target_uid);
|
|
|
|
if (empty($target_importer)) {
|
|
|
|
// This should never happen
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
DFRN::import($atom, $target_importer);
|
|
|
|
return;
|
|
|
|
}
|
2015-12-13 18:39:20 -05:00
|
|
|
|
2018-04-26 17:16:16 -04:00
|
|
|
// We don't have a relationship with contacts on a public post.
|
|
|
|
// Se we transmit with the new method and via Diaspora as a fallback
|
2018-07-15 14:36:20 -04:00
|
|
|
if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
|
2018-04-27 01:11:52 -04:00
|
|
|
// Transmit in public if it's a relay post
|
2019-03-06 23:17:58 -05:00
|
|
|
$public_dfrn = ($contact['contact-type'] == Model\Contact::TYPE_RELAY);
|
2018-04-27 01:11:52 -04:00
|
|
|
|
|
|
|
$deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
|
2018-04-30 01:56:40 -04:00
|
|
|
|
|
|
|
// We never spool failed relay deliveries
|
|
|
|
if ($public_dfrn) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
|
2018-04-30 01:56:40 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-04-27 00:55:46 -04:00
|
|
|
if (($deliver_status < 200) || ($deliver_status > 299)) {
|
2018-04-25 17:55:24 -04:00
|
|
|
// Transmit via Diaspora if not possible via Friendica
|
2018-04-26 01:45:05 -04:00
|
|
|
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
2018-04-25 17:55:24 -04:00
|
|
|
return;
|
|
|
|
}
|
2018-09-22 02:47:35 -04:00
|
|
|
} elseif ($cmd != self::RELOCATION) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$deliver_status = DFRN::deliver($owner, $contact, $atom);
|
2018-09-22 02:47:35 -04:00
|
|
|
} else {
|
|
|
|
$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2019-05-19 13:59:37 -04:00
|
|
|
Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]);
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
|
|
|
|
// We successfully delivered a message, the contact is alive
|
2019-03-06 23:17:58 -05:00
|
|
|
Model\Contact::unmarkForArchival($contact);
|
2019-06-01 02:54:47 -04:00
|
|
|
|
2019-06-10 10:19:24 -04:00
|
|
|
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
2019-06-01 02:54:47 -04:00
|
|
|
Model\ItemDeliveryData::incrementQueueDone($target_item['id']);
|
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
} else {
|
|
|
|
// The message could not be delivered. We mark the contact as "dead"
|
2019-03-06 23:17:58 -05:00
|
|
|
Model\Contact::markForArchival($contact);
|
2018-07-24 14:12:09 -04:00
|
|
|
|
2019-06-01 02:54:47 -04:00
|
|
|
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
|
|
|
|
Worker::defer();
|
2012-05-19 05:42:11 -04:00
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
|
2018-04-26 23:08:13 -04:00
|
|
|
/**
|
|
|
|
* @brief Deliver content via Diaspora
|
|
|
|
*
|
|
|
|
* @param string $cmd Command
|
|
|
|
* @param array $contact Contact record of the receiver
|
|
|
|
* @param array $owner Owner record of the sender
|
|
|
|
* @param array $items Item record of the content and the parent
|
|
|
|
* @param array $target_item Item record of the content
|
|
|
|
* @param boolean $public_message Is the content public?
|
|
|
|
* @param boolean $top_level Is it a thread starter?
|
|
|
|
* @param boolean $followup Is it an answer to a remote post?
|
2019-01-06 16:06:53 -05:00
|
|
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
|
|
|
* @throws \ImagickException
|
2018-04-26 23:08:13 -04:00
|
|
|
*/
|
2018-04-26 01:45:05 -04:00
|
|
|
private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
|
2018-04-25 17:18:21 -04:00
|
|
|
{
|
2018-04-26 01:45:05 -04:00
|
|
|
// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
|
2019-03-06 23:17:58 -05:00
|
|
|
$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Model\User::ACCOUNT_TYPE_COMMUNITY);
|
2018-04-26 01:45:05 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
if ($public_message) {
|
|
|
|
$loc = 'public batch ' . $contact['batch'];
|
|
|
|
} else {
|
2018-04-26 01:45:05 -04:00
|
|
|
$loc = $contact['addr'];
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
|
|
|
|
2018-11-11 07:15:17 -05:00
|
|
|
Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via Diaspora to ' . $loc);
|
2018-04-25 17:18:21 -04:00
|
|
|
|
|
|
|
if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
|
|
|
|
return;
|
|
|
|
}
|
2018-04-26 22:52:12 -04:00
|
|
|
if ($cmd == self::MAIL) {
|
2018-04-25 17:18:21 -04:00
|
|
|
Diaspora::sendMail($target_item, $owner, $contact);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-04-26 22:52:12 -04:00
|
|
|
if ($cmd == self::SUGGESTION) {
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!$contact['pubkey'] && !$public_message) {
|
|
|
|
return;
|
|
|
|
}
|
2019-06-01 02:54:47 -04:00
|
|
|
|
2018-11-11 07:15:17 -05:00
|
|
|
if ($cmd == self::RELOCATION) {
|
2019-06-01 02:54:47 -04:00
|
|
|
$deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
|
2018-11-11 07:15:17 -05:00
|
|
|
} elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
|
2018-04-25 17:18:21 -04:00
|
|
|
// top-level retraction
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('diaspora retract: ' . $loc);
|
2019-06-01 02:54:47 -04:00
|
|
|
$deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
|
2018-04-25 17:18:21 -04:00
|
|
|
} elseif ($followup) {
|
|
|
|
// send comments and likes to owner to relay
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('diaspora followup: ' . $loc);
|
2019-06-01 02:54:47 -04:00
|
|
|
$deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message);
|
2018-04-25 17:18:21 -04:00
|
|
|
} elseif ($target_item['uri'] !== $target_item['parent-uri']) {
|
|
|
|
// we are the relay - send comments, likes and relayable_retractions to our conversants
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('diaspora relay: ' . $loc);
|
2019-06-01 02:54:47 -04:00
|
|
|
$deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message);
|
2018-04-25 17:18:21 -04:00
|
|
|
} elseif ($top_level && !$walltowall) {
|
|
|
|
// currently no workable solution for sending walltowall
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('diaspora status: ' . $loc);
|
2019-06-01 02:54:47 -04:00
|
|
|
$deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
|
|
|
|
} else {
|
|
|
|
Logger::log('Unknown mode ' . $cmd . ' for ' . $loc);
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-06-01 02:54:47 -04:00
|
|
|
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
|
|
|
|
// We successfully delivered a message, the contact is alive
|
|
|
|
Model\Contact::unmarkForArchival($contact);
|
|
|
|
|
2019-06-10 10:19:24 -04:00
|
|
|
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
2019-06-01 02:54:47 -04:00
|
|
|
Model\ItemDeliveryData::incrementQueueDone($target_item['id']);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// The message could not be delivered. We mark the contact as "dead"
|
|
|
|
Model\Contact::markForArchival($contact);
|
|
|
|
|
2019-06-01 07:28:37 -04:00
|
|
|
if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) {
|
2019-06-01 02:54:47 -04:00
|
|
|
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
|
|
|
|
// defer message for redelivery
|
|
|
|
Worker::defer();
|
2019-06-10 10:19:24 -04:00
|
|
|
} elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
|
2019-06-01 02:54:47 -04:00
|
|
|
Model\ItemDeliveryData::incrementQueueDone($target_item['id']);
|
|
|
|
}
|
|
|
|
}
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
|
|
|
|
2018-04-26 23:08:13 -04:00
|
|
|
/**
|
|
|
|
* @brief Deliver content via mail
|
|
|
|
*
|
|
|
|
* @param string $cmd Command
|
|
|
|
* @param array $contact Contact record of the receiver
|
|
|
|
* @param array $owner Owner record of the sender
|
|
|
|
* @param array $target_item Item record of the content
|
2019-01-06 16:06:53 -05:00
|
|
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
|
|
|
* @throws \ImagickException
|
2018-04-26 23:08:13 -04:00
|
|
|
*/
|
2018-04-25 17:18:21 -04:00
|
|
|
private static function deliverMail($cmd, $contact, $owner, $target_item)
|
|
|
|
{
|
|
|
|
if (Config::get('system','dfrn_only')) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
|
|
|
|
|
|
|
$addr = $contact['addr'];
|
|
|
|
if (!strlen($addr)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-06-10 10:19:24 -04:00
|
|
|
if (!in_array($cmd, [self::POST, self::POKE])) {
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
$local_user = DBA::selectFirst('user', [], ['uid' => $owner['uid']]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($local_user)) {
|
2018-04-25 17:18:21 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
|
2018-04-26 01:45:05 -04:00
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
$reply_to = '';
|
2018-07-20 08:19:26 -04:00
|
|
|
$mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($mailacct) && !empty($mailacct['reply_to'])) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$reply_to = $mailacct['reply_to'];
|
|
|
|
}
|
|
|
|
|
2018-04-25 17:55:24 -04:00
|
|
|
$subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
|
2018-04-25 17:18:21 -04:00
|
|
|
|
|
|
|
// only expose our real email address to true friends
|
|
|
|
|
2019-03-06 23:17:58 -05:00
|
|
|
if (($contact['rel'] == Model\Contact::FRIEND) && !$contact['blocked']) {
|
2018-04-25 17:18:21 -04:00
|
|
|
if ($reply_to) {
|
|
|
|
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to.'>' . "\n";
|
|
|
|
$headers .= 'Sender: ' . $local_user['email'] . "\n";
|
|
|
|
} else {
|
|
|
|
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n";
|
|
|
|
}
|
|
|
|
} else {
|
2018-10-09 13:58:58 -04:00
|
|
|
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->getHostName() . '>' . "\n";
|
2018-04-25 17:18:21 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
|
|
|
|
|
|
|
|
if ($target_item['uri'] !== $target_item['parent-uri']) {
|
|
|
|
$headers .= "References: <" . Email::iri2msgid($target_item["parent-uri"]) . ">";
|
|
|
|
|
|
|
|
// If Threading is enabled, write down the correct parent
|
|
|
|
if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) {
|
|
|
|
$headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">";
|
|
|
|
}
|
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
|
|
|
|
2018-04-25 17:18:21 -04:00
|
|
|
$headers .= "\n";
|
|
|
|
|
|
|
|
if (empty($target_item['title'])) {
|
|
|
|
$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
|
2019-03-06 23:17:58 -05:00
|
|
|
$title = Model\Item::selectFirst(['title'], $condition);
|
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
|
|
|
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($title) && ($title['title'] != '')) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$subject = $title['title'];
|
|
|
|
} else {
|
|
|
|
$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
|
2019-03-06 23:17:58 -05:00
|
|
|
$title = Model\Item::selectFirst(['title'], $condition);
|
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
|
|
|
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($title) && ($title['title'] != '')) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$subject = $title['title'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
|
2018-04-26 17:16:16 -04:00
|
|
|
if (strncasecmp($subject, 'RE:', 3)) {
|
2018-04-25 17:18:21 -04:00
|
|
|
$subject = 'Re: ' . $subject;
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
|
2018-04-25 17:55:24 -04:00
|
|
|
Email::send($addr, $subject, $headers, $target_item);
|
2017-11-19 13:59:55 -05:00
|
|
|
}
|
2011-08-26 10:29:22 -04:00
|
|
|
}
|