X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=8b230f03d9d085b852ac73898f9d4ea911957628;hb=9521f39ebea7603098e4f96f5edb6c85a40fc646;hp=f7a05bdb63a34ecaeba03f502de0823a2b06e3b7;hpb=5086b8b2a77c0d20898dd56e720a73f8228672fb;p=friendica.git
diff --git a/include/dfrn.php b/include/dfrn.php
index f7a05bdb63..8b230f03d9 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,6 +19,8 @@ require_once("include/event.php");
require_once("include/text.php");
require_once("include/oembed.php");
require_once("include/html2bbcode.php");
+require_once("include/bbcode.php");
+require_once("include/xml.php");
/**
* @brief This class contain functions to create and send DFRN XML files
@@ -38,6 +41,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN entries
+ * @todo Add type-hints
*/
public static function entries($items,$owner) {
@@ -46,10 +50,11 @@ class dfrn {
$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
- if(! count($items))
+ if (! count($items)) {
return trim($doc->saveXML());
+ }
- foreach($items as $item) {
+ foreach ($items as $item) {
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
$root->appendChild($entry);
}
@@ -66,10 +71,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
*/
- public static 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();
@@ -78,14 +84,17 @@ class dfrn {
$starred = false; // not yet implemented, possible security issues
$converse = false;
- if($public_feed && $a->argc > 2) {
- for($x = 2; $x < $a->argc; $x++) {
- if($a->argv[$x] == 'converse')
+ if ($public_feed && $a->argc > 2) {
+ for ($x = 2; $x < $a->argc; $x++) {
+ if ($a->argv[$x] == 'converse') {
$converse = true;
- if($a->argv[$x] == 'starred')
+ }
+ 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];
+ }
}
}
@@ -95,23 +104,23 @@ 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`.`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['uid'];
$owner_nick = $owner['nickname'];
$sql_post_table = "";
- $visibility = "";
- if(! $public_feed) {
+ if (! $public_feed) {
$sql_extra = '';
switch($direction) {
@@ -132,23 +141,25 @@ 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');
$groups = init_groups_visitor($contact['id']);
- if(count($groups)) {
- for($x = 0; $x < count($groups); $x ++)
+ if (count($groups)) {
+ for ($x = 0; $x < count($groups); $x ++)
$groups[$x] = '<' . intval($groups[$x]) . '>' ;
$gs = implode('|', $groups);
- } else
+ } else {
$gs = '<<>>' ; // Impossible to match
+ }
$sql_extra = sprintf("
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
@@ -163,52 +174,53 @@ class dfrn {
);
}
- if($public_feed)
+ if ($public_feed) {
$sort = 'DESC';
- else
+ } else {
$sort = 'ASC';
+ }
- $date_field = "`changed`";
- $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
-
- if(! strlen($last_update))
+ if (! strlen($last_update)) {
$last_update = 'now -30 days';
+ }
- if(isset($category)) {
+ if (isset($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
//$sql_extra .= file_tag_file_query('item',$category,'category');
}
- if($public_feed) {
- if(! $converse)
+ if ($public_feed) {
+ if (! $converse) {
$sql_extra .= " AND `contact`.`self` = 1 ";
+ }
}
$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)
);
+ if (!dbm::is_result($r)) {
+ /// @TODO Some logging?
+ killme();
+ }
+
// Will check further below if this actually returned results.
// We will provide an empty feed if that is the case.
@@ -219,20 +231,22 @@ class dfrn {
$alternatelink = $owner['url'];
- if(isset($category))
+ if (isset($category)) {
$alternatelink .= "/category/".$category;
+ }
- if ($public_feed)
+ if ($public_feed) {
$author = "dfrn:owner";
- else
+ } else {
$author = "author";
+ }
$root = self::add_header($doc, $owner, $author, $alternatelink, true);
// 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);
@@ -240,21 +254,24 @@ class dfrn {
return $atom;
}
- foreach($items as $item) {
+ 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
- if($public_feed) {
+ if ($public_feed) {
$type = 'html';
// catch any email that's in a public conversation and make sure it doesn't leak
- if($item['private'])
+ if ($item['private']) {
continue;
- } else
+ }
+ } else {
$type = 'text';
+ }
$entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry);
@@ -275,6 +292,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN mail
+ * @todo Add type-hints
*/
public static function mail($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
@@ -285,17 +303,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);
@@ -309,6 +327,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN suggestions
+ * @todo Add type-hints
*/
public static function fsuggest($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
@@ -318,11 +337,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);
@@ -336,12 +355,13 @@ class dfrn {
* @param int $uid User ID
*
* @return string DFRN relocations
+ * @todo Add type-hints
*/
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');
- if(! $pubkey) {
+ if (! $pubkey) {
$res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']);
@@ -352,8 +372,9 @@ class dfrn {
$photos = array();
$ext = Photo::supportedTypes();
- foreach($rp as $p)
+ foreach ($rp as $p) {
$photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+ }
unset($rp, $ext);
@@ -364,16 +385,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);
@@ -390,11 +413,13 @@ class dfrn {
* @param bool $public Is it a header for public posts?
*
* @return object XML root object
+ * @todo Add type-hints
*/
- private function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
+ private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
- if ($alternatelink == "")
+ if ($alternatelink == "") {
$alternatelink = $owner['url'];
+ }
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
$doc->appendChild($root);
@@ -409,39 +434,44 @@ 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);
}
- if ($owner['page-flags'] == PAGE_COMMUNITY)
- xml_add_element($doc, $root, "dfrn:community", 1);
+ // For backward compatibility we keep this element
+ if ($owner['page-flags'] == PAGE_COMMUNITY) {
+ 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);
@@ -457,103 +487,128 @@ class dfrn {
* @param string $authorelement Element name for the author
*
* @return object XML author object
+ * @todo Add type-hints
*/
- 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 (dbm::is_result($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();
- $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);
+ }
- $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['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
- if ($public)
+ // 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['uid']));
- if ($r) {
+ if (dbm::is_result($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);
}
if (trim($profile["pub_keywords"]) != "") {
$keywords = explode(",", $profile["pub_keywords"]);
- foreach ($keywords AS $keyword)
- xml_add_element($doc, $author, "poco:tags", trim($keyword));
+ foreach ($keywords AS $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"]);
+ if (trim($profile["locality"]) != "") {
+ xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
+ }
- if (trim($profile["region"]) != "")
- xml_add_element($doc, $element, "poco:region", $profile["region"]);
+ if (trim($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"]);
+ if (trim($profile["country-name"]) != "") {
+ xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
+ }
$author->appendChild($element);
}
@@ -571,15 +626,16 @@ class dfrn {
* @param array $items Item elements
*
* @return object XML author object
+ * @todo Add type-hints
*/
- 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
@@ -590,7 +646,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",
@@ -598,7 +654,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;
}
@@ -611,25 +667,32 @@ class dfrn {
* @param string $activity activity value
*
* @return object XML activity object
+ * @todo Add type-hints
*/
- private function create_activity($doc, $element, $activity) {
+ private static function create_activity($doc, $element, $activity) {
- if($activity) {
+ if ($activity) {
$entry = $doc->createElement($element);
$r = parse_xml_string($activity, false);
- if(!$r)
+ if (!$r) {
return false;
- if($r->type)
- xml_add_element($doc, $entry, "activity:object-type", $r->type);
- if($r->id)
- xml_add_element($doc, $entry, "id", $r->id);
- if($r->title)
- xml_add_element($doc, $entry, "title", $r->title);
- if($r->link) {
- if(substr($r->link,0,1) === '<') {
- if(strstr($r->link,'&') && (! strstr($r->link,'&')))
+ }
+ if ($r->type) {
+ xml::add_element($doc, $entry, "activity:object-type", $r->type);
+ }
+ if ($r->id) {
+ xml::add_element($doc, $entry, "id", $r->id);
+ }
+ if ($r->title) {
+ xml::add_element($doc, $entry, "title", $r->title);
+ }
+
+ if ($r->link) {
+ 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);
@@ -638,18 +701,20 @@ class dfrn {
if (is_object($data)) {
foreach ($data->link AS $link) {
$attributes = array();
- foreach ($link->attributes() AS $parameter => $value)
+ foreach ($link->attributes() AS $parameter => $value) {
$attributes[$parameter] = $value;
- xml_add_element($doc, $entry, "link", "", $attributes);
+ }
+ 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"));
+ if ($r->content) {
+ xml::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+ }
return $entry;
}
@@ -665,25 +730,28 @@ class dfrn {
* @param array $item Item element
*
* @return object XML attachment object
+ * @todo Add type-hints
*/
- 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) {
+ if (count($arr)) {
+ foreach ($arr as $r) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
- if($cnt) {
+ if ($cnt) {
$attributes = array("rel" => "enclosure",
"href" => $matches[1],
"type" => $matches[3]);
- if(intval($matches[2]))
+ if (intval($matches[2])) {
$attributes["length"] = intval($matches[2]);
+ }
- if(trim($matches[4]) != "")
+ if (trim($matches[4]) != "") {
$attributes["title"] = trim($matches[4]);
+ }
- xml_add_element($doc, $root, "link", "", $attributes);
+ xml::add_element($doc, $root, "link", "", $attributes);
}
}
}
@@ -700,31 +768,38 @@ class dfrn {
* @param int $cid Contact ID of the recipient
*
* @return object XML entry object
+ * @todo Add type-hints
*/
- 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();
- if(!$item['parent'])
+ if (!$item['parent']) {
return;
+ }
- if($item['deleted']) {
+ 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");
- if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+ if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
- else
+ } else {
$body = $item['body'];
+ }
+
+ // Remove the abstract element. It is only locally important.
+ $body = remove_abstract($body);
if ($type == 'html') {
$htmlbody = $body;
- if ($item['title'] != "")
+ if ($item['title'] != "") {
$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+ }
$htmlbody = bbcode($htmlbody, false, false, 7);
}
@@ -735,106 +810,128 @@ class dfrn {
$dfrnowner = self::add_entry_author($doc, "dfrn:owner", $item["owner-link"], $item);
$entry->appendChild($dfrnowner);
- if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+ if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$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']));
+ if ($comment) {
+ xml::add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+ }
- if($item['location'])
- xml_add_element($doc, $entry, "dfrn:location", $item['location']);
+ if ($item['location']) {
+ xml::add_element($doc, $entry, "dfrn:location", $item['location']);
+ }
- if($item['coord'])
- xml_add_element($doc, $entry, "georss:point", $item['coord']);
+ if ($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));
+ 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));
+ }
- if($item['extid'])
- xml_add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ if ($item['extid']) {
+ xml::add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ }
- if($item['bookmark'])
- xml_add_element($doc, $entry, "dfrn:bookmark", "true");
+ if ($item['bookmark']) {
+ 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']));
+ if ($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']);
- elseif ($item['id'] == $item['parent'])
- xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
- else
- xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ if ($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);
+ } else {
+ xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ }
$actobj = self::create_activity($doc, "activity:object", $item['object']);
- if ($actobj)
+ if ($actobj) {
$entry->appendChild($actobj);
+ }
$actarg = self::create_activity($doc, "activity:target", $item['target']);
- if ($actarg)
+ if ($actarg) {
$entry->appendChild($actarg);
+ }
$tags = item_getfeedtags($item);
- 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]));
+ 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]));
+ }
+ }
}
- if(count($tags))
- foreach($tags as $t)
- if ($t[0] == "@")
+ if (count($tags)) {
+ foreach ($tags as $t) {
+ if ($t[0] == "@") {
$mentioned[$t[1]] = $t[1];
+ }
+ }
+ }
foreach ($mentioned AS $mention) {
$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
dbesc(normalise_link($mention)));
- if ($r[0]["forum"] OR $r[0]["prv"])
- xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+
+ if (!dbm::is_result($r)) {
+ /// @TODO Maybe some logging?
+ killme();
+ }
+
+ if ($r[0]["forum"] OR $r[0]["prv"]) {
+ 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",
+ } else {
+ xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
+ }
}
self::get_attachment($doc, $entry, $item);
@@ -851,6 +948,7 @@ class dfrn {
* @param bool $dissolve (to be documented)
*
* @return int Deliver status. -1 means an error.
+ * @todo Add array type-hint for $owner, $contact
*/
public static function deliver($owner,$contact,$atom, $dissolve = false) {
@@ -858,16 +956,20 @@ class dfrn {
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
- if($contact['duplex'] && $contact['dfrn-id'])
+ if ($contact['duplex'] && $contact['dfrn-id']) {
$idtosend = '0:' . $orig_id;
- if($contact['duplex'] && $contact['issued-id'])
+ }
+ if ($contact['duplex'] && $contact['issued-id']) {
$idtosend = '1:' . $orig_id;
-
+ }
$rino = get_config('system','rino_encrypt');
$rino = intval($rino);
+
// use RINO1 if mcrypt isn't installed and RINO2 was selected
- if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
+ if ($rino==2 and !function_exists('mcrypt_create_iv')) {
+ $rino=1;
+ }
logger("Local rino version: ". $rino, LOGGER_DEBUG);
@@ -891,18 +993,26 @@ 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);
- if(! $xml)
+ if (! $xml) {
return 3;
+ }
- if(strpos($xml,'status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+ if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
return (($res->status) ? $res->status : 3);
+ }
$postvars = array();
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
@@ -923,13 +1034,14 @@ class dfrn {
logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
- if($owner['page-flags'] == PAGE_PRVGROUP)
+ if ($owner['page-flags'] == PAGE_PRVGROUP) {
$page = 2;
+ }
$final_dfrn_id = '';
- if($perm) {
- if((($perm == 'rw') && (! intval($contact['writable'])))
+ if ($perm) {
+ 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),
@@ -939,7 +1051,7 @@ class dfrn {
}
}
- if(($contact['duplex'] && strlen($contact['pubkey']))
+ if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
@@ -951,10 +1063,11 @@ class dfrn {
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
- if(strpos($final_dfrn_id,':') == 1)
+ if (strpos($final_dfrn_id,':') == 1) {
$final_dfrn_id = substr($final_dfrn_id,2);
+ }
- if($final_dfrn_id != $orig_id) {
+ if ($final_dfrn_id != $orig_id) {
logger('dfrn_deliver: wrong dfrn_id.');
// did not decode properly - cannot trust this site
return 3;
@@ -962,11 +1075,12 @@ class dfrn {
$postvars['dfrn_id'] = $idtosend;
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
- if($dissolve)
+ if ($dissolve) {
$postvars['dissolve'] = '1';
+ }
- if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+ if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
$postvars['data'] = $atom;
$postvars['perm'] = 'rw';
} else {
@@ -976,11 +1090,12 @@ class dfrn {
$postvars['ssl_policy'] = $ssl_policy;
- if($page)
+ if ($page) {
$postvars['page'] = $page;
+ }
- if($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+ if ($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
logger('rino version: '. $rino_remote_version);
switch($rino_remote_version) {
@@ -995,46 +1110,48 @@ 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;
$postvars['data'] = bin2hex($data);
- #logger('rino: sent key = ' . $key, LOGGER_DEBUG);
+ //logger('rino: sent key = ' . $key, LOGGER_DEBUG);
- if($dfrn_version >= 2.1) {
- if(($contact['duplex'] && strlen($contact['pubkey']))
+ if ($dfrn_version >= 2.1) {
+ if (($contact['duplex'] && strlen($contact['pubkey'])) {
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey'])))
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
- else
+ } else {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+ }
} else {
- if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY))
+ if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
- else
+ } else {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+ }
}
@@ -1046,24 +1163,26 @@ 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,' NULL_DATE) {
logger("dfrn_deliver: $url back from the dead - removing mark for death");
require_once('include/Contact.php');
unmark_for_death($contact);
@@ -1079,16 +1198,26 @@ class dfrn {
*
* @param array $contact Contact record
* @param string $birthday Birthday of the contact
- *
+ * @todo Add array type-hint for $contact
*/
- private function birthday_event($contact, $birthday) {
+ private static function birthday_event($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"]),
+ dbesc(datetime_convert("UTC","UTC", $birthday)),
+ dbesc("birthday"));
+
+ if (dbm::is_result($r)) {
+ return;
+ }
logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
$bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
$bdtext2 = sprintf(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"]),
@@ -1113,24 +1242,27 @@ class dfrn {
* @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
*
* @return Returns an array with relevant data of the author
+ * @todo Find good type-hints for all parameter
*/
- private function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
+ private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
$author = array();
$author["name"] = $xpath->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`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
- `name`, `nick`, `about`, `location`, `keywords`, `bdyear`, `bd`
+ `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) {
+
+ if (dbm::is_result($r)) {
$contact = $r[0];
$author["contact-id"] = $r[0]["id"];
$author["network"] = $r[0]["network"];
} else {
- if (!$onlyfetch)
+ 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"];
@@ -1139,80 +1271,112 @@ 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) {
+ foreach ($avatars AS $avatar) {
$href = "";
$width = 0;
- foreach($avatar->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($avatar->attributes AS $attributes) {
+ /// @TODO Rewrite these similar if() to one switch
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "width")
+ }
+ if ($attributes->name == "width") {
$width = $attributes->textContent;
- if ($attributes->name == "updated")
+ }
+ if ($attributes->name == "updated") {
$contact["avatar-date"] = $attributes->textContent;
+ }
}
- if (($width > 0) AND ($href != ""))
+ if (($width > 0) AND ($href != "")) {
$avatarlist[$width] = $href;
+ }
}
if (count($avatarlist) > 0) {
krsort($avatarlist);
$author["avatar"] = current($avatarlist);
}
- if ($r AND !$onlyfetch) {
+ if (dbm::is_result($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")
+ foreach ($name_element->attributes AS $attributes) {
+ if ($attributes->name == "updated") {
$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")
+ foreach ($link_element->attributes AS $attributes) {
+ if ($attributes->name == "updated") {
$poco["uri-date"] = $attributes->textContent;
+ }
+ }
// Update contact data
$value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($value != "") {
$poco["addr"] = $value;
+ }
$value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($value != "") {
$poco["name"] = $value;
+ }
$value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($value != "") {
$poco["nick"] = $value;
+ }
$value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($value != "") {
$poco["about"] = $value;
+ }
$value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($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);
- foreach($tagelements AS $tag)
+ foreach ($tagelements AS $tag) {
$tags[$tag->nodeValue] = $tag->nodeValue;
+ }
- if (count($tags))
+ if (count($tags)) {
$poco["keywords"] = implode(", ", $tags);
+ }
// "dfrn:birthday" contains the birthday converted to UTC
$old_bdyear = $contact["bdyear"];
@@ -1242,13 +1406,15 @@ class dfrn {
$contact = array_merge($contact, $poco);
- if ($old_bdyear != $contact["bdyear"])
+ if ($old_bdyear != $contact["bdyear"]) {
self::birthday_event($contact, $birthday);
+ }
// Get all field names
$fields = array();
- foreach ($r[0] AS $field => $data)
+ foreach ($r[0] AS $field => $data) {
$fields[$field] = $data;
+ }
unset($fields["id"]);
unset($fields["uid"]);
@@ -1257,30 +1423,33 @@ class dfrn {
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)
+ foreach ($datefields AS $field) {
if (strtotime($contact[$field]) > strtotime($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;
}
+ }
- foreach ($fields AS $field => $data)
+ 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"]." (".$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"]));
}
@@ -1294,6 +1463,8 @@ class dfrn {
$poco["generation"] = 2;
$poco["photo"] = $author["avatar"];
+ $poco["hide"] = $hide;
+ $poco["contact-type"] = $contact["contact-type"];
update_gcontact($poco);
}
@@ -1308,10 +1479,12 @@ class dfrn {
* @param text $element element name
*
* @return string XML string
+ * @todo Find good type-hints for all parameter
*/
- private function transform_activity($xpath, $activity, $element) {
- if (!is_object($activity))
+ private static function transform_activity($xpath, $activity, $element) {
+ if (!is_object($activity)) {
return "";
+ }
$obj_doc = new DOMDocument("1.0", "utf-8");
$obj_doc->formatOutput = true;
@@ -1319,30 +1492,35 @@ 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))
+ if (is_object($id)) {
$obj_element->appendChild($obj_doc->importNode($id, true));
+ }
$title = $xpath->query("atom:title", $activity)->item(0);
- if (is_object($title))
+ if (is_object($title)) {
$obj_element->appendChild($obj_doc->importNode($title, true));
+ }
$links = $xpath->query("atom:link", $activity);
- if (is_object($links))
- foreach ($links AS $link)
+ 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))
+ if (is_object($content)) {
$obj_element->appendChild($obj_doc->importNode($content, true));
+ }
$obj_doc->appendChild($obj_element);
$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);
}
@@ -1353,11 +1531,13 @@ class dfrn {
* @param object $xpath XPath object
* @param object $mail mail elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
- private function process_mail($xpath, $mail, $importer) {
+ private static function process_mail($xpath, $mail, $importer) {
logger("Processing mails");
+ /// @TODO Rewrite this to one statement
$msg = array();
$msg["uid"] = $importer["importer_uid"];
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
@@ -1372,12 +1552,12 @@ 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.
-
+ /// @TODO Arange this mess
$notif_params = array(
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
@@ -1404,11 +1584,14 @@ class dfrn {
* @param object $xpath XPath object
* @param object $suggestion suggestion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
- private function process_suggestion($xpath, $suggestion, $importer) {
+ private static function process_suggestion($xpath, $suggestion, $importer) {
+ $a = get_app();
logger("Processing suggestions");
+ /// @TODO Rewrite this to one statement
$suggest = array();
$suggest["uid"] = $importer["importer_uid"];
$suggest["cid"] = $importer["id"];
@@ -1425,8 +1608,10 @@ class dfrn {
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
);
- if(count($r))
+ /// @TODO Really abort on valid result??? Maybe missed ! here?
+ if (dbm::is_result($r)) {
return false;
+ }
// Do we already have an fcontact record for this person?
@@ -1436,7 +1621,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 ?
@@ -1444,10 +1629,12 @@ class dfrn {
intval($suggest["uid"]),
intval($fid)
);
- if(count($r))
+ /// @TODO Really abort on valid result??? Maybe missed ! here?
+ if (dbm::is_result($r)) {
return false;
+ }
}
- if(!$fid)
+ if (!$fid)
$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
dbesc($suggest["name"]),
dbesc($suggest["url"]),
@@ -1459,11 +1646,12 @@ class dfrn {
dbesc($suggest["name"]),
dbesc($suggest["request"])
);
- if(count($r))
+ if (dbm::is_result($r)) {
$fid = $r[0]["id"];
- else
+ } else {
// database record did not get created. Quietly give up.
- return false;
+ killme();
+ }
$hash = random_string();
@@ -1505,16 +1693,20 @@ class dfrn {
* @param object $xpath XPath object
* @param object $relocation relocation elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
- private function process_relocation($xpath, $relocation, $importer) {
+ private static function process_relocation($xpath, $relocation, $importer) {
logger("Processing relocations");
+ /// @TODO Rewrite this to one statement
$relocate = array();
$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;
@@ -1524,60 +1716,103 @@ 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"]),
intval($importer["importer_uid"]));
- if (!$r)
- return false;
+
+ if (!dbm::is_result($r)) {
+ killme();
+ }
$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"])));
- if ($x === false)
+ 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 (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;
}
+ }
/// @TODO
/// merge with current record, current contents have priority
@@ -1595,7 +1830,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)) {
@@ -1618,12 +1853,13 @@ class dfrn {
$changed = true;
- if ($entrytype == DFRN_REPLY_RC)
- proc_run("php", "include/notifier.php","comment-import", $current["id"]);
+ if ($entrytype == DFRN_REPLY_RC) {
+ proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
+ }
}
// update last-child if it changes
- if($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
+ if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
@@ -1647,7 +1883,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;
@@ -1655,8 +1891,9 @@ class dfrn {
$sql_extra = "";
$community = true;
logger("possible community action");
- } else
+ } else {
$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
+ }
// was the top-level post for this action written by somebody on this site?
// Specifically, the recipient?
@@ -1668,7 +1905,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')
@@ -1680,8 +1917,9 @@ 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;
+ }
}
// Does this have the characteristics of a community or private group action?
@@ -1689,20 +1927,22 @@ class dfrn {
// valid community action. Also forum_mode makes it valid for sure.
// If neither, it's not.
- if($is_a_remote_action && $community) {
- if((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+ if ($is_a_remote_action && $community) {
+ if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
$is_a_remote_action = false;
logger("not a community action");
}
}
- if ($is_a_remote_action)
+ if ($is_a_remote_action) {
return DFRN_REPLY_RC;
- else
+ } else {
return DFRN_REPLY;
+ }
- } else
+ } else {
return DFRN_TOP_LEVEL;
+ }
}
@@ -1713,16 +1953,17 @@ 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)
+ if (!$verb) {
return;
+ }
$xo = parse_xml_string($item["object"],false);
- if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+ if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
- foreach($xo->link as $l) {
+ foreach ($xo->link as $l) {
$atts = $l->attributes();
switch($atts["rel"]) {
case "alternate":
@@ -1768,7 +2009,10 @@ class dfrn {
*
* @return bool Should the processing of the entries be continued?
*/
- private function process_verbs($entrytype, $importer, &$item, &$is_like) {
+ 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
@@ -1778,32 +2022,32 @@ class dfrn {
// 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)) {
+ 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)) {
+ 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)) {
+ 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)) {
+ 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)) {
+ 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;
@@ -1815,8 +2059,9 @@ class dfrn {
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if($r && count($r))
+ 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"]),
@@ -1824,28 +2069,31 @@ class dfrn {
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if($r && count($r))
+ if (dbm::is_result($r)) {
return false;
- } else
+ }
+ } else {
$is_like = false;
+ }
- 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) {
$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 false;
+ if (!dbm::is_result($r)) {
+ killme();
+ }
// extract tag, if not duplicate, add to parent item
- if($xo->content) {
- if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+ 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"])
@@ -1864,25 +2112,32 @@ class dfrn {
*
* @param object $links link elements
* @param array $item the item record
+ * @todo Add type-hints
*/
- private function parse_links($links, &$item) {
+ 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")
+ foreach ($link->attributes AS $attributes) {
+ /// @TODO Rewrite these repeated (same) if() statements to a switch()
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "rel")
+ }
+ if ($attributes->name == "rel") {
$rel = $attributes->textContent;
- if ($attributes->name == "type")
+ }
+ if ($attributes->name == "type") {
$type = $attributes->textContent;
- if ($attributes->name == "length")
+ }
+ if ($attributes->name == "length") {
$length = $attributes->textContent;
- if ($attributes->name == "title")
+ }
+ if ($attributes->name == "title") {
$title = $attributes->textContent;
+ }
}
if (($rel != "") AND ($href != ""))
switch($rel) {
@@ -1891,8 +2146,9 @@ class dfrn {
break;
case "enclosure":
$enclosure = $href;
- if(strlen($item["attach"]))
+ if (strlen($item["attach"])) {
$item["attach"] .= ",";
+ }
$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
break;
@@ -1907,8 +2163,9 @@ class dfrn {
* @param object $xpath XPath object
* @param object $entry entry elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Add type-hints
*/
- private function process_entry($header, $xpath, $entry, $importer) {
+ private static function process_entry($header, $xpath, $entry, $importer) {
logger("Processing entries");
@@ -1917,6 +2174,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);
@@ -1934,7 +2205,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"]);
@@ -1944,7 +2214,7 @@ class dfrn {
$item["body"] = limit_body_size($item["body"]);
/// @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)) {
+ if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
$item['body'] = reltoabs($item['body'],$base_url);
@@ -1973,21 +2243,24 @@ class dfrn {
$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
$georsspoint = $xpath->query("georss:point", $entry);
- if ($georsspoint)
+ if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue;
+ }
$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
$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);
if ($notice_info AND ($notice_info->length > 0)) {
- foreach($notice_info->item(0)->attributes AS $attributes) {
- if ($attributes->name == "source")
+ foreach ($notice_info->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
+ }
}
}
@@ -1995,21 +2268,24 @@ class dfrn {
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
- if ($dsprsig != "")
+ if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
+ }
$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "")
+ if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+ }
$object = $xpath->query("activity:object", $entry)->item(0);
$item["object"] = self::transform_activity($xpath, $object, "object");
if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false);
- if (isset($r->type))
+ if (isset($r->type)) {
$item["object-type"] = $r->type;
+ }
}
$target = $xpath->query("activity:target", $entry)->item(0);
@@ -2018,51 +2294,77 @@ class dfrn {
$categories = $xpath->query("atom:category", $entry);
if ($categories) {
foreach ($categories AS $category) {
- foreach($category->attributes AS $attributes)
+ $term = "";
+ $scheme = "";
+ foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if(strlen($item["tag"]))
+ }
+
+ 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)
+ if ($links) {
self::parse_links($links, $item);
+ }
// Is it a reply or a top level posting?
$item["parent-uri"] = $item["uri"];
$inreplyto = $xpath->query("thr:in-reply-to", $entry);
- if (is_object($inreplyto->item(0)))
- foreach($inreplyto->item(0)->attributes AS $attributes)
- if ($attributes->name == "ref")
+ if (is_object($inreplyto->item(0))) {
+ foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
+ }
+ }
+ }
// Get the type of the item (Top level post, reply or remote reply)
$entrytype = self::get_entry_type($importer, $item);
// Now assign the rest of the values that depend on the type of the message
if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_COMMENT;
+ }
- if ($item["contact-id"] != $owner["contact-id"])
+ if ($item["contact-id"] != $owner["contact-id"]) {
$item["contact-id"] = $owner["contact-id"];
+ }
- if (($item["network"] != $owner["network"]) AND ($owner["network"] != ""))
+ if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
$item["network"] = $owner["network"];
+ }
- if ($item["contact-id"] != $author["contact-id"])
+ if ($item["contact-id"] != $author["contact-id"]) {
$item["contact-id"] = $author["contact-id"];
+ }
- if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
+ 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.
@@ -2078,14 +2380,15 @@ class dfrn {
$item["type"] = "remote-comment";
$item["wall"] = 1;
} elseif ($entrytype == DFRN_TOP_LEVEL) {
- if (!isset($item["object-type"]))
+ 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"]);
- if((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+ if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
$ev["cid"] = $importer["id"];
$ev["uid"] = $importer["uid"];
@@ -2098,8 +2401,9 @@ 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);
logger("Event ".$event_id." was stored", LOGGER_DEBUG);
@@ -2108,22 +2412,18 @@ class dfrn {
}
}
- $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 (self::update_content($r[0], $item, $importer, $entrytype))
+ if (dbm::is_result($current)) {
+ if (self::update_content($r[0], $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
- else
+ } else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ }
return;
}
@@ -2131,7 +2431,7 @@ class dfrn {
$posted_id = item_store($item);
$parent = 0;
- if($posted_id) {
+ if ($posted_id) {
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
@@ -2141,12 +2441,12 @@ 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"];
}
- if(!$is_like) {
+ if (!$is_like) {
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
@@ -2160,15 +2460,15 @@ class dfrn {
);
}
- if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+ 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 { // $entrytype == DFRN_TOP_LEVEL
- if(!link_compare($item["owner-link"],$importer["url"])) {
+ 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.
// the tgroup delivery code called from item_store will correct it if it's a forum,
@@ -2179,7 +2479,7 @@ class dfrn {
$item["owner-avatar"] = $importer["thumb"];
}
- if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+ if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return;
}
@@ -2204,23 +2504,27 @@ 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");
- foreach($deletion->attributes AS $attributes) {
- if ($attributes->name == "ref")
+ foreach ($deletion->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$uri = $attributes->textContent;
- if ($attributes->name == "when")
+ }
+ if ($attributes->name == "when") {
$when = $attributes->textContent;
+ }
}
- if ($when)
+ if ($when) {
$when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
- else
+ } else {
$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
+ }
- if (!$uri OR !$importer["id"])
+ if (!$uri OR !$importer["id"]) {
return false;
+ }
/// @todo Only select the used fields
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
@@ -2229,7 +2533,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 {
@@ -2238,25 +2542,28 @@ class dfrn {
$entrytype = self::get_entry_type($importer, $item);
- if(!$item["deleted"])
+ if (!$item["deleted"]) {
logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
- else
+ } 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.
@@ -2264,15 +2571,18 @@ class dfrn {
$author_remove = (($item["origin"] && $item["self"]) ? true : false);
$author_copy = (($item["origin"]) ? true : false);
- if($owner_remove && $author_copy)
+ if ($owner_remove && $author_copy) {
return;
- if($author_remove || $owner_remove) {
+ }
+ if ($author_remove || $owner_remove) {
$tags = explode(',',$i[0]["tag"]);
$newtags = array();
- if(count($tags)) {
- foreach($tags as $tag)
- if(trim($tag) !== trim($xo->body))
+ if (count($tags)) {
+ foreach ($tags as $tag) {
+ if (trim($tag) !== trim($xo->body)) {
$newtags[] = trim($tag);
+ }
+ }
}
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc(implode(',',$newtags)),
@@ -2321,7 +2631,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"])
);
@@ -2331,7 +2641,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"]);
}
}
}
@@ -2391,7 +2701,19 @@ class dfrn {
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"])
@@ -2401,25 +2723,30 @@ class dfrn {
);
$mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails AS $mail)
+ foreach ($mails AS $mail) {
self::process_mail($xpath, $mail, $importer);
+ }
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions AS $suggestion)
+ foreach ($suggestions AS $suggestion) {
self::process_suggestion($xpath, $suggestion, $importer);
+ }
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
- foreach ($relocations AS $relocation)
+ foreach ($relocations AS $relocation) {
self::process_relocation($xpath, $relocation, $importer);
+ }
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
- foreach ($deletions AS $deletion)
+ foreach ($deletions AS $deletion) {
self::process_deletion($xpath, $deletion, $importer);
+ }
if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry)
+ foreach ($entries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer);
+ }
} else {
$newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry");
@@ -2431,8 +2758,9 @@ class dfrn {
// Now sort after the publishing date
ksort($newentries);
- foreach ($newentries AS $entry)
+ foreach ($newentries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer);
+ }
}
logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
}