X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=39372aef14e603d3d3486c9d8d15a83a9d2f14a4;hb=e301fa083291f2df98192532c9c5cba03abfeb5a;hp=eaf4341f03760c9a25b76b359be898e786c68db9;hpb=bd3e10b132ae95aaa34eb7ba6f618f5d9ac2612c;p=friendica.git
diff --git a/include/dfrn.php b/include/dfrn.php
index eaf4341f03..39372aef14 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -3,7 +3,8 @@
* @file include/dfrn.php
* @brief The implementation of the dfrn protocol
*
- * https://github.com/friendica/friendica/wiki/Protocol
+ * @see https://github.com/friendica/friendica/wiki/Protocol and
+ * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
*/
require_once("include/Contact.php");
@@ -18,7 +19,8 @@ require_once("include/event.php");
require_once("include/text.php");
require_once("include/oembed.php");
require_once("include/html2bbcode.php");
-require_once("library/HTMLPurifier.auto.php");
+require_once("include/bbcode.php");
+require_once("include/xml.php");
/**
* @brief This class contain functions to create and send DFRN XML files
@@ -26,9 +28,9 @@ require_once("library/HTMLPurifier.auto.php");
*/
class dfrn {
- const DFRN_TOP_LEVEL = 0;
- const DFRN_REPLY = 1;
- const DFRN_REPLY_RC = 2;
+ const DFRN_TOP_LEVEL = 0; // Top level posting
+ const DFRN_REPLY = 1; // Regular reply that is stored locally
+ const DFRN_REPLY_RC = 2; // Reply that will be relayed
/**
* @brief Generates the atom entries for delivery.php
@@ -40,7 +42,7 @@ class dfrn {
*
* @return string DFRN entries
*/
- function entries($items,$owner) {
+ public static function entries($items,$owner) {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@@ -67,10 +69,11 @@ class dfrn {
* @param string $owner_nick Owner nick name
* @param string $last_update Date of the last update
* @param int $direction Can be -1, 0 or 1.
+ * @param boolean $onlyheader Output only the header without content? (Default is "no")
*
* @return string DFRN feed entries
*/
- function feed($dfrn_id, $owner_nick, $last_update, $direction = 0) {
+ public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) {
$a = get_app();
@@ -85,7 +88,7 @@ class dfrn {
$converse = true;
if($a->argv[$x] == 'starred')
$starred = true;
- if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+ if($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
$category = $a->argv[$x+1];
}
}
@@ -96,21 +99,21 @@ class dfrn {
$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' ";
- $r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
+ $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1",
+ WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
dbesc($owner_nick)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
killme();
+ }
$owner = $r[0];
- $owner_id = $owner['user_uid'];
+ $owner_id = $owner['uid'];
$owner_nick = $owner['nickname'];
$sql_post_table = "";
- $visibility = "";
if(! $public_feed) {
@@ -133,12 +136,13 @@ class dfrn {
break; // NOTREACHED
}
- $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
intval($owner_id)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
killme();
+ }
$contact = $r[0];
require_once('include/security.php');
@@ -169,9 +173,6 @@ class dfrn {
else
$sort = 'ASC';
- $date_field = "`changed`";
- $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
-
if(! strlen($last_update))
$last_update = 'now -30 days';
@@ -188,23 +189,19 @@ class dfrn {
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
- // AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
- // dbesc($check_date),
-
- $r = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id`,
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
- `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,
`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
- FROM `item` $sql_post_table
- INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`parent` != 0
- AND ((`item`.`wall` = 1) $visibility) AND `item`.$date_field > '%s'
+ WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
+ AND `item`.`wall` AND `item`.`changed` > '%s'
$sql_extra
- ORDER BY $sql_order LIMIT 0, 300",
+ ORDER BY `item`.`parent` ".$sort.", `item`.`created` ASC LIMIT 0, 300",
intval($owner_id),
dbesc($check_date),
dbesc($sort)
@@ -233,7 +230,7 @@ class dfrn {
// This hook can't work anymore
// call_hooks('atom_feed', $atom);
- if(! count($items)) {
+ if (!count($items) OR $onlyheader) {
$atom = trim($doc->saveXML());
call_hooks('atom_feed_end', $atom);
@@ -244,7 +241,7 @@ class dfrn {
foreach($items as $item) {
// prevent private email from leaking.
- if($item['network'] === NETWORK_MAIL)
+ if($item['network'] == NETWORK_MAIL)
continue;
// public feeds get html, our own nodes use bbcode
@@ -277,7 +274,7 @@ class dfrn {
*
* @return string DFRN mail
*/
- function mail($item, $owner) {
+ public static function mail($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@@ -286,17 +283,17 @@ class dfrn {
$mail = $doc->createElement("dfrn:mail");
$sender = $doc->createElement("dfrn:sender");
- xml_add_element($doc, $sender, "dfrn:name", $owner['name']);
- xml_add_element($doc, $sender, "dfrn:uri", $owner['url']);
- xml_add_element($doc, $sender, "dfrn:avatar", $owner['thumb']);
+ xml::add_element($doc, $sender, "dfrn:name", $owner['name']);
+ xml::add_element($doc, $sender, "dfrn:uri", $owner['url']);
+ xml::add_element($doc, $sender, "dfrn:avatar", $owner['thumb']);
$mail->appendChild($sender);
- xml_add_element($doc, $mail, "dfrn:id", $item['uri']);
- xml_add_element($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
- xml_add_element($doc, $mail, "dfrn:sentdate", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME));
- xml_add_element($doc, $mail, "dfrn:subject", $item['title']);
- xml_add_element($doc, $mail, "dfrn:content", $item['body']);
+ xml::add_element($doc, $mail, "dfrn:id", $item['uri']);
+ xml::add_element($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
+ xml::add_element($doc, $mail, "dfrn:sentdate", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME));
+ xml::add_element($doc, $mail, "dfrn:subject", $item['title']);
+ xml::add_element($doc, $mail, "dfrn:content", $item['body']);
$root->appendChild($mail);
@@ -311,7 +308,7 @@ class dfrn {
*
* @return string DFRN suggestions
*/
- function fsuggest($item, $owner) {
+ public static function fsuggest($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
@@ -319,11 +316,11 @@ class dfrn {
$suggest = $doc->createElement("dfrn:suggest");
- xml_add_element($doc, $suggest, "dfrn:url", $item['url']);
- xml_add_element($doc, $suggest, "dfrn:name", $item['name']);
- xml_add_element($doc, $suggest, "dfrn:photo", $item['photo']);
- xml_add_element($doc, $suggest, "dfrn:request", $item['request']);
- xml_add_element($doc, $suggest, "dfrn:note", $item['note']);
+ xml::add_element($doc, $suggest, "dfrn:url", $item['url']);
+ xml::add_element($doc, $suggest, "dfrn:name", $item['name']);
+ xml::add_element($doc, $suggest, "dfrn:photo", $item['photo']);
+ xml::add_element($doc, $suggest, "dfrn:request", $item['request']);
+ xml::add_element($doc, $suggest, "dfrn:note", $item['note']);
$root->appendChild($suggest);
@@ -338,7 +335,7 @@ class dfrn {
*
* @return string DFRN relocations
*/
- function relocate($owner, $uid) {
+ public static function relocate($owner, $uid) {
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = get_config('system','site_pubkey');
@@ -365,16 +362,18 @@ class dfrn {
$relocate = $doc->createElement("dfrn:relocate");
- xml_add_element($doc, $relocate, "dfrn:url", $owner['url']);
- xml_add_element($doc, $relocate, "dfrn:name", $owner['name']);
- xml_add_element($doc, $relocate, "dfrn:photo", $photos[4]);
- xml_add_element($doc, $relocate, "dfrn:thumb", $photos[5]);
- xml_add_element($doc, $relocate, "dfrn:micro", $photos[6]);
- xml_add_element($doc, $relocate, "dfrn:request", $owner['request']);
- xml_add_element($doc, $relocate, "dfrn:confirm", $owner['confirm']);
- xml_add_element($doc, $relocate, "dfrn:notify", $owner['notify']);
- xml_add_element($doc, $relocate, "dfrn:poll", $owner['poll']);
- xml_add_element($doc, $relocate, "dfrn:sitepubkey", get_config('system','site_pubkey'));
+ xml::add_element($doc, $relocate, "dfrn:url", $owner['url']);
+ xml::add_element($doc, $relocate, "dfrn:name", $owner['name']);
+ xml::add_element($doc, $relocate, "dfrn:addr", $owner['addr']);
+ xml::add_element($doc, $relocate, "dfrn:avatar", $owner['avatar']);
+ xml::add_element($doc, $relocate, "dfrn:photo", $photos[4]);
+ xml::add_element($doc, $relocate, "dfrn:thumb", $photos[5]);
+ xml::add_element($doc, $relocate, "dfrn:micro", $photos[6]);
+ xml::add_element($doc, $relocate, "dfrn:request", $owner['request']);
+ xml::add_element($doc, $relocate, "dfrn:confirm", $owner['confirm']);
+ xml::add_element($doc, $relocate, "dfrn:notify", $owner['notify']);
+ xml::add_element($doc, $relocate, "dfrn:poll", $owner['poll']);
+ xml::add_element($doc, $relocate, "dfrn:sitepubkey", get_config('system','site_pubkey'));
$root->appendChild($relocate);
@@ -392,7 +391,7 @@ class dfrn {
*
* @return object XML root object
*/
- private function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
+ private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
if ($alternatelink == "")
$alternatelink = $owner['url'];
@@ -410,39 +409,43 @@ class dfrn {
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- xml_add_element($doc, $root, "id", app::get_baseurl()."/profile/".$owner["nick"]);
- xml_add_element($doc, $root, "title", $owner["name"]);
+ xml::add_element($doc, $root, "id", app::get_baseurl()."/profile/".$owner["nick"]);
+ xml::add_element($doc, $root, "title", $owner["name"]);
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
- xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
+ xml::add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
$attributes = array("rel" => "license", "href" => "http://creativecommons.org/licenses/by/3.0/");
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $alternatelink);
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
if ($public) {
// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
- ostatus_hublinks($doc, $root);
+ ostatus::hublinks($doc, $root);
$attributes = array("rel" => "salmon", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
}
+ // For backward compatibility we keep this element
if ($owner['page-flags'] == PAGE_COMMUNITY)
- xml_add_element($doc, $root, "dfrn:community", 1);
+ xml::add_element($doc, $root, "dfrn:community", 1);
+
+ // The former element is replaced by this one
+ xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
- xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+ xml::add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
$author = self::add_author($doc, $owner, $authorelement, $public);
$root->appendChild($author);
@@ -459,68 +462,85 @@ class dfrn {
*
* @return object XML author object
*/
- private function add_author($doc, $owner, $authorelement, $public) {
+ private static function add_author($doc, $owner, $authorelement, $public) {
+
+ // Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
+ $r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
+ WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
+ intval($owner['uid']));
+ if ($r)
+ $hidewall = true;
+ else
+ $hidewall = false;
$author = $doc->createElement($authorelement);
- $namdate = datetime_convert('UTC', 'UTC', $owner['name-date'].'+00:00' , ATOM_TIME);
+ $namdate = datetime_convert('UTC', 'UTC', $owner['name-date'].'+00:00', ATOM_TIME);
$uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
$picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
- $attributes = array("dfrn:updated" => $namdate);
- xml_add_element($doc, $author, "name", $owner["name"], $attributes);
-
- $attributes = array("dfrn:updated" => $namdate);
- xml_add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
+ if (!$public OR !$hidewall)
+ $attributes = array("dfrn:updated" => $namdate);
+ else
+ $attributes = array();
- $attributes = array("dfrn:updated" => $namdate);
- xml_add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
+ xml::add_element($doc, $author, "name", $owner["name"], $attributes);
+ xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
+ xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
- $attributes = array("rel" => "photo", "type" => "image/jpeg", "dfrn:updated" => $picdate,
+ $attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
- xml_add_element($doc, $author, "link", "", $attributes);
- $attributes = array("rel" => "avatar", "type" => "image/jpeg", "dfrn:updated" => $picdate,
- "media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
- xml_add_element($doc, $author, "link", "", $attributes);
+ if (!$public OR !$hidewall)
+ $attributes["dfrn:updated"] = $picdate;
- $birthday = feed_birthday($owner['user_uid'], $owner['timezone']);
+ xml::add_element($doc, $author, "link", "", $attributes);
- if ($birthday)
- xml_add_element($doc, $author, "dfrn:birthday", $birthday);
+ $attributes["rel"] = "avatar";
+ xml::add_element($doc, $author, "link", "", $attributes);
+
+ if ($hidewall)
+ xml::add_element($doc, $author, "dfrn:hide", "true");
- // The following fields will only be generated if this isn't for a public feed
+ // The following fields will only be generated if the data isn't meant for a public feed
if ($public)
return $author;
+ $birthday = feed_birthday($owner['uid'], $owner['timezone']);
+
+ if ($birthday)
+ xml::add_element($doc, $author, "dfrn:birthday", $birthday);
+
// Only show contact details when we are allowed to
- $r = q("SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`, `user`.`timezone`,
- `profile`.`locality`, `profile`.`region`, `profile`.`country-name`, `profile`.`pub_keywords`, `profile`.`dob`
+ $r = q("SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
+ `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
+ `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
FROM `profile`
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
- intval($owner['user_uid']));
+ intval($owner['uid']));
if ($r) {
$profile = $r[0];
- xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
- xml_add_element($doc, $author, "poco:updated", $namdate);
+
+ xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
+ xml::add_element($doc, $author, "poco:updated", $namdate);
if (trim($profile["dob"]) != "0000-00-00")
- xml_add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
+ xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
- xml_add_element($doc, $author, "poco:note", $profile["about"]);
- xml_add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]);
+ xml::add_element($doc, $author, "poco:note", $profile["about"]);
+ xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]);
$savetz = date_default_timezone_get();
date_default_timezone_set($profile["timezone"]);
- xml_add_element($doc, $author, "poco:utcOffset", date("P"));
+ xml::add_element($doc, $author, "poco:utcOffset", date("P"));
date_default_timezone_set($savetz);
if (trim($profile["homepage"]) != "") {
$urls = $doc->createElement("poco:urls");
- xml_add_element($doc, $urls, "poco:type", "homepage");
- xml_add_element($doc, $urls, "poco:value", $profile["homepage"]);
- xml_add_element($doc, $urls, "poco:primary", "true");
+ xml::add_element($doc, $urls, "poco:type", "homepage");
+ xml::add_element($doc, $urls, "poco:value", $profile["homepage"]);
+ xml::add_element($doc, $urls, "poco:primary", "true");
$author->appendChild($urls);
}
@@ -528,33 +548,31 @@ class dfrn {
$keywords = explode(",", $profile["pub_keywords"]);
foreach ($keywords AS $keyword)
- xml_add_element($doc, $author, "poco:tags", trim($keyword));
+ xml::add_element($doc, $author, "poco:tags", trim($keyword));
}
- /// @todo When we are having the XMPP address in the profile we should propagate it here
- $xmpp = "";
- if (trim($xmpp) != "") {
+ if (trim($profile["xmpp"]) != "") {
$ims = $doc->createElement("poco:ims");
- xml_add_element($doc, $ims, "poco:type", "xmpp");
- xml_add_element($doc, $ims, "poco:value", $xmpp);
- xml_add_element($doc, $ims, "poco:primary", "true");
+ xml::add_element($doc, $ims, "poco:type", "xmpp");
+ xml::add_element($doc, $ims, "poco:value", $profile["xmpp"]);
+ xml::add_element($doc, $ims, "poco:primary", "true");
$author->appendChild($ims);
}
if (trim($profile["locality"].$profile["region"].$profile["country-name"]) != "") {
$element = $doc->createElement("poco:address");
- xml_add_element($doc, $element, "poco:formatted", formatted_location($profile));
+ xml::add_element($doc, $element, "poco:formatted", formatted_location($profile));
if (trim($profile["locality"]) != "")
- xml_add_element($doc, $element, "poco:locality", $profile["locality"]);
+ xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
if (trim($profile["region"]) != "")
- xml_add_element($doc, $element, "poco:region", $profile["region"]);
+ xml::add_element($doc, $element, "poco:region", $profile["region"]);
if (trim($profile["country-name"]) != "")
- xml_add_element($doc, $element, "poco:country", $profile["country-name"]);
+ xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
$author->appendChild($element);
}
@@ -573,14 +591,14 @@ class dfrn {
*
* @return object XML author object
*/
- private function add_entry_author($doc, $element, $contact_url, $item) {
+ private static function add_entry_author($doc, $element, $contact_url, $item) {
$contact = get_contact_details_by_url($contact_url, $item["uid"]);
$author = $doc->createElement($element);
- xml_add_element($doc, $author, "name", $contact["name"]);
- xml_add_element($doc, $author, "uri", $contact["url"]);
- xml_add_element($doc, $author, "dfrn:handle", $contact["addr"]);
+ xml::add_element($doc, $author, "name", $contact["name"]);
+ xml::add_element($doc, $author, "uri", $contact["url"]);
+ xml::add_element($doc, $author, "dfrn:handle", $contact["addr"]);
/// @Todo
/// - Check real image type and image size
@@ -591,7 +609,7 @@ class dfrn {
"media:width" => 80,
"media:height" => 80,
"href" => $contact["photo"]);
- xml_add_element($doc, $author, "link", "", $attributes);
+ xml::add_element($doc, $author, "link", "", $attributes);
$attributes = array(
"rel" => "avatar",
@@ -599,7 +617,7 @@ class dfrn {
"media:width" => 80,
"media:height" => 80,
"href" => $contact["photo"]);
- xml_add_element($doc, $author, "link", "", $attributes);
+ xml::add_element($doc, $author, "link", "", $attributes);
return $author;
}
@@ -613,7 +631,7 @@ class dfrn {
*
* @return object XML activity object
*/
- private function create_activity($doc, $element, $activity) {
+ private static function create_activity($doc, $element, $activity) {
if($activity) {
$entry = $doc->createElement($element);
@@ -622,28 +640,35 @@ class dfrn {
if(!$r)
return false;
if($r->type)
- xml_add_element($doc, $entry, "activity:object-type", $r->type);
+ xml::add_element($doc, $entry, "activity:object-type", $r->type);
if($r->id)
- xml_add_element($doc, $entry, "id", $r->id);
+ xml::add_element($doc, $entry, "id", $r->id);
if($r->title)
- xml_add_element($doc, $entry, "title", $r->title);
+ xml::add_element($doc, $entry, "title", $r->title);
if($r->link) {
- if(substr($r->link,0,1) === '<') {
+ if(substr($r->link,0,1) == '<') {
if(strstr($r->link,'&') && (! strstr($r->link,'&')))
$r->link = str_replace('&','&', $r->link);
$r->link = preg_replace('/\/','',$r->link);
- $data = parse_xml_string($r->link, false);
- foreach ($data->attributes() AS $parameter => $value)
- $attributes[$parameter] = $value;
- } else
+ // XML does need a single element as root element so we add a dummy element here
+ $data = parse_xml_string("".$r->link."", false);
+ if (is_object($data)) {
+ foreach ($data->link AS $link) {
+ $attributes = array();
+ foreach ($link->attributes() AS $parameter => $value)
+ $attributes[$parameter] = $value;
+ xml::add_element($doc, $entry, "link", "", $attributes);
+ }
+ }
+ } else {
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
-
- xml_add_element($doc, $entry, "link", "", $attributes);
+ xml::add_element($doc, $entry, "link", "", $attributes);
+ }
}
if($r->content)
- xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+ xml::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
return $entry;
}
@@ -660,7 +685,7 @@ class dfrn {
*
* @return object XML attachment object
*/
- private function get_attachment($doc, $root, $item) {
+ private static function get_attachment($doc, $root, $item) {
$arr = explode('[/attach],',$item['attach']);
if(count($arr)) {
foreach($arr as $r) {
@@ -677,7 +702,7 @@ class dfrn {
if(trim($matches[4]) != "")
$attributes["title"] = trim($matches[4]);
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
}
}
}
@@ -695,7 +720,7 @@ class dfrn {
*
* @return object XML entry object
*/
- private function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
+ private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
$mentioned = array();
@@ -704,7 +729,7 @@ class dfrn {
if($item['deleted']) {
$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME));
- return xml_create_element($doc, "at:deleted-entry", "", $attributes);
+ return xml::create_element($doc, "at:deleted-entry", "", $attributes);
}
$entry = $doc->createElement("entry");
@@ -714,6 +739,9 @@ class dfrn {
else
$body = $item['body'];
+ // Remove the abstract element. It is only locally important.
+ $body = remove_abstract($body);
+
if ($type == 'html') {
$htmlbody = $body;
@@ -735,66 +763,66 @@ class dfrn {
$attributes = array("ref" => $parent_item, "type" => "text/html",
"href" => app::get_baseurl().'/display/'.$parent[0]['guid'],
"dfrn:diaspora_guid" => $parent[0]['guid']);
- xml_add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+ xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
}
- xml_add_element($doc, $entry, "id", $item["uri"]);
- xml_add_element($doc, $entry, "title", $item["title"]);
+ xml::add_element($doc, $entry, "id", $item["uri"]);
+ xml::add_element($doc, $entry, "title", $item["title"]);
- xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
- xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+ xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
+ xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
// "dfrn:env" is used to read the content
- xml_add_element($doc, $entry, "dfrn:env", base64url_encode($body, true));
+ xml::add_element($doc, $entry, "dfrn:env", base64url_encode($body, true));
// The "content" field is not read by the receiver. We could remove it when the type is "text"
// We keep it at the moment, maybe there is some old version that doesn't read "dfrn:env"
- xml_add_element($doc, $entry, "content", (($type === 'html') ? $htmlbody : $body), array("type" => $type));
+ xml::add_element($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type));
// We save this value in "plink". Maybe we should read it from there as well?
- xml_add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
+ xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
"href" => app::get_baseurl()."/display/".$item["guid"]));
// "comment-allow" is some old fashioned stuff for old Friendica versions.
// It is included in the rewritten code for completeness
if ($comment)
- xml_add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+ xml::add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
if($item['location'])
- xml_add_element($doc, $entry, "dfrn:location", $item['location']);
+ xml::add_element($doc, $entry, "dfrn:location", $item['location']);
if($item['coord'])
- xml_add_element($doc, $entry, "georss:point", $item['coord']);
+ xml::add_element($doc, $entry, "georss:point", $item['coord']);
if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
- xml_add_element($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
+ xml::add_element($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
if($item['extid'])
- xml_add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ xml::add_element($doc, $entry, "dfrn:extid", $item['extid']);
if($item['bookmark'])
- xml_add_element($doc, $entry, "dfrn:bookmark", "true");
+ xml::add_element($doc, $entry, "dfrn:bookmark", "true");
if($item['app'])
- xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+ xml::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
- xml_add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
+ xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
// The signed text contains the content in Markdown, the sender handle and the signatur for the content
// It is needed for relayed comments to Diaspora.
if($item['signed_text']) {
$sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
- xml_add_element($doc, $entry, "dfrn:diaspora_signature", $sign);
+ xml::add_element($doc, $entry, "dfrn:diaspora_signature", $sign);
}
- xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+ xml::add_element($doc, $entry, "activity:verb", construct_verb($item));
if ($item['object-type'] != "")
- xml_add_element($doc, $entry, "activity:object-type", $item['object-type']);
+ xml::add_element($doc, $entry, "activity:object-type", $item['object-type']);
elseif ($item['id'] == $item['parent'])
- xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+ xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
else
- xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
$actobj = self::create_activity($doc, "activity:object", $item['object']);
if ($actobj)
@@ -809,7 +837,7 @@ class dfrn {
if(count($tags)) {
foreach($tags as $t)
if (($type != 'html') OR ($t[0] != "@"))
- xml_add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+ xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
}
if(count($tags))
@@ -822,11 +850,11 @@ class dfrn {
intval($owner["uid"]),
dbesc(normalise_link($mention)));
if ($r[0]["forum"] OR $r[0]["prv"])
- xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+ xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
else
- xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+ xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
}
@@ -846,7 +874,7 @@ class dfrn {
*
* @return int Deliver status. -1 means an error.
*/
- function deliver($owner,$contact,$atom, $dissolve = false) {
+ public static function deliver($owner,$contact,$atom, $dissolve = false) {
$a = get_app();
@@ -885,11 +913,18 @@ class dfrn {
logger('dfrn_deliver: ' . $url);
- $xml = fetch_url($url);
+ $ret = z_fetch_url($url);
+
+ if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ return -2; // timed out
+ }
+
+ $xml = $ret['body'];
$curl_stat = $a->get_curl_code();
- if(! $curl_stat)
- return(-1); // timed out
+ if (!$curl_stat) {
+ return -3; // timed out
+ }
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
@@ -989,24 +1024,24 @@ class dfrn {
$key = Crypto::createNewRandomKey();
} catch (CryptoTestFailed $ex) {
logger('Cannot safely create a key');
- return -1;
+ return -4;
} catch (CannotPerformOperation $ex) {
logger('Cannot safely create a key');
- return -1;
+ return -5;
}
try {
$data = Crypto::encrypt($postvars['data'], $key);
} catch (CryptoTestFailed $ex) {
logger('Cannot safely perform encryption');
- return -1;
+ return -6;
} catch (CannotPerformOperation $ex) {
logger('Cannot safely perform encryption');
- return -1;
+ return -7;
}
break;
default:
logger("rino: invalid requested verision '$rino_remote_version'");
- return -1;
+ return -8;
}
$postvars['rino'] = $rino_remote_version;
@@ -1040,16 +1075,18 @@ class dfrn {
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
- $xml = post_url($contact['notify'],$postvars);
+ $xml = post_url($contact['notify'], $postvars);
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
$curl_stat = $a->get_curl_code();
- if((! $curl_stat) || (! strlen($xml)))
- return(-1); // timed out
+ if ((!$curl_stat) || (!strlen($xml))) {
+ return -9; // timed out
+ }
- if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
- return(-1);
+ if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) {
+ return -10;
+ }
if(strpos($xml,'evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
- $r = q("SELECT `id`, `uid`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
- `name`, `nick`, `about`, `location`, `keywords`, `bdyear`, `bd`
+ $r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
+ `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET));
if ($r) {
@@ -1123,6 +1170,9 @@ class dfrn {
$author["contact-id"] = $r[0]["id"];
$author["network"] = $r[0]["network"];
} else {
+ if (!$onlyfetch)
+ logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
+
$author["contact-id"] = $importer["id"];
$author["network"] = $importer["network"];
$onlyfetch = true;
@@ -1130,7 +1180,7 @@ class dfrn {
// Until now we aren't serving different sizes - but maybe later
$avatarlist = array();
- // @todo check if "avatar" or "photo" would be the best field in the specification
+ /// @todo check if "avatar" or "photo" would be the best field in the specification
$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
foreach($avatars AS $avatar) {
$href = "";
@@ -1152,47 +1202,64 @@ class dfrn {
}
if ($r AND !$onlyfetch) {
+ logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+
+ $poco = array("url" => $contact["url"]);
// When was the last change to name or uri?
$name_element = $xpath->query($element."/atom:name", $context)->item(0);
foreach($name_element->attributes AS $attributes)
if ($attributes->name == "updated")
- $contact["name-date"] = $attributes->textContent;
+ $poco["name-date"] = $attributes->textContent;
$link_element = $xpath->query($element."/atom:link", $context)->item(0);
foreach($link_element->attributes AS $attributes)
if ($attributes->name == "updated")
- $contact["uri-date"] = $attributes->textContent;
+ $poco["uri-date"] = $attributes->textContent;
// Update contact data
$value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
if ($value != "")
- $contact["addr"] = $value;
+ $poco["addr"] = $value;
$value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
if ($value != "")
- $contact["name"] = $value;
+ $poco["name"] = $value;
$value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
if ($value != "")
- $contact["nick"] = $value;
+ $poco["nick"] = $value;
$value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
if ($value != "")
- $contact["about"] = $value;
+ $poco["about"] = $value;
$value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
if ($value != "")
- $contact["location"] = $value;
+ $poco["location"] = $value;
+
+ /// @todo Only search for elements with "poco:type" = "xmpp"
+ $value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+ if ($value != "")
+ $poco["xmpp"] = $value;
/// @todo Add support for the following fields that we don't support by now in the contact table:
/// - poco:utcOffset
- /// - poco:ims
/// - poco:urls
/// - poco:locality
/// - poco:region
/// - poco:country
+ // If the "hide" element is present then the profile isn't searchable.
+ $hide = intval($xpath->evaluate($element."/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+
+ logger("Hidden status for contact ".$contact["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.
+ if ($hide)
+ $contact["hidden"] = true;
+
// Save the keywords into the contact table
$tags = array();
$tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
@@ -1200,7 +1267,7 @@ class dfrn {
$tags[$tag->nodeValue] = $tag->nodeValue;
if (count($tags))
- $contact["keywords"] = implode(", ", $tags);
+ $poco["keywords"] = implode(", ", $tags);
// "dfrn:birthday" contains the birthday converted to UTC
$old_bdyear = $contact["bdyear"];
@@ -1210,7 +1277,7 @@ class dfrn {
if (strtotime($birthday) > time()) {
$bd_timestamp = strtotime($birthday);
- $contact["bdyear"] = date("Y", $bd_timestamp);
+ $poco["bdyear"] = date("Y", $bd_timestamp);
}
// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
@@ -1225,9 +1292,11 @@ class dfrn {
$bdyear = $bdyear + 1;
}
- $contact["bd"] = $value;
+ $poco["bd"] = $value;
}
+ $contact = array_merge($contact, $poco);
+
if ($old_bdyear != $contact["bdyear"])
self::birthday_event($contact, $birthday);
@@ -1238,32 +1307,36 @@ class dfrn {
unset($fields["id"]);
unset($fields["uid"]);
+ unset($fields["url"]);
unset($fields["avatar-date"]);
unset($fields["name-date"]);
unset($fields["uri-date"]);
- // Update check for this field has to be done differently
+ // Update check for this field has to be done differently
$datefields = array("name-date", "uri-date");
foreach ($datefields AS $field)
- if (strtotime($contact[$field]) > strtotime($r[0][$field]))
+ if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
+ logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true;
+ }
foreach ($fields AS $field => $data)
if ($contact[$field] != $r[0][$field]) {
- logger("Difference for contact ".$contact["id"]." in field '".$field."'. Old value: '".$contact[$field]."', new value '".$r[0][$field]."'", LOGGER_DEBUG);
+ logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true;
}
if ($update) {
- logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG);
+ logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
- `addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s',
- `name-date` = '%s', `uri-date` = '%s'
+ `addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
+ `xmpp` = '%s', `name-date` = '%s', `uri-date` = '%s'
WHERE `id` = %d AND `network` = '%s'",
dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
- dbesc($contact["bd"]), dbesc($contact["name-date"]), dbesc($contact["uri-date"]),
+ dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
+ dbesc($contact["name-date"]), dbesc($contact["uri-date"]),
intval($contact["id"]), dbesc($contact["network"]));
}
@@ -1274,9 +1347,12 @@ class dfrn {
// It is used in the socgraph.php to prevent that old contact data
// that was relayed over several servers can overwrite contact
// data that we received directly.
- $contact["generation"] = 2;
- $contact["photo"] = $author["avatar"];
- update_gcontact($contact);
+
+ $poco["generation"] = 2;
+ $poco["photo"] = $author["avatar"];
+ $poco["hide"] = $hide;
+ $poco["contact-type"] = $contact["contact-type"];
+ update_gcontact($poco);
}
return($author);
@@ -1291,7 +1367,7 @@ class dfrn {
*
* @return string XML string
*/
- private function transform_activity($xpath, $activity, $element) {
+ private static function transform_activity($xpath, $activity, $element) {
if (!is_object($activity))
return "";
@@ -1301,7 +1377,7 @@ class dfrn {
$obj_element = $obj_doc->createElementNS(NAMESPACE_ATOM1, $element);
$activity_type = $xpath->query("activity:object-type/text()", $activity)->item(0)->nodeValue;
- xml_add_element($obj_doc, $obj_element, "type", $activity_type);
+ xml::add_element($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0);
if (is_object($id))
@@ -1311,9 +1387,10 @@ class dfrn {
if (is_object($title))
$obj_element->appendChild($obj_doc->importNode($title, true));
- $link = $xpath->query("atom:link", $activity)->item(0);
- if (is_object($link))
- $obj_element->appendChild($obj_doc->importNode($link, true));
+ $links = $xpath->query("atom:link", $activity);
+ if (is_object($links))
+ foreach ($links AS $link)
+ $obj_element->appendChild($obj_doc->importNode($link, true));
$content = $xpath->query("atom:content", $activity)->item(0);
if (is_object($content))
@@ -1323,7 +1400,7 @@ class dfrn {
$objxml = $obj_doc->saveXML($obj_element);
- // @todo This isn't totally clean. We should find a way to transform the namespaces
+ /// @todo This isn't totally clean. We should find a way to transform the namespaces
$objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
return($objxml);
}
@@ -1335,7 +1412,7 @@ class dfrn {
* @param object $mail mail elements
* @param array $importer Record of the importer user mixed with contact of the content
*/
- private function process_mail($xpath, $mail, $importer) {
+ private static function process_mail($xpath, $mail, $importer) {
logger("Processing mails");
@@ -1353,9 +1430,9 @@ class dfrn {
$msg["seen"] = 0;
$msg["replied"] = 0;
- dbesc_array($msg);
+ dbm::esc_array($msg, true);
- $r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES ('".implode("', '", array_values($msg))."')");
+ $r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
// send notifications.
@@ -1386,7 +1463,8 @@ class dfrn {
* @param object $suggestion suggestion elements
* @param array $importer Record of the importer user mixed with contact of the content
*/
- private function process_suggestion($xpath, $suggestion, $importer) {
+ private static function process_suggestion($xpath, $suggestion, $importer) {
+ $a = get_app();
logger("Processing suggestions");
@@ -1406,7 +1484,7 @@ class dfrn {
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
);
- if(count($r))
+ if (dbm::is_result($r))
return false;
// Do we already have an fcontact record for this person?
@@ -1417,7 +1495,7 @@ class dfrn {
dbesc($suggest["name"]),
dbesc($suggest["request"])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$fid = $r[0]["id"];
// OK, we do. Do we already have an introduction for this person ?
@@ -1425,7 +1503,7 @@ class dfrn {
intval($suggest["uid"]),
intval($fid)
);
- if(count($r))
+ if (dbm::is_result($r))
return false;
}
if(!$fid)
@@ -1440,7 +1518,7 @@ class dfrn {
dbesc($suggest["name"]),
dbesc($suggest["request"])
);
- if(count($r))
+ if (dbm::is_result($r))
$fid = $r[0]["id"];
else
// database record did not get created. Quietly give up.
@@ -1487,7 +1565,7 @@ class dfrn {
* @param object $relocation relocation elements
* @param array $importer Record of the importer user mixed with contact of the content
*/
- private function process_relocation($xpath, $relocation, $importer) {
+ private static function process_relocation($xpath, $relocation, $importer) {
logger("Processing relocations");
@@ -1495,7 +1573,9 @@ class dfrn {
$relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"];
$relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
+ $relocate["addr"] = $xpath->query("dfrn:addr/text()", $relocation)->item(0)->nodeValue;
$relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue;
+ $relocate["avatar"] = $xpath->query("dfrn:avatar/text()", $relocation)->item(0)->nodeValue;
$relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue;
$relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue;
$relocate["micro"] = $xpath->query("dfrn:micro/text()", $relocation)->item(0)->nodeValue;
@@ -1505,6 +1585,12 @@ class dfrn {
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
+ if (($relocate["avatar"] == "") AND ($relocate["photo"] != ""))
+ $relocate["avatar"] = $relocate["photo"];
+
+ if ($relocate["addr"] == "")
+ $relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
+
// update contact
$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]),
@@ -1514,51 +1600,83 @@ class dfrn {
$old = $r[0];
- $x = q("UPDATE `contact` SET
+ // 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',
- `thumb` = '%s',
- `micro` = '%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"])));
+
+ // 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;",
+ WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
dbesc($relocate["name"]),
- dbesc($relocate["photo"]),
- dbesc($relocate["thumb"]),
- dbesc($relocate["micro"]),
+ 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"]));
+ intval($importer["importer_uid"]),
+ dbesc(normalise_link($old["url"])));
+
+ update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false)
return false;
// update items
+ /// @todo This is an extreme performance killer
$fields = array(
'owner-link' => array($old["url"], $relocate["url"]),
'author-link' => array($old["url"], $relocate["url"]),
- 'owner-avatar' => array($old["photo"], $relocate["photo"]),
- 'author-avatar' => array($old["photo"], $relocate["photo"]),
+ //'owner-avatar' => array($old["photo"], $relocate["photo"]),
+ //'author-avatar' => array($old["photo"], $relocate["photo"]),
);
- foreach ($fields as $n=>$f){
- $x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
- $n, dbesc($f[1]),
+ 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"]));
- if ($x === false)
- return false;
+
+ if ($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;
}
+ }
/// @TODO
/// merge with current record, current contents have priority
@@ -1576,7 +1694,7 @@ class dfrn {
* @param array $importer Record of the importer user mixed with contact of the content
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
*/
- private function update_content($current, $item, $importer, $entrytype) {
+ private static function update_content($current, $item, $importer, $entrytype) {
$changed = false;
if (edited_timestamp_is_newer($current, $item)) {
@@ -1600,7 +1718,7 @@ class dfrn {
$changed = true;
if ($entrytype == DFRN_REPLY_RC)
- proc_run("php", "include/notifier.php","comment-import", $current["id"]);
+ proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
}
// update last-child if it changes
@@ -1628,7 +1746,7 @@ class dfrn {
*
* @return int Is it a toplevel entry, a comment or a relayed comment?
*/
- private function get_entry_type($importer, $item) {
+ private static function get_entry_type($importer, $item) {
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
@@ -1649,7 +1767,7 @@ class dfrn {
LIMIT 1",
dbesc($item["parent-uri"])
);
- if($r && count($r)) {
+ if (dbm::is_result($r)) {
$r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s')
@@ -1661,7 +1779,7 @@ class dfrn {
dbesc($r[0]["parent-uri"]),
intval($importer["importer_uid"])
);
- if($r && count($r))
+ if (dbm::is_result($r))
$is_a_remote_action = true;
}
@@ -1694,7 +1812,7 @@ class dfrn {
* @param array $importer Record of the importer user mixed with contact of the content
* @param int $posted_id The record number of item record that was just posted
*/
- private function do_poke($item, $importer, $posted_id) {
+ private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
if(!$verb)
return;
@@ -1703,9 +1821,7 @@ class dfrn {
if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
- $links = parse_xml_string("".unxmlify($xo->link)."",false);
-
- foreach($links->link as $l) {
+ foreach($xo->link as $l) {
$atts = $l->attributes();
switch($atts["rel"]) {
case "alternate":
@@ -1715,6 +1831,7 @@ class dfrn {
break;
}
}
+
if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
// send a notification
@@ -1740,6 +1857,151 @@ class dfrn {
}
}
+ /**
+ * @brief Processes several actions, depending on the verb
+ *
+ * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $item the new item record
+ * @param bool $is_like Is the verb a "like"?
+ *
+ * @return bool Should the processing of the entries be continued?
+ */
+ private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
+
+ logger("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
+ // The functions below are partly used by ostatus.php as well - where we have this variable
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
+ $contact = $r[0];
+ $nickname = $contact["nick"];
+
+ // 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");
+ new_follower($importer, $contact, $item, $nickname);
+ return false;
+ }
+ if(activity_match($item["verb"],ACTIVITY_UNFOLLOW)) {
+ logger("Lost follower");
+ lose_follower($importer, $contact, $item);
+ return false;
+ }
+ if(activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+ logger("New friend request");
+ new_follower($importer, $contact, $item, $nickname, true);
+ return false;
+ }
+ if(activity_match($item["verb"],ACTIVITY_UNFRIEND)) {
+ logger("Lost sharer");
+ lose_sharer($importer, $contact, $item);
+ return false;
+ }
+ } else {
+ if(($item["verb"] == ACTIVITY_LIKE)
+ || ($item["verb"] == ACTIVITY_DISLIKE)
+ || ($item["verb"] == ACTIVITY_ATTEND)
+ || ($item["verb"] == ACTIVITY_ATTENDNO)
+ || ($item["verb"] == ACTIVITY_ATTENDMAYBE)) {
+ $is_like = true;
+ $item["type"] = "activity";
+ $item["gravity"] = GRAVITY_LIKE;
+ // only one like or dislike per person
+ // splitted into two queries for performance issues
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
+ intval($item["uid"]),
+ dbesc($item["author-link"]),
+ dbesc($item["verb"]),
+ dbesc($item["parent-uri"])
+ );
+ if (dbm::is_result($r))
+ return false;
+
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
+ intval($item["uid"]),
+ dbesc($item["author-link"]),
+ dbesc($item["verb"]),
+ dbesc($item["parent-uri"])
+ );
+ if (dbm::is_result($r))
+ return false;
+ } else
+ $is_like = false;
+
+ if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+
+ $xo = parse_xml_string($item["object"],false);
+ $xt = parse_xml_string($item["target"],false);
+
+ if($xt->type == ACTIVITY_OBJ_NOTE) {
+ $r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($xt->id),
+ intval($importer["importer_uid"])
+ );
+
+ if (!dbm::is_result($r))
+ return false;
+
+ // extract tag, if not duplicate, add to parent item
+ if($xo->content) {
+ if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+ q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
+ dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+ intval($r[0]["id"])
+ );
+ create_tags_from_item($r[0]["id"]);
+ }
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @brief Processes the link elements
+ *
+ * @param object $links link elements
+ * @param array $item the item record
+ */
+ private static function parse_links($links, &$item) {
+ $rel = "";
+ $href = "";
+ $type = "";
+ $length = "0";
+ $title = "";
+ foreach ($links AS $link) {
+ foreach($link->attributes AS $attributes) {
+ if ($attributes->name == "href")
+ $href = $attributes->textContent;
+ if ($attributes->name == "rel")
+ $rel = $attributes->textContent;
+ if ($attributes->name == "type")
+ $type = $attributes->textContent;
+ if ($attributes->name == "length")
+ $length = $attributes->textContent;
+ if ($attributes->name == "title")
+ $title = $attributes->textContent;
+ }
+ if (($rel != "") AND ($href != ""))
+ switch($rel) {
+ case "alternate":
+ $item["plink"] = $href;
+ break;
+ case "enclosure":
+ $enclosure = $href;
+ if(strlen($item["attach"]))
+ $item["attach"] .= ",";
+
+ $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+ break;
+ }
+ }
+ }
+
/**
* @brief Processes the entry elements which contain the items and comments
*
@@ -1748,7 +2010,7 @@ class dfrn {
* @param object $entry entry elements
* @param array $importer Record of the importer user mixed with contact of the content
*/
- private function process_entry($header, $xpath, $entry, $importer) {
+ private static function process_entry($header, $xpath, $entry, $importer) {
logger("Processing entries");
@@ -1757,6 +2019,20 @@ class dfrn {
// Get the uri
$item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
+ $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
+
+ $current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($item["uri"]),
+ intval($importer["importer_uid"])
+ );
+
+ // Is there an existing item?
+ if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND
+ (datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
+ logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ return;
+ }
+
// Fetch the owner
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
@@ -1774,7 +2050,6 @@ class dfrn {
$item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
- $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
@@ -1804,6 +2079,8 @@ class dfrn {
$item['body'] = @html2bbcode($item['body']);
}
+ /// @todo We should check for a repeated post and if we know the repeated author.
+
// We don't need the content element since "dfrn:env" is always present
//$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
@@ -1818,7 +2095,7 @@ class dfrn {
$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue == "true")
+ if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true")
$item["bookmark"] = true;
$notice_info = $xpath->query("statusnet:notice_info", $entry);
@@ -1856,54 +2133,36 @@ class dfrn {
$categories = $xpath->query("atom:category", $entry);
if ($categories) {
foreach ($categories AS $category) {
- foreach($category->attributes AS $attributes)
- if ($attributes->name == "term") {
+ $term = "";
+ $scheme = "";
+ foreach($category->attributes AS $attributes) {
+ if ($attributes->name == "term")
$term = $attributes->textContent;
+
+ if ($attributes->name == "scheme")
+ $scheme = $attributes->textContent;
+ }
+
+ if (($term != "") AND ($scheme != "")) {
+ $parts = explode(":", $scheme);
+ if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) {
+ $termhash = array_shift($parts);
+ $termurl = implode(":", $parts);
+
if(strlen($item["tag"]))
$item["tag"] .= ",";
- $item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
+ $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
}
+ }
}
}
$enclosure = "";
$links = $xpath->query("atom:link", $entry);
- if ($links) {
- $rel = "";
- $href = "";
- $type = "";
- $length = "0";
- $title = "";
- foreach ($links AS $link) {
- foreach($link->attributes AS $attributes) {
- if ($attributes->name == "href")
- $href = $attributes->textContent;
- if ($attributes->name == "rel")
- $rel = $attributes->textContent;
- if ($attributes->name == "type")
- $type = $attributes->textContent;
- if ($attributes->name == "length")
- $length = $attributes->textContent;
- if ($attributes->name == "title")
- $title = $attributes->textContent;
- }
- if (($rel != "") AND ($href != ""))
- switch($rel) {
- case "alternate":
- $item["plink"] = $href;
- break;
- case "enclosure":
- $enclosure = $href;
- if(strlen($item["attach"]))
- $item["attach"] .= ",";
-
- $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
- break;
- }
- }
- }
+ if ($links)
+ self::parse_links($links, $item);
// Is it a reply or a top level posting?
$item["parent-uri"] = $item["uri"];
@@ -1933,6 +2192,15 @@ class dfrn {
if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
$item["network"] = $author["network"];
+
+ // This code was taken from the old DFRN code
+ // When activated, forums don't work.
+ // And: Why should we disallow commenting by followers?
+ // the behaviour is now similar to the Diaspora part.
+ //if($importer["rel"] == CONTACT_IS_FOLLOWER) {
+ // logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
+ // return;
+ //}
}
if ($entrytype == DFRN_REPLY_RC) {
@@ -1942,6 +2210,7 @@ class dfrn {
if (!isset($item["object-type"]))
$item["object-type"] = ACTIVITY_OBJ_NOTE;
+ // Is it an event?
if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
$ev = bbtoevent($item["body"]);
@@ -1958,7 +2227,7 @@ class dfrn {
dbesc($item["uri"]),
intval($importer["uid"])
);
- if(count($r))
+ if (dbm::is_result($r))
$ev["id"] = $r[0]["id"];
$event_id = event_store($ev);
@@ -1966,44 +2235,15 @@ class dfrn {
return;
}
}
-
- // The filling of the the "contact" variable is done for legcy reasons
- // The functions below are partly used by ostatus.php as well - where we have this variable
- $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
- $contact = $r[0];
- $nickname = $contact["nick"];
-
- // 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');
- new_follower($importer, $contact, $item, $nickname);
- return;
- }
- if(activity_match($item['verb'],ACTIVITY_UNFOLLOW)) {
- logger('Lost follower');
- lose_follower($importer, $contact, $item);
- return;
- }
- if(activity_match($item['verb'],ACTIVITY_REQ_FRIEND)) {
- logger('New friend request');
- new_follower($importer, $contact, $item, $nickname, true);
- return;
- }
- if(activity_match($item['verb'],ACTIVITY_UNFRIEND)) {
- logger('Lost sharer');
- lose_sharer($importer, $contact, $item);
- return;
- }
}
- $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($item["uri"]),
- intval($importer["importer_uid"])
- );
+ if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
+ logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
+ return;
+ }
// Update content if 'updated' changes
- if(count($r)) {
+ if (dbm::is_result($current)) {
if (self::update_content($r[0], $item, $importer, $entrytype))
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
else
@@ -2012,69 +2252,6 @@ class dfrn {
}
if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
- if($importer["rel"] == CONTACT_IS_FOLLOWER) {
- logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
- return;
- }
-
- if(($item["verb"] === ACTIVITY_LIKE)
- || ($item["verb"] === ACTIVITY_DISLIKE)
- || ($item["verb"] === ACTIVITY_ATTEND)
- || ($item["verb"] === ACTIVITY_ATTENDNO)
- || ($item["verb"] === ACTIVITY_ATTENDMAYBE)) {
- $is_like = true;
- $item["type"] = "activity";
- $item["gravity"] = GRAVITY_LIKE;
- // only one like or dislike per person
- // splitted into two queries for performance issues
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
- intval($item["uid"]),
- dbesc($item["author-link"]),
- dbesc($item["verb"]),
- dbesc($item["parent-uri"])
- );
- if($r && count($r))
- return;
-
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
- intval($item["uid"]),
- dbesc($item["author-link"]),
- dbesc($item["verb"]),
- dbesc($item["parent-uri"])
- );
- if($r && count($r))
- return;
-
- } else
- $is_like = false;
-
- if(($item["verb"] === ACTIVITY_TAG) && ($item["object-type"] === ACTIVITY_OBJ_TAGTERM)) {
-
- $xo = parse_xml_string($item["object"],false);
- $xt = parse_xml_string($item["target"],false);
-
- if($xt->type == ACTIVITY_OBJ_NOTE) {
- $r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($xt->id),
- intval($importer["importer_uid"])
- );
-
- if(!count($r))
- return;
-
- // extract tag, if not duplicate, add to parent item
- if($xo->content) {
- if(!(stristr($r[0]["tag"],trim($xo->content)))) {
- q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
- intval($r[0]["id"])
- );
- create_tags_from_item($r[0]["id"]);
- }
- }
- }
- }
-
$posted_id = item_store($item);
$parent = 0;
@@ -2088,7 +2265,7 @@ class dfrn {
intval($posted_id),
intval($importer["importer_uid"])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$parent = $r[0]["parent"];
$parent_uri = $r[0]["parent-uri"];
}
@@ -2109,12 +2286,12 @@ class dfrn {
if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
- proc_run("php", "include/notifier.php", "comment-import", $posted_id);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
}
return true;
}
- } else {
+ } else { // $entrytype == DFRN_TOP_LEVEL
if(!link_compare($item["owner-link"],$importer["url"])) {
// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
// but otherwise there's a possible data mixup on the sender's system.
@@ -2151,7 +2328,7 @@ class dfrn {
* @param object $deletion deletion elements
* @param array $importer Record of the importer user mixed with contact of the content
*/
- private function process_deletion($xpath, $deletion, $importer) {
+ private static function process_deletion($xpath, $deletion, $importer) {
logger("Processing deletions");
@@ -2176,7 +2353,7 @@ class dfrn {
intval($importer["uid"]),
intval($importer["id"])
);
- if(!count($r)) {
+ if (!dbm::is_result($r)) {
logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
return;
} else {
@@ -2190,20 +2367,22 @@ class dfrn {
else
return;
- if($item["object-type"] === ACTIVITY_OBJ_EVENT) {
+ if($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
event_delete($item["event-id"]);
}
- if(($item["verb"] === ACTIVITY_TAG) && ($item["object-type"] === ACTIVITY_OBJ_TAGTERM)) {
+ if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
- if($xt->type === ACTIVITY_OBJ_NOTE) {
+
+ if($xt->type == ACTIVITY_OBJ_NOTE) {
$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
- if(count($i)) {
+ if (dbm::is_result($i)) {
// For tags, the owner cannot remove the tag on the author's copy of the post.
@@ -2268,7 +2447,7 @@ class dfrn {
dbesc($item["parent-uri"]),
intval($importer["uid"])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
intval($r[0]["id"])
);
@@ -2278,7 +2457,7 @@ class dfrn {
if($entrytype == DFRN_REPLY_RC) {
logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
- proc_run("php", "include/notifier.php","drop", $item["id"]);
+ proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
}
}
}
@@ -2291,7 +2470,7 @@ class dfrn {
* @param array $importer Record of the importer user mixed with contact of the content
* @param bool $sort_by_date Is used when feeds are polled
*/
- function import($xml,$importer, $sort_by_date = false) {
+ public static function import($xml,$importer, $sort_by_date = false) {
if ($xml == "")
return;
@@ -2327,12 +2506,30 @@ class dfrn {
$header["contact-id"] = $importer["id"];
// Update the contact table if the data has changed
+
+ // The "atom:author" is only present in feeds
+ if ($xpath->query("/atom:feed/atom:author")->length > 0)
+ self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
+
// Only the "dfrn:owner" in the head section contains all data
- self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false);
+ if ($xpath->query("/atom:feed/dfrn:owner")->length > 0)
+ self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
- // is it a public forum? Private forums aren't supported by now with this method
+ // 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()", $context)->item(0)->nodeValue);
+
+ if ($accounttype != $importer["contact-type"])
+ q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
+ intval($accounttype),
+ intval($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()", $context)->item(0)->nodeValue);
if ($forum != $importer["forum"])