* @param array $owner Owner record
*
* @return string DFRN entries
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function entries($items, $owner)
{
}
}
-
-
// default permissions - anonymous user
$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' ";
);
if (! DBM::is_result($r)) {
+ logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_WARNING);
killme();
}
);
if (! DBM::is_result($r)) {
+ logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_WARNING);
killme();
}
$groups = Group::getIdsByContactId($contact['id']);
if (count($groups)) {
- for ($x = 0; $x < count($groups); $x ++)
+ for ($x = 0; $x < count($groups); $x ++) {
$groups[$x] = '<' . intval($groups[$x]) . '>' ;
+ }
+
$gs = implode('|', $groups);
} else {
$gs = '<<>>' ; // Impossible to match
* @param array $owner Owner record
*
* @return string DFRN mail
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function mail($item, $owner)
{
* @param array $owner Owner record
*
* @return string DFRN suggestions
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function fsuggest($item, $owner)
{
* @param int $uid User ID
*
* @return string DFRN relocations
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function relocate($owner, $uid)
{
* @param bool $public Is it a header for public posts?
*
* @return object XML root object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
{
* @param boolean $public boolean
*
* @return object XML author object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addAuthor($doc, $owner, $authorelement, $public)
{
* @param array $item Item elements
*
* @return object XML author object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addEntryAuthor($doc, $element, $contact_url, $item)
{
* @param string $activity activity value
*
* @return object XML activity object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function createActivity($doc, $element, $activity)
{
if (!$r) {
return false;
}
+
if ($r->type) {
XML::addElement($doc, $entry, "activity:object-type", $r->type);
}
+
if ($r->id) {
XML::addElement($doc, $entry, "id", $r->id);
}
+
if ($r->title) {
XML::addElement($doc, $entry, "title", $r->title);
}
* @param array $item Item element
*
* @return object XML attachment object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function getAttachment($doc, $root, $item)
{
* @param bool $single If set, the entry is created as an XML document with a single "entry" element
*
* @return object XML entry object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
{
$ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ Contact::markForArchival($contact);
return -2; // timed out
}
$curl_stat = $a->get_curl_code();
if (empty($curl_stat)) {
+ Contact::markForArchival($contact);
return -3; // timed out
}
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
if (empty($xml)) {
+ Contact::markForArchival($contact);
return 3;
}
if (strpos($xml, '<?xml') === false) {
logger('dfrn_deliver: no valid XML returned');
logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
+ Contact::markForArchival($contact);
return 3;
}
$res = XML::parseString($xml);
- if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
+ if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
+ Contact::markForArchival($contact);
return ($res->status ? $res->status : 3);
}
if ($final_dfrn_id != $orig_id) {
logger('dfrn_deliver: wrong dfrn_id.');
// did not decode properly - cannot trust this site
+ Contact::markForArchival($contact);
return 3;
}
$postvars['dissolve'] = '1';
}
-
if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
$postvars['data'] = $atom;
$postvars['perm'] = 'rw';
break;
default:
logger("rino: invalid requested version '$rino_remote_version'");
+ Contact::markForArchival($contact);
return -8;
}
$curl_stat = $a->get_curl_code();
if (empty($curl_stat) || empty($xml)) {
+ Contact::markForArchival($contact);
return -9; // timed out
}
if (($curl_stat == 503) && stristr($a->get_curl_headers(), '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);
+ Contact::markForArchival($contact);
return 3;
}
$res = XML::parseString($xml);
if (!isset($res->status)) {
+ Contact::markForArchival($contact);
return -11;
}
logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
}
- if ($res->status == 200) {
+ if (($res->status >= 200) && ($res->status <= 299)) {
Contact::unmarkForArchival($contact);
}
{
$a = get_app();
- if (empty($contact['addr'])) {
- logger('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 (!$public_batch) {
+ if (empty($contact['addr'])) {
+ logger('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']);
+ Contact::markForArchival($contact);
+ return -21;
+ }
}
- if (empty($contact['addr'])) {
- logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
- return -21;
+ $fcontact = Diaspora::personByHandle($contact['addr']);
+ if (empty($fcontact)) {
+ logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+ Contact::markForArchival($contact);
+ return -22;
}
+ $pubkey = $fcontact['pubkey'];
+ } else {
+ $pubkey = '';
}
- $fcontact = Diaspora::personByHandle($contact['addr']);
- if (empty($fcontact)) {
- logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
- return -22;
- }
+ $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
- $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
+ // Create the endpoint for public posts. This is some WIP and should later be added to the probing
+ if ($public_batch && empty($contact["batch"])) {
+ $parts = parse_url($contact["notify"]);
+ $path_parts = explode('/', $parts['path']);
+ array_pop($path_parts);
+ $parts['path'] = implode('/', $path_parts);
+ $contact["batch"] = Network::unparseURL($parts);
+ }
- $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]);
+ $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
$content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
$curl_stat = $a->get_curl_code();
if (empty($curl_stat) || empty($xml)) {
logger('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'))) {
+ 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);
+ Contact::markForArchival($contact);
return 3;
}
$res = XML::parseString($xml);
if (empty($res->status)) {
+ Contact::markForArchival($contact);
return -23;
}
logger('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
}
- if ($res->status == 200) {
+ if (($res->status >= 200) && ($res->status <= 299)) {
Contact::unmarkForArchival($contact);
}
// 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"]),
+ intval($contact['uid']),
+ intval($contact['id']),
dbesc(DateTimeFormat::utc($birthday)),
- dbesc("birthday")
+ dbesc('birthday')
);
if (DBM::is_result($r)) {
return;
}
- logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
+ logger('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]");
+ $bdtext = L10n::t('%s\'s birthday', $contact['name']);
+ $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]');
$r = q(
"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
- intval($contact["uid"]),
- intval($contact["id"]),
+ intval($contact['uid']),
+ intval($contact['id']),
dbesc(DateTimeFormat::utcNow()),
dbesc(DateTimeFormat::utcNow()),
dbesc(DateTimeFormat::utc($birthday)),
- dbesc(DateTimeFormat::utc($birthday . " + 1 day ")),
+ dbesc(DateTimeFormat::utc($birthday . ' + 1 day ')),
dbesc($bdtext),
dbesc($bdtext2),
- dbesc("birthday")
+ dbesc('birthday')
);
}
$href = "";
$width = 0;
foreach ($avatar->attributes as $attributes) {
- /// @TODO Rewrite these similar if () to one switch
+ /// @TODO Rewrite these similar if() to one switch
if ($attributes->name == "href") {
$href = $attributes->textContent;
}
// Update the gcontact entry
$relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
- $x = q(
- "UPDATE `gcontact` SET
- `name` = '%s',
- `photo` = '%s',
- `url` = '%s',
- `nurl` = '%s',
- `addr` = '%s',
- `connect` = '%s',
- `notify` = '%s',
- `server_url` = '%s'
- WHERE `nurl` = '%s';",
- dbesc($relocate["name"]),
- dbesc($relocate["avatar"]),
- dbesc($relocate["url"]),
- dbesc(normalise_link($relocate["url"])),
- dbesc($relocate["addr"]),
- dbesc($relocate["addr"]),
- dbesc($relocate["notify"]),
- dbesc($relocate["server_url"]),
- dbesc(normalise_link($old["url"]))
- );
+ $fields = ['name' => $relocate["name"], 'photo' => $relocate["avatar"],
+ 'url' => $relocate["url"], 'nurl' => normalise_link($relocate["url"]),
+ 'addr' => $relocate["addr"], 'connect' => $relocate["addr"],
+ 'notify' => $relocate["notify"], 'server_url' => $relocate["server_url"]];
+ dba::update('gcontact', $fields, ['nurl' => normalise_link($old["url"])]);
// Update the contact table. We try to find every entry.
- $x = q(
- "UPDATE `contact` SET
- `name` = '%s',
- `avatar` = '%s',
- `url` = '%s',
- `nurl` = '%s',
- `addr` = '%s',
- `request` = '%s',
- `confirm` = '%s',
- `notify` = '%s',
- `poll` = '%s',
- `site-pubkey` = '%s'
- WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
- dbesc($relocate["name"]),
- dbesc($relocate["avatar"]),
- dbesc($relocate["url"]),
- dbesc(normalise_link($relocate["url"])),
- dbesc($relocate["addr"]),
- dbesc($relocate["request"]),
- dbesc($relocate["confirm"]),
- dbesc($relocate["notify"]),
- dbesc($relocate["poll"]),
- dbesc($relocate["sitepubkey"]),
- intval($importer["id"]),
- intval($importer["importer_uid"]),
- dbesc(normalise_link($old["url"]))
- );
+ $fields = ['name' => $relocate["name"], 'avatar' => $relocate["avatar"],
+ 'url' => $relocate["url"], 'nurl' => normalise_link($relocate["url"]),
+ 'addr' => $relocate["addr"], 'request' => $relocate["request"],
+ 'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
+ 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
+ $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
+ dba::update('contact', $fields, $condition);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
- if ($x === false) {
- return false;
- }
+ logger('Contacts are updated.');
// update items
- /// @todo This is an extreme performance killer
- $fields = [
- 'owner-link' => [$old["url"], $relocate["url"]],
- 'author-link' => [$old["url"], $relocate["url"]],
- //'owner-avatar' => array($old["photo"], $relocate["photo"]),
- //'author-avatar' => array($old["photo"], $relocate["photo"]),
- ];
- foreach ($fields as $n => $f) {
- $r = q(
- "SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
- $n,
- dbesc($f[0]),
- intval($importer["importer_uid"])
- );
+ // This is an extreme performance killer
+ Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
+ Item::update(['author-link' => $relocate["url"]], ['author-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
- if (DBM::is_result($r)) {
- $x = q(
- "UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
- $n,
- dbesc($f[1]),
- $n,
- dbesc($f[0]),
- intval($importer["importer_uid"])
- );
-
- if ($x === false) {
- return false;
- }
- }
- }
+ logger('Items are updated.');
/// @TODO
/// merge with current record, current contents have priority
if ($posted_id) {
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
+ if ($item['uid'] == 0) {
+ Item::distribute($posted_id);
+ }
+
$item["id"] = $posted_id;
$r = q(
return true;
}
} else { // $entrytype == DFRN_TOP_LEVEL
- if ($importer["readonly"]) {
- logger('ignoring read-only contact '.$importer["id"]);
- return;
- }
- if ($importer["uid"] == 0) {
+ 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);
return;
}
$posted_id = Item::insert($item, false, $notify);
+ if ($notify) {
+ $posted_id = $notify;
+ }
+
logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
+ if ($item['uid'] == 0) {
+ Item::distribute($posted_id);
+ }
+
if (stristr($item["verb"], ACTIVITY_POKE)) {
self::doPoke($item, $importer, $posted_id);
}
{
logger("Processing deletions");
$uri = null;
+
foreach ($deletion->attributes as $attributes) {
if ($attributes->name == "ref") {
$uri = $attributes->textContent;
logger("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($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
+
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
if ($accounttype != $importer["contact-type"]) {
dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
}
- }
-
- // is it a public forum? Private forums aren't supported with this method
- // This is deprecated since 3.5.1
- $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
-
- if ($forum != $importer["forum"]) {
+ // A forum contact can either have set "forum" or "prv" - but not both
+ if (($accounttype == ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) {
+ $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer["id"]];
+ dba::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+ }
+ } elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1
$condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
dba::update('contact', ['forum' => $forum], $condition);
}
+
// We are processing relocations even if we are ignoring a contact
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
foreach ($relocations as $relocation) {
projects / friendica.git / blobdiff