use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
const REPLY = 1; // Regular reply that is stored locally
const REPLY_RC = 2; // Reply that will be relayed
+ /**
+ * @brief Generates an array of contact and user for DFRN imports
+ *
+ * This array contains not only the receiver but also the sender of the message.
+ *
+ * @param integer $cid Contact id
+ * @param integer $uid User id
+ *
+ * @return array importer
+ */
+ public static function getImporter($cid, $uid = 0)
+ {
+ $condition = ['id' => $cid, 'blocked' => false, 'pending' => false];
+ $contact = DBA::selectFirst('contact', [], $condition);
+ if (!DBA::isResult($contact)) {
+ return [];
+ }
+
+ $contact['cpubkey'] = $contact['pubkey'];
+ $contact['cprvkey'] = $contact['prvkey'];
+ $contact['senderName'] = $contact['name'];
+
+ if ($uid != 0) {
+ $condition = ['uid' => $uid, 'account_expired' => false, 'account_removed' => false];
+ $user = DBA::selectFirst('user', [], $condition);
+ if (!DBA::isResult($user)) {
+ return [];
+ }
+
+ $user['importer_uid'] = $user['uid'];
+ $user['uprvkey'] = $user['prvkey'];
+ } else {
+ $user = ['importer_uid' => 0, 'uprvkey' => '', 'timezone' => 'UTC',
+ 'nickname' => '', 'sprvkey' => '', 'spubkey' => '',
+ 'page-flags' => 0, 'account-type' => 0, 'prvnets' => 0];
+ }
+
+ return array_merge($contact, $user);
+ }
+
/**
* @brief Generates the atom entries for delivery.php
*
);
if (! DBA::isResult($r)) {
- logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_WARNING);
+ Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
killme();
}
);
if (! DBA::isResult($r)) {
- logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_WARNING);
+ Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING);
killme();
}
$contact = $r[0];
- include_once 'include/security.php';
$set = PermissionSet::get($owner_id, $contact['id']);
intval(TERM_CATEGORY),
intval($owner_id)
);
- //$sql_extra .= file_tag_file_query('item',$category,'category');
+ //$sql_extra .= FileTag::fileQuery('item',$category,'category');
}
if ($public_feed && ! $converse) {
XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = ["rel" => "photo", "type" => "image/jpeg",
- "media:width" => 175, "media:height" => 175, "href" => $owner['photo']];
+ "media:width" => 300, "media:height" => 300, "href" => $owner['photo']];
if (!$public || !$hidewall) {
$attributes["dfrn:updated"] = $picdate;
}
foreach ($mentioned as $mention) {
- $r = q(
- "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
- intval($owner["uid"]),
- DBA::escape(normalise_link($mention))
- );
+ $condition = ['uid' => $owner["uid"], 'nurl' => normalise_link($mention)];
+ $contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition);
- if (DBA::isResult($r) && ($r[0]["forum"] || $r[0]["prv"])) {
+ if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) {
XML::addElement(
$doc,
$entry,
* @return int Deliver status. Negative values mean an error.
* @todo Add array type-hint for $owner, $contact
*/
- public static function deliver($owner, $contact, $atom, $dissolve = false)
+ public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
{
$a = get_app();
// At first try the Diaspora transport layer
- $ret = self::transmit($owner, $contact, $atom);
- if ($ret >= 200) {
- logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
- return $ret;
+ if (!$dissolve && !$legacy_transport) {
+ $curlResult = self::transmit($owner, $contact, $atom);
+ if ($curlResult >= 200) {
+ Logger::log('Delivery via Diaspora transport layer was successful with status ' . $curlResult);
+ return $curlResult;
+ }
}
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
$rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
- logger("Local rino version: ". $rino, LOGGER_DEBUG);
+ Logger::log("Local rino version: ". $rino, Logger::DEBUG);
$ssl_val = intval(Config::get('system', 'ssl_policy'));
$ssl_policy = '';
$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino='.$rino : '');
- logger('dfrn_deliver: ' . $url);
+ Logger::log('dfrn_deliver: ' . $url);
- $ret = Network::curl($url);
+ $curlResult = Network::curl($url);
- if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
+ if ($curlResult->isTimeout()) {
Contact::markForArchival($contact);
return -2; // timed out
}
- $xml = $ret['body'];
+ $xml = $curlResult->getBody();
- $curl_stat = $a->get_curl_code();
+ $curl_stat = $curlResult->getReturnCode();
if (empty($curl_stat)) {
Contact::markForArchival($contact);
return -3; // timed out
}
- logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
+ Logger::log('dfrn_deliver: ' . $xml, Logger::DATA);
if (empty($xml)) {
Contact::markForArchival($contact);
}
if (strpos($xml, '<?xml') === false) {
- logger('dfrn_deliver: no valid XML returned');
- logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
+ Logger::log('dfrn_deliver: no valid XML returned');
+ Logger::log('dfrn_deliver: returned XML: ' . $xml, Logger::DATA);
Contact::markForArchival($contact);
return 3;
}
$rino_remote_version = intval($res->rino);
$page = (($owner['page-flags'] == Contact::PAGE_COMMUNITY) ? 1 : 0);
- logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
+ Logger::log("Remote rino version: ".$rino_remote_version." for ".$contact["url"], Logger::DEBUG);
if ($owner['page-flags'] == Contact::PAGE_PRVGROUP) {
$page = 2;
$final_dfrn_id = '';
if ($perm) {
- if ((($perm == 'rw') && (! intval($contact['writable'])))
- || (($perm == 'r') && (intval($contact['writable'])))
+ if ((($perm == 'rw') && !intval($contact['writable']))
+ || (($perm == 'r') && intval($contact['writable']))
) {
- q(
- "update contact set writable = %d where id = %d",
- intval(($perm == 'rw') ? 1 : 0),
- intval($contact['id'])
- );
+ DBA::update('contact', ['writable' => ($perm == 'rw')], ['id' => $contact['id']]);
+
$contact['writable'] = (string) 1 - intval($contact['writable']);
}
}
}
if ($final_dfrn_id != $orig_id) {
- logger('dfrn_deliver: wrong dfrn_id.');
+ Logger::log('dfrn_deliver: wrong dfrn_id.');
// did not decode properly - cannot trust this site
Contact::markForArchival($contact);
return 3;
if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
- logger('rino version: '. $rino_remote_version);
+ Logger::log('rino version: '. $rino_remote_version);
switch ($rino_remote_version) {
case 1:
$key = openssl_random_pseudo_bytes(16);
$data = self::aesEncrypt($postvars['data'], $key);
break;
+
default:
- logger("rino: invalid requested version '$rino_remote_version'");
+ Logger::log("rino: invalid requested version '$rino_remote_version'");
Contact::markForArchival($contact);
return -8;
}
}
}
- logger('md5 rawkey ' . md5($postvars['key']));
+ Logger::log('md5 rawkey ' . md5($postvars['key']));
$postvars['key'] = bin2hex($postvars['key']);
}
- logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
+ Logger::log('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), Logger::DATA);
- $xml = Network::post($contact['notify'], $postvars);
+ $postResult = Network::post($contact['notify'], $postvars);
- logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
+ $xml = $postResult->getBody();
- $curl_stat = $a->get_curl_code();
+ Logger::log('dfrn_deliver: ' . "RECEIVED: " . $xml, Logger::DATA);
+
+ $curl_stat = $postResult->getReturnCode();
if (empty($curl_stat) || empty($xml)) {
Contact::markForArchival($contact);
return -9; // timed out
}
- if (($curl_stat == 503) && stristr($a->get_curl_headers(), 'retry-after')) {
+ if (($curl_stat == 503) && stristr($postResult->getHeader(), 'retry-after')) {
Contact::markForArchival($contact);
return -10;
}
if (strpos($xml, '<?xml') === false) {
- logger('dfrn_deliver: phase 2: no valid XML returned');
- logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
+ Logger::log('dfrn_deliver: phase 2: no valid XML returned');
+ Logger::log('dfrn_deliver: phase 2: returned XML: ' . $xml, Logger::DATA);
Contact::markForArchival($contact);
return 3;
}
}
if (!empty($res->message)) {
- logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
+ Logger::log('Delivery returned status '.$res->status.' - '.$res->message, Logger::DEBUG);
}
if (($res->status >= 200) && ($res->status <= 299)) {
if (!$public_batch) {
if (empty($contact['addr'])) {
- logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
+ Logger::log('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
if (Contact::updateFromProbe($contact['id'])) {
$new_contact = DBA::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
$contact['addr'] = $new_contact['addr'];
}
if (empty($contact['addr'])) {
- logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
+ Logger::log('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
Contact::markForArchival($contact);
return -21;
}
$fcontact = Diaspora::personByHandle($contact['addr']);
if (empty($fcontact)) {
- logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+ Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
Contact::markForArchival($contact);
return -22;
}
$content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
- $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+ $postResult = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+ $xml = $postResult->getBody();
- $curl_stat = $a->get_curl_code();
+ $curl_stat = $postResult->getReturnCode();
if (empty($curl_stat) || empty($xml)) {
- logger('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
+ Logger::log('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
Contact::markForArchival($contact);
return -9; // timed out
}
- if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+ if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
Contact::markForArchival($contact);
return -10;
}
if (strpos($xml, '<?xml') === false) {
- logger('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
- logger('Returned XML: ' . $xml, LOGGER_DATA);
+ Logger::log('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
+ Logger::log('Returned XML: ' . $xml, Logger::DATA);
Contact::markForArchival($contact);
return 3;
}
}
if (!empty($res->message)) {
- logger('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
+ Logger::log('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, Logger::DEBUG);
}
if (($res->status >= 200) && ($res->status <= 299)) {
private static function birthdayEvent($contact, $birthday)
{
// Check for duplicates
- $r = q(
- "SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
- intval($contact['uid']),
- intval($contact['id']),
- DBA::escape(DateTimeFormat::utc($birthday)),
- DBA::escape('birthday')
- );
-
- if (DBA::isResult($r)) {
+ $condition = ['uid' => $contact['uid'], 'cid' => $contact['id'],
+ 'start' => DateTimeFormat::utc($birthday), 'type' => 'birthday'];
+ if (DBA::exists('event', $condition)) {
return;
}
- logger('updating birthday: ' . $birthday . ' for contact ' . $contact['id']);
+ Logger::log('updating birthday: ' . $birthday . ' for contact ' . $contact['id']);
$bdtext = L10n::t('%s\'s birthday', $contact['name']);
$bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]');
$author["network"] = $contact_old["network"];
} else {
if (!$onlyfetch) {
- logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG);
+ Logger::log("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, Logger::DEBUG);
}
$author["contact-unknown"] = true;
}
}
+ if (empty($author['avatar'])) {
+ Logger::log('Empty author: ' . $xml);
+ }
+
if (DBA::isResult($contact_old) && !$onlyfetch) {
- logger("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", LOGGER_DEBUG);
+ Logger::log("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", Logger::DEBUG);
$poco = ["url" => $contact_old["url"]];
// If the "hide" element is present then the profile isn't searchable.
$hide = intval(XML::getFirstNodeValue($xpath, $element . "/dfrn:hide/text()", $context) == "true");
- logger("Hidden status for contact " . $contact_old["url"] . ": " . $hide, LOGGER_DEBUG);
+ Logger::log("Hidden status for contact " . $contact_old["url"] . ": " . $hide, Logger::DEBUG);
// If the contact isn't searchable then set the contact to "hidden".
// Problem: This can be manually overridden by the user.
// Update check for this field has to be done differently
$datefields = ["name-date", "uri-date"];
foreach ($datefields as $field) {
+ // The date fields arrives as '2018-07-17T10:44:45Z' - the database return '2018-07-17 10:44:45'
+ // The fields have to be in the same format to be comparable, since strtotime does add timezones.
+ $contact[$field] = DateTimeFormat::utc($contact[$field]);
+
if (strtotime($contact[$field]) > strtotime($contact_old[$field])) {
- logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG);
+ Logger::log("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", Logger::DEBUG);
$update = true;
}
}
foreach ($fields as $field => $data) {
if ($contact[$field] != $contact_old[$field]) {
- logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG);
+ Logger::log("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", Logger::DEBUG);
$update = true;
}
}
if ($update) {
- logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
+ Logger::log("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", Logger::DEBUG);
q(
"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
*/
private static function processMail($xpath, $mail, $importer)
{
- logger("Processing mails");
+ Logger::log("Processing mails");
/// @TODO Rewrite this to one statement
$msg = [];
notification($notif_params);
- logger("Mail is processed, notification was sent.");
+ Logger::log("Mail is processed, notification was sent.");
}
/**
{
$a = get_app();
- logger("Processing suggestions");
+ Logger::log("Processing suggestions");
/// @TODO Rewrite this to one statement
$suggest = [];
// Does our member already have a friend matching this description?
- $r = q(
- "SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($suggest["name"]),
- DBA::escape(normalise_link($suggest["url"])),
- intval($suggest["uid"])
- );
-
/*
* The valid result means the friend we're about to send a friend
* suggestion already has them in their contact, which means no further
*
* @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
*/
- if (DBA::isResult($r)) {
+ $condition = ['name' => $suggest["name"], 'nurl' => normalise_link($suggest["url"]),
+ 'uid' => $suggest["uid"]];
+ if (DBA::exists('contact', $condition)) {
return false;
}
// Do we already have an fcontact record for this person?
$fid = 0;
- $r = q(
- "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
- DBA::escape($suggest["url"]),
- DBA::escape($suggest["name"]),
- DBA::escape($suggest["request"])
- );
- if (DBA::isResult($r)) {
- $fid = $r[0]["id"];
-
- // OK, we do. Do we already have an introduction for this person ?
- $r = q(
- "SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
- intval($suggest["uid"]),
- intval($fid)
- );
+ $condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]];
+ $fcontact = DBA::selectFirst('fcontact', ['id'], $condition);
+ if (DBA::isResult($fcontact)) {
+ $fid = $fcontact["id"];
- /*
- * The valid result means the friend we're about to send a friend
- * suggestion already has them in their contact, which means no further
- * action is required.
- *
- * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
- */
- if (DBA::isResult($r)) {
+ // OK, we do. Do we already have an introduction for this person?
+ if (DBA::exists('intro', ['uid' => $suggest["uid"], 'fid' => $fid])) {
+ /*
+ * The valid result means the friend we're about to send a friend
+ * suggestion already has them in their contact, which means no further
+ * action is required.
+ *
+ * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+ */
return false;
}
}
DBA::escape($suggest["request"])
);
}
- $r = q(
- "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
- DBA::escape($suggest["url"]),
- DBA::escape($suggest["name"]),
- DBA::escape($suggest["request"])
- );
+
+ $condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]];
+ $fcontact = DBA::selectFirst('fcontact', ['id'], $condition);
/*
* If no record in fcontact is found, below INSERT statement will not
* link an introduction to it.
*/
- if (!DBA::isResult($r)) {
+ if (!DBA::isResult($fcontact)) {
// Database record did not get created. Quietly give up.
killme();
}
*/
private static function processRelocation($xpath, $relocation, $importer)
{
- logger("Processing relocations");
+ Logger::log("Processing relocations");
/// @TODO Rewrite this to one statement
$relocate = [];
);
if (!DBA::isResult($r)) {
- logger("Query failed to execute, no result returned in " . __FUNCTION__);
+ Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
}
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
- logger('Contacts are updated.');
+ Logger::log('Contacts are updated.');
/// @TODO
/// merge with current record, current contents have priority
if ($importer["page-flags"] == Contact::PAGE_COMMUNITY || $importer["page-flags"] == Contact::PAGE_PRVGROUP) {
$sql_extra = "";
$community = true;
- logger("possible community action");
+ Logger::log("possible community action");
} else {
$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
}
*/
if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
$is_a_remote_action = false;
- logger("not a community action");
+ Logger::log("not a community action");
}
if ($is_a_remote_action) {
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
$author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]);
+ $item['id'] = $posted_id;
+
+ $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]);
+ $item["parent"] = $parent['id'];
+
// send a notification
notification(
[
*/
private static function processVerbs($entrytype, $importer, &$item, &$is_like)
{
- logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
+ Logger::log("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, Logger::DEBUG);
if (($entrytype == DFRN::TOP_LEVEL)) {
// The filling of the the "contact" variable is done for legcy reasons
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
- logger("New follower");
+ Logger::log("New follower");
Contact::addRelationship($importer, $contact, $item, $nickname);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
- logger("Lost follower");
+ Logger::log("Lost follower");
Contact::removeFollower($importer, $contact, $item);
return false;
}
if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
- logger("New friend request");
+ Logger::log("New friend request");
Contact::addRelationship($importer, $contact, $item, $nickname, true);
return false;
}
if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
- logger("Lost sharer");
+ Logger::log("Lost sharer");
Contact::removeSharer($importer, $contact, $item);
return false;
}
if (Item::exists($condition)) {
return false;
}
+
+ // The owner of an activity must be the author
+ $item["owner-name"] = $item["author-name"];
+ $item["owner-link"] = $item["author-link"];
+ $item["owner-avatar"] = $item["author-avatar"];
+ $item["owner-id"] = $item["author-id"];
} else {
$is_like = false;
}
$item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
if (!DBA::isResult($item_tag)) {
- logger("Query failed to execute, no result returned in " . __FUNCTION__);
+ Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
}
break;
case "enclosure":
$enclosure = $href;
- if (strlen($item["attach"])) {
+
+ if (!empty($item["attach"])) {
$item["attach"] .= ",";
+ } else {
+ $item["attach"] = "";
}
$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
*/
private static function processEntry($header, $xpath, $entry, $importer, $xml)
{
- logger("Processing entries");
+ Logger::log("Processing entries");
$item = $header;
);
// Is there an existing item?
if (DBA::isResult($current) && !self::isEditedTimestampNewer($current, $item)) {
- logger("Item ".$item["uri"]." (".$item['edited'].") already existed.", LOGGER_DEBUG);
+ Logger::log("Item ".$item["uri"]." (".$item['edited'].") already existed.", Logger::DEBUG);
return;
}
// Fetch the owner
- $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
+ $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true, $xml);
$owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
$item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
// fetch the author
- $author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true);
+ $author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true, $xml);
$item["author-name"] = $author["name"];
$item["author-link"] = $author["link"];
/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
- $base_url = get_app()->get_baseurl();
+ $base_url = get_app()->getBaseURL();
$item['body'] = reltoabs($item['body'], $base_url);
$item['body'] = html2bb_video($item['body']);
$item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry);
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
- $dsprsig = unxmlify(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
+ $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
}
// Is it an event?
if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
- logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
+ Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
$ev = Event::fromBBCode($item["body"]);
if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
- logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
+ Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
$ev["cid"] = $importer["id"];
$ev["uid"] = $importer["importer_uid"];
$ev["uri"] = $item["uri"];
$ev["guid"] = $item["guid"];
$ev["plink"] = $item["plink"];
- $r = q(
- "SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($item["uri"]),
- intval($importer["importer_uid"])
- );
- if (DBA::isResult($r)) {
- $ev["id"] = $r[0]["id"];
+ $condition = ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]];
+ $event = DBA::selectFirst('event', ['id'], $condition);
+ if (DBA::isResult($event)) {
+ $ev["id"] = $event["id"];
}
$event_id = Event::store($ev);
- logger("Event ".$event_id." was stored", LOGGER_DEBUG);
+ Logger::log("Event ".$event_id." was stored", Logger::DEBUG);
return;
}
}
}
if (!self::processVerbs($entrytype, $importer, $item, $is_like)) {
- logger("Exiting because 'processVerbs' told us so", LOGGER_DEBUG);
+ Logger::log("Exiting because 'processVerbs' told us so", Logger::DEBUG);
return;
}
// This check is done here to be able to receive connection requests in "processVerbs"
if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) {
- logger("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", LOGGER_DEBUG);
+ Logger::log("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", Logger::DEBUG);
return;
}
// Update content if 'updated' changes
if (DBA::isResult($current)) {
if (self::updateContent($current, $item, $importer, $entrytype)) {
- logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
+ Logger::log("Item ".$item["uri"]." was updated.", Logger::DEBUG);
} else {
- logger("Item " . $item["uri"] . " already existed.", LOGGER_DEBUG);
+ Logger::log("Item " . $item["uri"] . " already existed.", Logger::DEBUG);
}
return;
}
$parent = 0;
if ($posted_id) {
- logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
+ Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG);
if ($item['uid'] == 0) {
Item::distribute($posted_id);
}
} else { // $entrytype == DFRN::TOP_LEVEL
if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) {
- logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
+ Logger::log("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", Logger::DEBUG);
return;
}
if (!link_compare($item["owner-link"], $importer["url"])) {
* the tgroup delivery code called from Item::insert will correct it if it's a forum,
* but we're going to unconditionally correct it here so that the post will always be owned by our contact.
*/
- logger('Correcting item owner.', LOGGER_DEBUG);
+ Logger::log('Correcting item owner.', Logger::DEBUG);
$item["owner-link"] = $importer["url"];
$item["owner-id"] = Contact::getIdForURL($importer["url"], 0);
}
if (($importer["rel"] == Contact::FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
- logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
+ Logger::log("Contact ".$importer["id"]." is only follower and tgroup check was negative.", Logger::DEBUG);
return;
}
$posted_id = $notify;
}
- logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
+ Logger::log("Item was stored with id ".$posted_id, Logger::DEBUG);
if ($item['uid'] == 0) {
Item::distribute($posted_id);
*/
private static function processDeletion($xpath, $deletion, $importer)
{
- logger("Processing deletions");
+ Logger::log("Processing deletions");
$uri = null;
foreach ($deletion->attributes as $attributes) {
$condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
$item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted'], $condition);
if (!DBA::isResult($item)) {
- logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG);
+ Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG);
return;
}
if (strstr($item['file'], '[')) {
- logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+ Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", Logger::DEBUG);
return;
}
// When it is a starting post it has to belong to the person that wants to delete it
if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
- logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
+ Logger::log("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG);
return;
}
if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) {
$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
if (!Item::exists($condition)) {
- logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
+ Logger::log("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG);
return;
}
}
return;
}
- logger('deleting item '.$item['id'].' uri='.$uri, LOGGER_DEBUG);
+ Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG);
Item::delete(['id' => $item['id']]);
}
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
}
- logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
+ Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
// is it a public forum? Private forums aren't exposed with this method
$forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));
self::processEntry($header, $xpath, $entry, $importer, $xml);
}
}
- logger("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
+ Logger::log("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
return 200;
}
$url = curPageURL();
- logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+ Logger::log('auto_redir: ' . $r[0]['name'] . ' ' . $sec, Logger::DEBUG);
$dest = (($url) ? '&destination_url=' . $url : '');
- goaway($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+ System::externalRedirect($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
}
return false;
}
- $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
- if (!DBA::isResult($u)) {
+ $user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]);
+ if (!DBA::isResult($user)) {
return false;
}
- $community_page = ($u[0]['page-flags'] == Contact::PAGE_COMMUNITY);
- $prvgroup = ($u[0]['page-flags'] == Contact::PAGE_PRVGROUP);
+ $community_page = ($user['page-flags'] == Contact::PAGE_COMMUNITY);
+ $prvgroup = ($user['page-flags'] == Contact::PAGE_PRVGROUP);
- $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+ $link = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
/*
* Diaspora uses their own hardwired link URL in @-tags
* instead of the one we supply with webfinger
*/
- $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+ $dlink = normalise_link(System::baseUrl() . '/u/' . $user['nickname']);
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
if ($cnt) {
foreach ($matches as $mtch) {
if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
$mention = true;
- logger('mention found: ' . $mtch[2]);
+ Logger::log('mention found: ' . $mtch[2]);
}
}
}
projects / friendica.git / blobdiff