X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=094c37717a25a100b96635ac6669dde40f79bb82;hb=771163e86056b92713577e55d0b5a3de7299cca4;hp=bfb0d445c95957c8a3911d37eb9fb2a174b343a5;hpb=a61ffa92000234f76d9bcbd9f75340ac2862d81b;p=friendica.git
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index bfb0d445c9..094c37717a 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,5 +1,4 @@
formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
if (! count($items)) {
return trim($doc->saveXML());
@@ -78,16 +84,16 @@ class DFRN {
*
* This function is called when another server is pulling data from the user feed.
*
- * @param string $dfrn_id DFRN ID from the requesting party
- * @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")
+ * @param string $dfrn_id DFRN ID from the requesting party
+ * @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, $onlyheader = false) {
-
+ public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
+ {
$a = get_app();
$sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@@ -115,7 +121,8 @@ 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`, `user`.`account-type`
+ $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` AND `user`.`nickname` = '%s' LIMIT 1",
dbesc($owner_nick)
@@ -132,9 +139,8 @@ class DFRN {
$sql_post_table = "";
if (! $public_feed) {
-
$sql_extra = '';
- switch($direction) {
+ switch ($direction) {
case (-1):
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
$my_id = $dfrn_id;
@@ -152,7 +158,8 @@ class DFRN {
break; // NOTREACHED
}
- $r = q("SELECT * FROM `contact` WHERE NOT `blocked` 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)
);
@@ -161,8 +168,8 @@ class DFRN {
}
$contact = $r[0];
- require_once('include/security.php');
- $groups = init_groups_visitor($contact['id']);
+ include_once 'include/security.php';
+ $groups = Group::getIdsByContactId($contact['id']);
if (count($groups)) {
for ($x = 0; $x < count($groups); $x ++)
@@ -172,7 +179,8 @@ class DFRN {
$gs = '<<>>' ; // Impossible to match
}
- $sql_extra = sprintf("
+ $sql_extra = sprintf(
+ "
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
@@ -196,8 +204,13 @@ class DFRN {
}
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_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');
}
@@ -207,9 +220,10 @@ class DFRN {
}
}
- $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
+ $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
- $r = q("SELECT `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`,
@@ -249,7 +263,7 @@ class DFRN {
$author = "author";
}
- $root = self::add_header($doc, $owner, $author, $alternatelink, true);
+ $root = self::addHeader($doc, $owner, $author, $alternatelink, true);
/// @TODO This hook can't work anymore
// call_hooks('atom_feed', $atom);
@@ -263,7 +277,6 @@ class DFRN {
}
foreach ($items as $item) {
-
// prevent private email from leaking.
if ($item['network'] == NETWORK_MAIL) {
continue;
@@ -283,7 +296,6 @@ class DFRN {
$entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry);
-
}
$atom = trim($doc->saveXML());
@@ -296,19 +308,21 @@ class DFRN {
/**
* @brief Generate an atom entry for a given item id
*
- * @param int $item_id The item id
+ * @param int $item_id The item id
* @param boolean $conversation Show the conversation. If false show the single post.
*
* @return string DFRN feed entry
*/
- public static function itemFeed($item_id, $conversation = false) {
+ public static function itemFeed($item_id, $conversation = false)
+ {
if ($conversation) {
$condition = '`item`.`parent`';
} else {
$condition = '`item`.`id`';
}
- $r = q("SELECT `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`,
@@ -330,18 +344,15 @@ class DFRN {
$items = $r;
$item = $r[0];
- $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` AND `user`.`uid` = %d LIMIT 1",
- intval($item['uid'])
- );
-
- if (!DBM::is_result($r)) {
- killme();
+ if ($item['uid'] != 0) {
+ $owner = User::getOwnerDataById($item['uid']);
+ if (!$owner) {
+ killme();
+ }
+ } else {
+ $owner = ['uid' => 0, 'nick' => 'feed-item'];
}
- $owner = $r[0];
-
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$type = 'html';
@@ -360,7 +371,7 @@ class DFRN {
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- //$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ //$root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
foreach ($items as $item) {
$entry = self::entry($doc, $type, $item, $owner, true, 0);
@@ -377,32 +388,33 @@ class DFRN {
/**
* @brief Create XML text for DFRN mails
*
- * @param array $item message elements
+ * @param array $item message elements
* @param array $owner Owner record
*
* @return string DFRN mail
* @todo Add type-hints
*/
- public static function mail($item, $owner) {
+ public static function mail($item, $owner)
+ {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$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::addElement($doc, $sender, "dfrn:name", $owner['name']);
+ XML::addElement($doc, $sender, "dfrn:uri", $owner['url']);
+ XML::addElement($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::addElement($doc, $mail, "dfrn:id", $item['uri']);
+ XML::addElement($doc, $mail, "dfrn:in-reply-to", $item['parent-uri']);
+ XML::addElement($doc, $mail, "dfrn:sentdate", datetime_convert('UTC', 'UTC', $item['created'] . '+00:00', ATOM_TIME));
+ XML::addElement($doc, $mail, "dfrn:subject", $item['title']);
+ XML::addElement($doc, $mail, "dfrn:content", $item['body']);
$root->appendChild($mail);
@@ -412,25 +424,26 @@ class DFRN {
/**
* @brief Create XML text for DFRN friend suggestions
*
- * @param array $item suggestion elements
+ * @param array $item suggestion elements
* @param array $owner Owner record
*
* @return string DFRN suggestions
* @todo Add type-hints
*/
- public static function fsuggest($item, $owner) {
+ public static function fsuggest($item, $owner)
+ {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$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::addElement($doc, $suggest, "dfrn:url", $item['url']);
+ XML::addElement($doc, $suggest, "dfrn:name", $item['name']);
+ XML::addElement($doc, $suggest, "dfrn:photo", $item['photo']);
+ XML::addElement($doc, $suggest, "dfrn:request", $item['request']);
+ XML::addElement($doc, $suggest, "dfrn:note", $item['note']);
$root->appendChild($suggest);
@@ -441,25 +454,29 @@ class DFRN {
* @brief Create XML text for DFRN relocations
*
* @param array $owner Owner record
- * @param int $uid User ID
+ * @param int $uid User ID
*
* @return string DFRN relocations
* @todo Add type-hints
*/
- public static function relocate($owner, $uid) {
+ public static function relocate($owner, $uid)
+ {
/* get site pubkey. this could be a new installation with no site keys*/
- $pubkey = Config::get('system','site_pubkey');
+ $pubkey = Config::get('system', 'site_pubkey');
if (! $pubkey) {
- $res = new_keypair(1024);
- Config::set('system','site_prvkey', $res['prvkey']);
- Config::set('system','site_pubkey', $res['pubkey']);
+ $res = Crypto::newKeypair(1024);
+ Config::set('system', 'site_prvkey', $res['prvkey']);
+ Config::set('system', 'site_pubkey', $res['pubkey']);
}
- $rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
- WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
+ $rp = q(
+ "SELECT `resource-id` , `scale`, type FROM `photo`
+ WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
+ $uid
+ );
$photos = array();
- $ext = Photo::supportedTypes();
+ $ext = Image::supportedTypes();
foreach ($rp as $p) {
$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
@@ -470,22 +487,22 @@ class DFRN {
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
- $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
+ $root = self::addHeader($doc, $owner, "dfrn:owner", "", false);
$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: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", Config::get('system','site_pubkey'));
+ XML::addElement($doc, $relocate, "dfrn:url", $owner['url']);
+ XML::addElement($doc, $relocate, "dfrn:name", $owner['name']);
+ XML::addElement($doc, $relocate, "dfrn:addr", $owner['addr']);
+ XML::addElement($doc, $relocate, "dfrn:avatar", $owner['avatar']);
+ XML::addElement($doc, $relocate, "dfrn:photo", $photos[4]);
+ XML::addElement($doc, $relocate, "dfrn:thumb", $photos[5]);
+ XML::addElement($doc, $relocate, "dfrn:micro", $photos[6]);
+ XML::addElement($doc, $relocate, "dfrn:request", $owner['request']);
+ XML::addElement($doc, $relocate, "dfrn:confirm", $owner['confirm']);
+ XML::addElement($doc, $relocate, "dfrn:notify", $owner['notify']);
+ XML::addElement($doc, $relocate, "dfrn:poll", $owner['poll']);
+ XML::addElement($doc, $relocate, "dfrn:sitepubkey", Config::get('system', 'site_pubkey'));
$root->appendChild($relocate);
@@ -495,16 +512,17 @@ class DFRN {
/**
* @brief Adds the header elements for the DFRN protocol
*
- * @param object $doc XML document
- * @param array $owner Owner record
+ * @param object $doc XML document
+ * @param array $owner Owner record
* @param string $authorelement Element name for the author
* @param string $alternatelink link to profile or category
- * @param bool $public Is it a header for public posts?
+ * @param bool $public Is it a header for public posts?
*
* @return object XML root object
* @todo Add type-hints
*/
- private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
+ private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
+ {
if ($alternatelink == "") {
$alternatelink = $owner['url'];
@@ -523,46 +541,46 @@ class DFRN {
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- xml::add_element($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
- xml::add_element($doc, $root, "title", $owner["name"]);
+ XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
+ XML::addElement($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::addElement($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::addElement($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $alternatelink);
- xml::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($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, $owner["nick"]);
+ OStatus::hublinks($doc, $root, $owner["nick"]);
$attributes = array("rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- xml::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- xml::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($doc, $root, "link", "", $attributes);
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
- xml::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($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::addElement($doc, $root, "dfrn:community", 1);
}
// The former element is replaced by this one
- xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
+ XML::addElement($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::addElement($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
- $author = self::add_author($doc, $owner, $authorelement, $public);
+ $author = self::addAuthor($doc, $owner, $authorelement, $public);
$root->appendChild($author);
return $root;
@@ -571,19 +589,22 @@ class DFRN {
/**
* @brief Adds the author element in the header for the DFRN protocol
*
- * @param object $doc XML document
- * @param array $owner Owner record
- * @param string $authorelement Element name for the author
+ * @param object $doc XML document
+ * @param array $owner Owner record
+ * @param string $authorelement Element name for the author
+ * @param boolean $public boolean
*
* @return object XML author object
* @todo Add type-hints
*/
- private static function add_author($doc, $owner, $authorelement, $public) {
-
+ private static function addAuthor($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`
+ $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']));
+ intval($owner['uid'])
+ );
if (DBM::is_result($r)) {
$hidewall = true;
} else {
@@ -602,9 +623,9 @@ class DFRN {
$attributes = array("dfrn:updated" => $namdate);
}
- xml::add_element($doc, $author, "name", $owner["name"], $attributes);
- xml::add_element($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
- xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
+ XML::addElement($doc, $author, "name", $owner["name"], $attributes);
+ XML::addElement($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
+ XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
@@ -613,13 +634,13 @@ class DFRN {
$attributes["dfrn:updated"] = $picdate;
}
- xml::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
$attributes["rel"] = "avatar";
- xml::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
if ($hidewall) {
- xml::add_element($doc, $author, "dfrn:hide", "true");
+ XML::addElement($doc, $author, "dfrn:hide", "true");
}
// The following fields will only be generated if the data isn't meant for a public feed
@@ -629,75 +650,77 @@ class DFRN {
$birthday = feed_birthday($owner['uid'], $owner['timezone']);
- if ($birthday)
- xml::add_element($doc, $author, "dfrn:birthday", $birthday);
+ if ($birthday) {
+ XML::addElement($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`,
+ $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']));
+ intval($owner['uid'])
+ );
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::addElement($doc, $author, "poco:displayName", $profile["name"]);
+ XML::addElement($doc, $author, "poco:updated", $namdate);
if (trim($profile["dob"]) > '0001-01-01') {
- xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
+ XML::addElement($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::addElement($doc, $author, "poco:note", $profile["about"]);
+ XML::addElement($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::addElement($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::addElement($doc, $urls, "poco:type", "homepage");
+ XML::addElement($doc, $urls, "poco:value", $profile["homepage"]);
+ XML::addElement($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::addElement($doc, $author, "poco:tags", trim($keyword));
}
-
}
if (trim($profile["xmpp"]) != "") {
$ims = $doc->createElement("poco:ims");
- 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");
+ XML::addElement($doc, $ims, "poco:type", "xmpp");
+ XML::addElement($doc, $ims, "poco:value", $profile["xmpp"]);
+ XML::addElement($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::addElement($doc, $element, "poco:formatted", Profile::formatLocation($profile));
if (trim($profile["locality"]) != "") {
- xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
+ XML::addElement($doc, $element, "poco:locality", $profile["locality"]);
}
if (trim($profile["region"]) != "") {
- xml::add_element($doc, $element, "poco:region", $profile["region"]);
+ XML::addElement($doc, $element, "poco:region", $profile["region"]);
}
if (trim($profile["country-name"]) != "") {
- xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
+ XML::addElement($doc, $element, "poco:country", $profile["country-name"]);
}
$author->appendChild($element);
@@ -710,22 +733,22 @@ class DFRN {
/**
* @brief Adds the author elements in the "entry" elements of the DFRN protocol
*
- * @param object $doc XML document
- * @param string $element Element name for the author
+ * @param object $doc XML document
+ * @param string $element Element name for the author
* @param string $contact_url Link of the contact
- * @param array $items Item elements
+ * @param array $item Item elements
*
* @return object XML author object
* @todo Add type-hints
*/
- private static function add_entry_author($doc, $element, $contact_url, $item) {
-
- $contact = get_contact_details_by_url($contact_url, $item["uid"]);
+ private static function addEntryAuthor($doc, $element, $contact_url, $item)
+ {
+ $contact = Contact::getDetailsByURL($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::addElement($doc, $author, "name", $contact["name"]);
+ XML::addElement($doc, $author, "uri", $contact["url"]);
+ XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
/// @Todo
/// - Check real image type and image size
@@ -736,7 +759,7 @@ class DFRN {
"media:width" => 80,
"media:height" => 80,
"href" => $contact["photo"]);
- xml::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
$attributes = array(
"rel" => "avatar",
@@ -744,7 +767,7 @@ class DFRN {
"media:width" => 80,
"media:height" => 80,
"href" => $contact["photo"]);
- xml::add_element($doc, $author, "link", "", $attributes);
+ XML::addElement($doc, $author, "link", "", $attributes);
return $author;
}
@@ -752,15 +775,15 @@ class DFRN {
/**
* @brief Adds the activity elements
*
- * @param object $doc XML document
- * @param string $element Element name for the activity
+ * @param object $doc XML document
+ * @param string $element Element name for the activity
* @param string $activity activity value
*
* @return object XML activity object
* @todo Add type-hints
*/
- private static function create_activity($doc, $element, $activity) {
-
+ private static function createActivity($doc, $element, $activity)
+ {
if ($activity) {
$entry = $doc->createElement($element);
@@ -769,13 +792,13 @@ class DFRN {
return false;
}
if ($r->type) {
- xml::add_element($doc, $entry, "activity:object-type", $r->type);
+ XML::addElement($doc, $entry, "activity:object-type", $r->type);
}
if ($r->id) {
- xml::add_element($doc, $entry, "id", $r->id);
+ XML::addElement($doc, $entry, "id", $r->id);
}
if ($r->title) {
- xml::add_element($doc, $entry, "title", $r->title);
+ XML::addElement($doc, $entry, "title", $r->title);
}
if ($r->link) {
@@ -789,21 +812,21 @@ class DFRN {
// 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) {
+ 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::addElement($doc, $entry, "link", "", $attributes);
}
}
} else {
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
- xml::add_element($doc, $entry, "link", "", $attributes);
+ XML::addElement($doc, $entry, "link", "", $attributes);
}
}
if ($r->content) {
- xml::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+ XML::addElement($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
}
return $entry;
@@ -815,19 +838,20 @@ class DFRN {
/**
* @brief Adds the elements for attachments
*
- * @param object $doc XML document
+ * @param object $doc XML document
* @param object $root XML root
- * @param array $item Item element
+ * @param array $item Item element
*
* @return object XML attachment object
* @todo Add type-hints
*/
- private static function get_attachment($doc, $root, $item) {
- $arr = explode('[/attach],',$item['attach']);
+ private static function getAttachment($doc, $root, $item)
+ {
+ $arr = explode('[/attach],', $item['attach']);
if (count($arr)) {
foreach ($arr as $r) {
$matches = false;
- $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
+ $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
$attributes = array("rel" => "enclosure",
"href" => $matches[1],
@@ -841,7 +865,7 @@ class DFRN {
$attributes["title"] = trim($matches[4]);
}
- xml::add_element($doc, $root, "link", "", $attributes);
+ XML::addElement($doc, $root, "link", "", $attributes);
}
}
}
@@ -850,19 +874,19 @@ class DFRN {
/**
* @brief Adds the "entry" elements for the DFRN protocol
*
- * @param object $doc XML document
- * @param string $type "text" or "html"
- * @param array $item Item element
- * @param array $owner Owner record
- * @param bool $comment Trigger the sending of the "comment" element
- * @param int $cid Contact ID of the recipient
- * @param bool $single If set, the entry is created as an XML document with a single "entry" element
+ * @param object $doc XML document
+ * @param string $type "text" or "html"
+ * @param array $item Item element
+ * @param array $owner Owner record
+ * @param bool $comment Trigger the sending of the "comment" element
+ * @param int $cid Contact ID of the recipient
+ * @param bool $single If set, the entry is created as an XML document with a single "entry" element
*
* @return object XML entry object
* @todo Add type-hints
*/
- private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false) {
-
+ private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
+ {
$mentioned = array();
if (!$item['parent']) {
@@ -870,8 +894,8 @@ 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);
+ $attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME));
+ return XML::createElement($doc, "at:deleted-entry", "", $attributes);
}
if (!$single) {
@@ -892,7 +916,7 @@ class DFRN {
}
if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
- $body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
+ $body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
} else {
$body = $item['body'];
}
@@ -910,10 +934,10 @@ class DFRN {
$htmlbody = bbcode($htmlbody, false, false, 7);
}
- $author = self::add_entry_author($doc, "author", $item["author-link"], $item);
+ $author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
$entry->appendChild($author);
- $dfrnowner = self::add_entry_author($doc, "dfrn:owner", $item["owner-link"], $item);
+ $dfrnowner = self::addEntryAuthor($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']))) {
@@ -922,7 +946,7 @@ class DFRN {
$attributes = array("ref" => $parent_item, "type" => "text/html",
"href" => $parent[0]['plink'],
"dfrn:diaspora_guid" => $parent[0]['guid']);
- xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+ XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
}
// Add conversation data. This is used for OStatus
@@ -945,80 +969,86 @@ class DFRN {
"href" => $conversation_href,
"ref" => $conversation_uri);
- xml::add_element($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
+ XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
- xml::add_element($doc, $entry, "id", $item["uri"]);
- xml::add_element($doc, $entry, "title", $item["title"]);
+ XML::addElement($doc, $entry, "id", $item["uri"]);
+ XML::addElement($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::addElement($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"] . "+00:00", ATOM_TIME));
+ XML::addElement($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::addElement($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::addElement($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",
- "href" => System::baseUrl()."/display/".$item["guid"]));
+ XML::addElement(
+ $doc,
+ $entry,
+ "link",
+ "",
+ array("rel" => "alternate", "type" => "text/html",
+ "href" => System::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::addElement($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
}
if ($item['location']) {
- xml::add_element($doc, $entry, "dfrn:location", $item['location']);
+ XML::addElement($doc, $entry, "dfrn:location", $item['location']);
}
if ($item['coord']) {
- xml::add_element($doc, $entry, "georss:point", $item['coord']);
+ XML::addElement($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::addElement($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
}
if ($item['extid']) {
- xml::add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ XML::addElement($doc, $entry, "dfrn:extid", $item['extid']);
}
if ($item['bookmark']) {
- xml::add_element($doc, $entry, "dfrn:bookmark", "true");
+ XML::addElement($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::addElement($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
}
- xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
+ XML::addElement($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::addElement($doc, $entry, "dfrn:diaspora_signature", $sign);
}
- xml::add_element($doc, $entry, "activity:verb", construct_verb($item));
+ XML::addElement($doc, $entry, "activity:verb", construct_verb($item));
if ($item['object-type'] != "") {
- xml::add_element($doc, $entry, "activity:object-type", $item['object-type']);
+ XML::addElement($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::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
} else {
- xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
}
- $actobj = self::create_activity($doc, "activity:object", $item['object']);
+ $actobj = self::createActivity($doc, "activity:object", $item['object']);
if ($actobj) {
$entry->appendChild($actobj);
}
- $actarg = self::create_activity($doc, "activity:target", $item['target']);
+ $actarg = self::createActivity($doc, "activity:target", $item['target']);
if ($actarg) {
$entry->appendChild($actarg);
}
@@ -1028,7 +1058,7 @@ class DFRN {
if (count($tags)) {
foreach ($tags as $t) {
if (($type != 'html') || ($t[0] != "@")) {
- xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+ XML::addElement($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
}
}
}
@@ -1041,23 +1071,37 @@ class DFRN {
}
}
- foreach ($mentioned AS $mention) {
- $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
+ foreach ($mentioned as $mention) {
+ $r = q(
+ "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
- dbesc(normalise_link($mention)));
+ dbesc(normalise_link($mention))
+ );
if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
- xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
- "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
- "href" => $mention));
+ XML::addElement(
+ $doc,
+ $entry,
+ "link",
+ "",
+ array("rel" => "mentioned",
+ "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
+ "href" => $mention)
+ );
} else {
- xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
- "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
- "href" => $mention));
+ XML::addElement(
+ $doc,
+ $entry,
+ "link",
+ "",
+ array("rel" => "mentioned",
+ "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+ "href" => $mention)
+ );
}
}
- self::get_attachment($doc, $entry, $item);
+ self::getAttachment($doc, $entry, $item);
return $entry;
}
@@ -1066,11 +1110,12 @@ class DFRN {
* @brief encrypts data via AES
*
* @param string $data The data that is to be encrypted
- * @param string $key The AES key
+ * @param string $key The AES key
*
* @return string encrypted data
*/
- private static function aes_encrypt($data, $key) {
+ private static function aesEncrypt($data, $key)
+ {
return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
@@ -1078,27 +1123,28 @@ class DFRN {
* @brief decrypts data via AES
*
* @param string $encrypted The encrypted data
- * @param string $key The AES key
+ * @param string $key The AES key
*
* @return string decrypted data
*/
- public static function aes_decrypt($encrypted, $key) {
+ public static function aesDecrypt($encrypted, $key)
+ {
return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
}
/**
* @brief Delivers the atom content to the contacts
*
- * @param array $owner Owner record
- * @param array $contactr Contact record of the receiver
- * @param string $atom Content that will be transmitted
- * @param bool $dissolve (to be documented)
+ * @param array $owner Owner record
+ * @param array $contact Contact record of the receiver
+ * @param string $atom Content that will be transmitted
+ * @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) {
-
+ public static function deliver($owner, $contact, $atom, $dissolve = false)
+ {
$a = get_app();
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@@ -1115,7 +1161,7 @@ class DFRN {
logger("Local rino version: ". $rino, LOGGER_DEBUG);
- $ssl_val = intval(Config::get('system','ssl_policy'));
+ $ssl_val = intval(Config::get('system', 'ssl_policy'));
$ssl_policy = '';
switch ($ssl_val) {
@@ -1154,7 +1200,7 @@ class DFRN {
return 3;
}
- if (strpos($xml,'1','0',$atom);
+ $postvars['data'] = str_replace('1', '0', $atom);
$postvars['perm'] = 'r';
}
@@ -1244,31 +1293,31 @@ class DFRN {
case 1:
// Deprecated rino version!
$key = openssl_random_pseudo_bytes(16);
- $data = self::aes_encrypt($postvars['data'], $key);
+ $data = self::aesEncrypt($postvars['data'], $key);
break;
case 2:
// RINO 2 based on php-encryption
try {
- $key = Crypto::createNewRandomKey();
- } catch (CryptoTestFailed $ex) {
+ $key = \Crypto::CreateNewRandomKey();
+ } catch (\CryptoTestFailedException $ex) {
logger('Cannot safely create a key');
return -4;
- } catch (CannotPerformOperation $ex) {
+ } catch (\CannotPerformOperationException $ex) {
logger('Cannot safely create a key');
return -5;
}
try {
- $data = Crypto::encrypt($postvars['data'], $key);
- } catch (CryptoTestFailed $ex) {
+ $data = \Crypto::Encrypt($postvars['data'], $key);
+ } catch (\CryptoTestFailedException $ex) {
logger('Cannot safely perform encryption');
return -6;
- } catch (CannotPerformOperation $ex) {
+ } catch (\CannotPerformOperationException $ex) {
logger('Cannot safely perform encryption');
return -7;
}
break;
default:
- logger("rino: invalid requested verision '$rino_remote_version'");
+ logger("rino: invalid requested version '$rino_remote_version'");
return -8;
}
@@ -1280,20 +1329,19 @@ class DFRN {
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']);
+ || ($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 {
- openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+ openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
}
-
} else {
if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
- openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+ openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
} else {
- openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+ openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
}
-
}
logger('md5 rawkey ' . md5($postvars['key']));
@@ -1302,7 +1350,7 @@ class DFRN {
}
- logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
+ logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
$xml = post_url($contact['notify'], $postvars);
@@ -1313,11 +1361,11 @@ class DFRN {
return -9; // timed out
}
- if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) {
+ 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);
+ Contact::unmarkForArchival($contact);
}
$res = parse_xml_string($xml);
@@ -1345,18 +1392,21 @@ class DFRN {
/**
* @brief Add new birthday event for this person
*
- * @param array $contact Contact record
+ * @param array $contact Contact record
* @param string $birthday Birthday of the contact
+ * @return void
* @todo Add array type-hint for $contact
*/
- private static function birthday_event($contact, $birthday) {
-
+ private static function birthdayEvent($contact, $birthday)
+ {
// Check for duplicates
- $r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
+ $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"));
+ dbesc(datetime_convert("UTC", "UTC", $birthday)),
+ dbesc("birthday")
+ );
if (DBM::is_result($r)) {
return;
@@ -1365,16 +1415,17 @@ class DFRN {
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]") ;
+ $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`)
+ $r = q(
+ "INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
intval($contact["uid"]),
intval($contact["id"]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
- dbesc(datetime_convert("UTC","UTC", $birthday)),
- dbesc(datetime_convert("UTC","UTC", $birthday." + 1 day ")),
+ dbesc(datetime_convert("UTC", "UTC", $birthday)),
+ dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")),
dbesc($bdtext),
dbesc($bdtext2),
dbesc("birthday")
@@ -1384,25 +1435,30 @@ class DFRN {
/**
* @brief Fetch the author data from head or entry items
*
- * @param object $xpath XPath object
- * @param object $context In which context should the data be searched
- * @param array $importer Record of the importer user mixed with contact of the content
- * @param string $element Element name from which the data is fetched
- * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
+ * @param object $xpath XPath object
+ * @param object $context In which context should the data be searched
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @param string $element Element name from which the data is fetched
+ * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
+ * @param string $xml optional, default empty
*
- * @return Returns an array with relevant data of the author
+ * @return array Relevant data of the author
* @todo Find good type-hints for all parameter
*/
- private static 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`,
+ $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));
+ intval($importer["uid"]),
+ dbesc(normalise_link($author["link"])),
+ dbesc(NETWORK_STATUSNET)
+ );
if (DBM::is_result($r)) {
$contact = $r[0];
@@ -1422,10 +1478,10 @@ class DFRN {
$avatarlist = array();
/// @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) {
+ foreach ($avatar->attributes as $attributes) {
/// @TODO Rewrite these similar if () to one switch
if ($attributes->name == "href") {
$href = $attributes->textContent;
@@ -1453,14 +1509,14 @@ class DFRN {
// 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) {
+ 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) {
+ foreach ($link_element->attributes as $attributes) {
if ($attributes->name == "updated") {
$poco["uri-date"] = $attributes->textContent;
}
@@ -1519,7 +1575,7 @@ class DFRN {
// 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;
}
@@ -1556,12 +1612,12 @@ class DFRN {
$contact = array_merge($contact, $poco);
if ($old_bdyear != $contact["bdyear"]) {
- self::birthday_event($contact, $birthday);
+ self::birthdayEvent($contact, $birthday);
}
// Get all field names
$fields = array();
- foreach ($r[0] AS $field => $data) {
+ foreach ($r[0] as $field => $data) {
$fields[$field] = $data;
}
@@ -1574,14 +1630,14 @@ class DFRN {
// 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 . "'. 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 . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
$update = true;
@@ -1591,19 +1647,25 @@ class DFRN {
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',
+ q(
+ "UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%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["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])),
- intval($contact["id"]), dbesc($contact["network"]));
+ intval($contact["id"]), dbesc($contact["network"])
+ );
}
- update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
- (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
+ Contact::updateAvatar(
+ $author["avatar"],
+ $importer["uid"],
+ $contact["id"],
+ (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))
+ );
/*
* The generation is a sign for the reliability of the provided data.
@@ -1616,9 +1678,9 @@ class DFRN {
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
- $gcid = update_gcontact($poco);
+ $gcid = GContact::update($poco);
- link_gcontact($gcid, $importer["uid"], $contact["id"]);
+ GContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);
@@ -1627,14 +1689,15 @@ class DFRN {
/**
* @brief Transforms activity objects into an XML string
*
- * @param object $xpath XPath object
+ * @param object $xpath XPath object
* @param object $activity Activity object
- * @param text $element element name
+ * @param string $element element name
*
* @return string XML string
* @todo Find good type-hints for all parameter
*/
- private static function transform_activity($xpath, $activity, $element) {
+ private static function transformActivity($xpath, $activity, $element)
+ {
if (!is_object($activity)) {
return "";
}
@@ -1645,7 +1708,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::addElement($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0);
if (is_object($id)) {
@@ -1659,7 +1722,7 @@ class DFRN {
$links = $xpath->query("atom:link", $activity);
if (is_object($links)) {
- foreach ($links AS $link) {
+ foreach ($links as $link) {
$obj_element->appendChild($obj_doc->importNode($link, true));
}
}
@@ -1681,13 +1744,14 @@ class DFRN {
/**
* @brief Processes the mail elements
*
- * @param object $xpath XPath object
- * @param object $mail mail elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param object $xpath XPath object
+ * @param object $mail mail elements
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @return void
* @todo Find good type-hints for all parameter
*/
- private static function process_mail($xpath, $mail, $importer) {
-
+ private static function processMail($xpath, $mail, $importer)
+ {
logger("Processing mails");
/// @TODO Rewrite this to one statement
@@ -1732,12 +1796,14 @@ class DFRN {
/**
* @brief Processes the suggestion elements
*
- * @param object $xpath XPath object
+ * @param object $xpath XPath object
* @param object $suggestion suggestion elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @return boolean
* @todo Find good type-hints for all parameter
*/
- private static function process_suggestion($xpath, $suggestion, $importer) {
+ private static function processSuggestion($xpath, $suggestion, $importer)
+ {
$a = get_app();
logger("Processing suggestions");
@@ -1754,7 +1820,8 @@ class DFRN {
// Does our member already have a friend matching this description?
- $r = q("SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc($suggest["name"]),
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
@@ -1774,7 +1841,8 @@ class DFRN {
// Do we already have an fcontact record for this person?
$fid = 0;
- $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
@@ -1783,7 +1851,8 @@ class DFRN {
$fid = $r[0]["id"];
// OK, we do. Do we already have an introduction for this person ?
- $r = q("SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
intval($suggest["uid"]),
intval($fid)
);
@@ -1800,14 +1869,16 @@ class DFRN {
}
}
if (!$fid) {
- $r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
+ $r = q(
+ "INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
dbesc($suggest["name"]),
dbesc($suggest["url"]),
dbesc($suggest["photo"]),
dbesc($suggest["request"])
);
}
- $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
@@ -1826,7 +1897,8 @@ class DFRN {
$hash = random_string();
- $r = q("INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
+ $r = q(
+ "INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
VALUES(%d, %d, %d, '%s', '%s', '%s', %d)",
intval($suggest["uid"]),
intval($fid),
@@ -1837,36 +1909,37 @@ class DFRN {
intval(0)
);
- notification(array(
- "type" => NOTIFY_SUGGEST,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["importer_uid"],
- "item" => $suggest,
- "link" => System::baseUrl()."/notifications/intros",
- "source_name" => $importer["name"],
- "source_link" => $importer["url"],
- "source_photo" => $importer["photo"],
- "verb" => ACTIVITY_REQ_FRIEND,
- "otype" => "intro"
- ));
+ notification(
+ array(
+ "type" => NOTIFY_SUGGEST,
+ "notify_flags" => $importer["notify-flags"],
+ "language" => $importer["language"],
+ "to_name" => $importer["username"],
+ "to_email" => $importer["email"],
+ "uid" => $importer["importer_uid"],
+ "item" => $suggest,
+ "link" => System::baseUrl()."/notifications/intros",
+ "source_name" => $importer["name"],
+ "source_link" => $importer["url"],
+ "source_photo" => $importer["photo"],
+ "verb" => ACTIVITY_REQ_FRIEND,
+ "otype" => "intro")
+ );
return true;
-
}
/**
* @brief Processes the relocation elements
*
- * @param object $xpath XPath object
+ * @param object $xpath XPath object
* @param object $relocation relocation elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @return boolean
* @todo Find good type-hints for all parameter
*/
- private static function process_relocation($xpath, $relocation, $importer) {
-
+ private static function processRelocation($xpath, $relocation, $importer)
+ {
logger("Processing relocations");
/// @TODO Rewrite this to one statement
@@ -1895,9 +1968,11 @@ class DFRN {
}
// update contact
- $r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
+ $r = q(
+ "SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]),
- intval($importer["importer_uid"]));
+ intval($importer["importer_uid"])
+ );
if (!DBM::is_result($r)) {
logger("Query failed to execute, no result returned in " . __FUNCTION__);
@@ -1909,7 +1984,8 @@ class DFRN {
// Update the gcontact entry
$relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
- $x = q("UPDATE `gcontact` SET
+ $x = q(
+ "UPDATE `gcontact` SET
`name` = '%s',
`photo` = '%s',
`url` = '%s',
@@ -1919,18 +1995,20 @@ class DFRN {
`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"])));
+ 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
+ $x = q(
+ "UPDATE `contact` SET
`name` = '%s',
`avatar` = '%s',
`url` = '%s',
@@ -1942,21 +2020,22 @@ class DFRN {
`poll` = '%s',
`site-pubkey` = '%s'
WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
- dbesc($relocate["name"]),
- dbesc($relocate["avatar"]),
- dbesc($relocate["url"]),
- dbesc(normalise_link($relocate["url"])),
- dbesc($relocate["addr"]),
- dbesc($relocate["request"]),
- dbesc($relocate["confirm"]),
- dbesc($relocate["notify"]),
- dbesc($relocate["poll"]),
- dbesc($relocate["sitepubkey"]),
- intval($importer["id"]),
- intval($importer["importer_uid"]),
- dbesc(normalise_link($old["url"])));
-
- update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
+ dbesc($relocate["name"]),
+ dbesc($relocate["avatar"]),
+ dbesc($relocate["url"]),
+ dbesc(normalise_link($relocate["url"])),
+ dbesc($relocate["addr"]),
+ dbesc($relocate["request"]),
+ dbesc($relocate["confirm"]),
+ dbesc($relocate["notify"]),
+ dbesc($relocate["poll"]),
+ dbesc($relocate["sitepubkey"]),
+ intval($importer["id"]),
+ intval($importer["importer_uid"]),
+ dbesc(normalise_link($old["url"]))
+ );
+
+ Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false) {
return false;
@@ -1970,20 +2049,27 @@ class DFRN {
//'owner-avatar' => array($old["photo"], $relocate["photo"]),
//'author-avatar' => array($old["photo"], $relocate["photo"]),
);
- foreach ($fields as $n=>$f) {
- $r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
- $n, dbesc($f[0]),
- intval($importer["importer_uid"]));
+ 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 (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"]));
+ $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;
- }
+ if ($x === false) {
+ return false;
+ }
}
}
@@ -1998,19 +2084,20 @@ class DFRN {
/**
* @brief Updates an item
*
- * @param array $current the current item record
- * @param array $item the new item record
- * @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?
+ * @param array $current the current item record
+ * @param array $item the new item record
+ * @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?
+ * @return mixed
* @todo set proper type-hints (array?)
*/
- private static function update_content($current, $item, $importer, $entrytype) {
+ private static function updateContent($current, $item, $importer, $entrytype)
+ {
$changed = false;
if (edited_timestamp_is_newer($current, $item)) {
-
// do not accept (ignore) an earlier edit than one we currently have.
- if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
+ if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
return false;
}
@@ -2027,18 +2114,20 @@ class DFRN {
$changed = true;
if ($entrytype == DFRN_REPLY_RC) {
- Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]);
+ Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $current["id"]);
}
}
// update last-child if it changes
if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
- $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
+ $r = q(
+ "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
intval($importer["importer_uid"])
);
- $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
+ $r = q(
+ "UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
intval($item["last-child"]),
dbesc(datetime_convert()),
dbesc($item["uri"]),
@@ -2052,12 +2141,13 @@ class DFRN {
* @brief Detects the entry type of the item
*
* @param array $importer Record of the importer user mixed with contact of the content
- * @param array $item the new item record
+ * @param array $item the new item record
*
* @return int Is it a toplevel entry, a comment or a relayed comment?
* @todo set proper type-hints (array?)
*/
- private static function get_entry_type($importer, $item) {
+ private static function getEntryType($importer, $item)
+ {
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
@@ -2074,13 +2164,15 @@ class DFRN {
$is_a_remote_action = false;
- $r = q("SELECT `item`.`parent-uri` FROM `item`
+ $r = q(
+ "SELECT `item`.`parent-uri` FROM `item`
WHERE `item`.`uri` = '%s'
LIMIT 1",
dbesc($item["parent-uri"])
);
if (DBM::is_result($r)) {
- $r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
+ $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')
AND `item`.`uid` = %d
@@ -2117,26 +2209,26 @@ class DFRN {
} else {
return DFRN_TOP_LEVEL;
}
-
}
/**
* @brief Send a "poke"
*
- * @param array $item the new item record
- * @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
+ * @param array $item the new item record
+ * @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
+ * @return void
* @todo set proper type-hints (array?)
*/
- private static function do_poke($item, $importer, $posted_id) {
- $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
+ private static function doPoke($item, $importer, $posted_id)
+ {
+ $verb = urldecode(substr($item["verb"], strpos($item["verb"], "#")+1));
if (!$verb) {
return;
}
- $xo = parse_xml_string($item["object"],false);
+ $xo = parse_xml_string($item["object"], false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
-
// somebody was poked/prodded. Was it me?
foreach ($xo->link as $l) {
$atts = $l->attributes();
@@ -2150,9 +2242,9 @@ class DFRN {
}
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
-
// send a notification
- notification(array(
+ notification(
+ array(
"type" => NOTIFY_POKE,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
@@ -2163,13 +2255,13 @@ class DFRN {
"link" => System::baseUrl()."/display/".urlencode(get_item_guid($posted_id)),
"source_name" => stripslashes($item["author-name"]),
"source_link" => $item["author-link"],
- "source_photo" => ((link_compare($item["author-link"],$importer["url"]))
+ "source_photo" => ((link_compare($item["author-link"], $importer["url"]))
? $importer["thumb"] : $item["author-avatar"]),
"verb" => $item["verb"],
"otype" => "person",
"activity" => $verb,
- "parent" => $item["parent"]
- ));
+ "parent" => $item["parent"])
+ );
}
}
}
@@ -2177,16 +2269,16 @@ 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"?
+ * @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?
* @todo set proper type-hints (array?)
*/
- private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
-
+ private static function processVerbs($entrytype, $importer, &$item, &$is_like)
+ {
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
if (($entrytype == DFRN_TOP_LEVEL)) {
@@ -2203,7 +2295,7 @@ class DFRN {
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;
@@ -2213,7 +2305,7 @@ class DFRN {
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;
@@ -2223,13 +2315,15 @@ class DFRN {
|| ($item["verb"] == ACTIVITY_DISLIKE)
|| ($item["verb"] == ACTIVITY_ATTEND)
|| ($item["verb"] == ACTIVITY_ATTENDNO)
- || ($item["verb"] == ACTIVITY_ATTENDMAYBE)) {
+ || ($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",
+ $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"]),
@@ -2239,7 +2333,8 @@ class DFRN {
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",
+ $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"]),
@@ -2253,12 +2348,12 @@ class DFRN {
}
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);
+ $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",
+ $r = q(
+ "SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
@@ -2270,8 +2365,9 @@ class DFRN {
// 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",
+ 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"])
);
@@ -2288,17 +2384,19 @@ class DFRN {
* @brief Processes the link elements
*
* @param object $links link elements
- * @param array $item the item record
+ * @param array $item the item record
+ * @return void
* @todo set proper type-hints
*/
- private static function parse_links($links, &$item) {
+ private static function parseLinks($links, &$item)
+ {
$rel = "";
$href = "";
$type = "";
$length = "0";
$title = "";
- foreach ($links AS $link) {
- foreach ($link->attributes AS $attributes) {
+ foreach ($links as $link) {
+ foreach ($link->attributes as $attributes) {
/// @TODO Rewrite these repeated (same) if () statements to a switch()
if ($attributes->name == "href") {
$href = $attributes->textContent;
@@ -2337,14 +2435,16 @@ class DFRN {
/**
* @brief Processes the entry elements which contain the items and comments
*
- * @param array $header Array of the header elements that always stay the same
- * @param object $xpath XPath object
- * @param object $entry entry elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $header Array of the header elements that always stay the same
+ * @param object $xpath XPath object
+ * @param object $entry entry elements
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @param object $xml xml
+ * @return void
* @todo Add type-hints
*/
- private static function process_entry($header, $xpath, $entry, $importer, $xml) {
-
+ private static function processEntry($header, $xpath, $entry, $importer, $xml)
+ {
logger("Processing entries");
$item = $header;
@@ -2358,14 +2458,16 @@ class DFRN {
$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",
+ $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) && edited_timestamp_is_newer($current[0], $item) &&
- (datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
+ if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item)
+ && (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"])
+ ) {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
return;
}
@@ -2389,28 +2491,28 @@ class DFRN {
$item["created"] = $xpath->query("atom:published/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"]);
+ $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''), $item["body"]);
// make sure nobody is trying to sneak some html tags by us
$item["body"] = notags(base64url_decode($item["body"]));
$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)) {
-
- $item['body'] = reltoabs($item['body'],$base_url);
+ if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
+ $base_url = get_app()->get_baseurl();
+ $item['body'] = reltoabs($item['body'], $base_url);
$item['body'] = html2bb_video($item['body']);
- $item['body'] = oembed_html2bbcode($item['body']);
+ $item['body'] = OEmbed::HTML2BBCode($item['body']);
- $config = HTMLPurifier_Config::createDefault();
+ $config = \HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
// we shouldn't need a whitelist, because the bbcode converter
// will strip out any unsupported tags.
- $purifier = new HTMLPurifier($config);
+ $purifier = new \HTMLPurifier($config);
$item['body'] = $purifier->purify($item['body']);
$item['body'] = @html2bbcode($item['body']);
@@ -2439,7 +2541,7 @@ class DFRN {
$notice_info = $xpath->query("statusnet:notice_info", $entry);
if ($notice_info && ($notice_info->length > 0)) {
- foreach ($notice_info->item(0)->attributes AS $attributes) {
+ foreach ($notice_info->item(0)->attributes as $attributes) {
if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
}
@@ -2461,7 +2563,7 @@ class DFRN {
}
$object = $xpath->query("activity:object", $entry)->item(0);
- $item["object"] = self::transform_activity($xpath, $object, "object");
+ $item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false);
@@ -2471,14 +2573,14 @@ class DFRN {
}
$target = $xpath->query("activity:target", $entry)->item(0);
- $item["target"] = self::transform_activity($xpath, $target, "target");
+ $item["target"] = self::transformActivity($xpath, $target, "target");
$categories = $xpath->query("atom:category", $entry);
if ($categories) {
- foreach ($categories AS $category) {
+ foreach ($categories as $category) {
$term = "";
$scheme = "";
- foreach ($category->attributes AS $attributes) {
+ foreach ($category->attributes as $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
}
@@ -2508,14 +2610,14 @@ class DFRN {
$links = $xpath->query("atom:link", $entry);
if ($links) {
- self::parse_links($links, $item);
+ self::parseLinks($links, $item);
}
$item['conversation-uri'] = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
- foreach ($conv->item(0)->attributes AS $attributes) {
+ foreach ($conv->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item['conversation-uri'] = $attributes->textContent;
}
@@ -2530,7 +2632,7 @@ class DFRN {
$inreplyto = $xpath->query("thr:in-reply-to", $entry);
if (is_object($inreplyto->item(0))) {
- foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
}
@@ -2538,7 +2640,7 @@ class DFRN {
}
// Get the type of the item (Top level post, reply or remote reply)
- $entrytype = self::get_entry_type($importer, $item);
+ $entrytype = self::getEntryType($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))) {
@@ -2595,7 +2697,8 @@ class DFRN {
$ev['private'] = $item['private'];
$ev["guid"] = $item["guid"];
- $r = q("SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item["uri"]),
intval($importer["uid"])
);
@@ -2610,14 +2713,14 @@ class DFRN {
}
}
- if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
- logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
+ if (!self::processVerbs($entrytype, $importer, $item, $is_like)) {
+ logger("Exiting because 'processVerbs' told us so", LOGGER_DEBUG);
return;
}
// Update content if 'updated' changes
if (DBM::is_result($current)) {
- if (self::update_content($r[0], $item, $importer, $entrytype)) {
+ if (self::updateContent($r[0], $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
} else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
@@ -2630,12 +2733,12 @@ class DFRN {
$parent = 0;
if ($posted_id) {
-
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
$item["id"] = $posted_id;
- $r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($posted_id),
intval($importer["importer_uid"])
);
@@ -2645,13 +2748,15 @@ class DFRN {
}
if (!$is_like) {
- $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
+ $r1 = q(
+ "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
intval($r[0]["parent"])
);
- $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
+ $r2 = q(
+ "UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
intval($posted_id)
@@ -2660,13 +2765,13 @@ class DFRN {
if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $posted_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "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.
@@ -2692,24 +2797,26 @@ class DFRN {
logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
- if (stristr($item["verb"],ACTIVITY_POKE))
- self::do_poke($item, $importer, $posted_id);
+ if (stristr($item["verb"], ACTIVITY_POKE)) {
+ self::doPoke($item, $importer, $posted_id);
+ }
}
}
/**
* @brief Deletes items
*
- * @param object $xpath XPath object
+ * @param object $xpath XPath object
* @param object $deletion deletion elements
- * @param array $importer Record of the importer user mixed with contact of the content
+ * @param array $importer Record of the importer user mixed with contact of the content
+ * @return void
* @todo set proper type-hints
*/
- private static function process_deletion($xpath, $deletion, $importer) {
-
+ private static function processDeletion($xpath, $deletion, $importer)
+ {
logger("Processing deletions");
- foreach ($deletion->attributes AS $attributes) {
+ foreach ($deletion->attributes as $attributes) {
if ($attributes->name == "ref") {
$uri = $attributes->textContent;
}
@@ -2728,20 +2835,20 @@ class DFRN {
}
/// @todo Only select the used fields
- $r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
- WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
- dbesc($uri),
- intval($importer["uid"]),
- intval($importer["id"])
- );
+ $r = q(
+ "SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
+ WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
+ dbesc($uri),
+ intval($importer["uid"]),
+ intval($importer["id"])
+ );
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 {
-
$item = $r[0];
- $entrytype = self::get_entry_type($importer, $item);
+ $entrytype = self::getEntryType($importer, $item);
if (!$item["deleted"]) {
logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
@@ -2755,17 +2862,16 @@ class DFRN {
}
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);
+ $xo = parse_xml_string($item["object"], false);
+ $xt = parse_xml_string($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
- $i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ $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 (DBM::is_result($i)) {
-
// For tags, the owner cannot remove the tag on the author's copy of the post.
$owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
@@ -2776,7 +2882,7 @@ class DFRN {
return;
}
if ($author_remove || $owner_remove) {
- $tags = explode(',',$i[0]["tag"]);
+ $tags = explode(',', $i[0]["tag"]);
$newtags = array();
if (count($tags)) {
foreach ($tags as $tag) {
@@ -2785,7 +2891,8 @@ class DFRN {
}
}
}
- q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
+ q(
+ "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc(implode(',', $newtags)),
intval($i[0]["id"])
);
@@ -2796,44 +2903,49 @@ class DFRN {
}
if ($entrytype == DFRN_TOP_LEVEL) {
- $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
+ $r = q(
+ "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
- dbesc($when),
- dbesc(datetime_convert()),
- dbesc($uri),
- intval($importer["uid"])
- );
+ dbesc($when),
+ dbesc(datetime_convert()),
+ dbesc($uri),
+ intval($importer["uid"])
+ );
create_tags_from_itemuri($uri, $importer["uid"]);
- create_files_from_itemuri($uri, $importer["uid"]);
+ Term::createFromItemURI($uri, $importer["uid"]);
update_thread_uri($uri, $importer["uid"]);
} else {
- $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
+ $r = q(
+ "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `uri` = '%s' AND `uid` IN (0, %d)",
- dbesc($when),
- dbesc(datetime_convert()),
- dbesc($uri),
- intval($importer["uid"])
- );
+ dbesc($when),
+ dbesc(datetime_convert()),
+ dbesc($uri),
+ intval($importer["uid"])
+ );
create_tags_from_itemuri($uri, $importer["uid"]);
- create_files_from_itemuri($uri, $importer["uid"]);
+ Term::createFromItemURI($uri, $importer["uid"]);
update_thread_uri($uri, $importer["importer_uid"]);
if ($item["last-child"]) {
// ensure that last-child is set in case the comment that had it just got wiped.
- q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
+ q(
+ "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
intval($item["uid"])
);
// who is the last child now?
- $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
+ $r = q(
+ "SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
ORDER BY `created` DESC LIMIT 1",
- dbesc($item["parent-uri"]),
- intval($importer["uid"])
+ dbesc($item["parent-uri"]),
+ intval($importer["uid"])
);
if (DBM::is_result($r)) {
- q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
+ q(
+ "UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
intval($r[0]["id"])
);
}
@@ -2842,7 +2954,7 @@ class DFRN {
if ($entrytype == DFRN_REPLY_RC) {
logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
}
}
}
@@ -2851,14 +2963,14 @@ class DFRN {
/**
* @brief Imports a DFRN message
*
- * @param text $xml The DFRN message
- * @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
+ * @param string $xml The DFRN message
+ * @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
* @return integer Import status
* @todo set proper type-hints
*/
- public static function import($xml, $importer, $sort_by_date = false) {
-
+ public static function import($xml, $importer, $sort_by_date = false)
+ {
if ($xml == "") {
return 400;
}
@@ -2866,7 +2978,7 @@ class DFRN {
$doc = new DOMDocument();
@$doc->loadXML($xml);
- $xpath = new DomXPath($doc);
+ $xpath = new DOMXPath($doc);
$xpath->registerNamespace("atom", NAMESPACE_ATOM1);
$xpath->registerNamespace("thr", NAMESPACE_THREAD);
$xpath->registerNamespace("at", NAMESPACE_TOMB);
@@ -2902,7 +3014,7 @@ class DFRN {
// 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);
+ $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
if ($accounttype != $importer["contact-type"]) {
dba::update('contact', array('contact-type' => $accounttype), array('id' => $importer["id"]));
@@ -2911,7 +3023,7 @@ class DFRN {
// 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);
+ $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
if ($forum != $importer["forum"]) {
$condition = array('`forum` != ? AND `id` = ?', $forum, $importer["id"]);
@@ -2920,8 +3032,8 @@ class DFRN {
// We are processing relocations even if we are ignoring a contact
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
- foreach ($relocations AS $relocation) {
- self::process_relocation($xpath, $relocation, $importer);
+ foreach ($relocations as $relocation) {
+ self::processRelocation($xpath, $relocation, $importer);
}
if ($importer["readonly"]) {
@@ -2932,29 +3044,29 @@ class DFRN {
}
$mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails AS $mail) {
- self::process_mail($xpath, $mail, $importer);
+ foreach ($mails as $mail) {
+ self::processMail($xpath, $mail, $importer);
}
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions AS $suggestion) {
- self::process_suggestion($xpath, $suggestion, $importer);
+ foreach ($suggestions as $suggestion) {
+ self::processSuggestion($xpath, $suggestion, $importer);
}
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
- foreach ($deletions AS $deletion) {
- self::process_deletion($xpath, $deletion, $importer);
+ foreach ($deletions as $deletion) {
+ self::processDeletion($xpath, $deletion, $importer);
}
if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry) {
- self::process_entry($header, $xpath, $entry, $importer, $xml);
+ foreach ($entries as $entry) {
+ self::processEntry($header, $xpath, $entry, $importer, $xml);
}
} else {
$newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry) {
+ foreach ($entries as $entry) {
$created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
$newentries[strtotime($created)] = $entry;
}
@@ -2962,11 +3074,101 @@ class DFRN {
// Now sort after the publishing date
ksort($newentries);
- foreach ($newentries AS $entry) {
- self::process_entry($header, $xpath, $entry, $importer, $xml);
+ foreach ($newentries as $entry) {
+ self::processEntry($header, $xpath, $entry, $importer, $xml);
}
}
logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
return 200;
}
+
+ /**
+ * @param App $a App
+ * @param string $contact_nick contact nickname
+ */
+ public static function autoRedir(App $a, $contact_nick)
+ {
+ // prevent looping
+ if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
+ return;
+ }
+
+ if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) {
+ return;
+ }
+
+ if (local_user()) {
+ // We need to find out if $contact_nick is a user on this hub, and if so, if I
+ // am a contact of that user. However, that user may have other contacts with the
+ // same nickname as me on other hubs or other networks. Exclude these by requiring
+ // that the contact have a local URL. I will be the only person with my nickname at
+ // this URL, so if a result is found, then I am a contact of the $contact_nick user.
+ //
+ // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
+
+ $baseurl = System::baseUrl();
+ $domain_st = strpos($baseurl, "://");
+ if ($domain_st === false) {
+ return;
+ }
+ $baseurl = substr($baseurl, $domain_st + 3);
+ $nurl = normalise_link($baseurl);
+
+ /// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
+ AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
+ dbesc($contact_nick),
+ dbesc($a->user['nickname']),
+ dbesc($baseurl),
+ dbesc($nurl)
+ );
+ if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
+ return;
+ }
+
+ $r = q("SELECT * FROM contact WHERE nick = '%s'
+ AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1",
+ dbesc($contact_nick),
+ dbesc(NETWORK_DFRN),
+ intval(local_user()),
+ dbesc($baseurl)
+ );
+ if (! DBM::is_result($r)) {
+ return;
+ }
+
+ $cid = $r[0]['id'];
+
+ $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+ if ($r[0]['duplex'] && $r[0]['issued-id']) {
+ $orig_id = $r[0]['issued-id'];
+ $dfrn_id = '1:' . $orig_id;
+ }
+ if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
+ $orig_id = $r[0]['dfrn-id'];
+ $dfrn_id = '0:' . $orig_id;
+ }
+
+ // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
+ // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
+
+ if (strlen($dfrn_id) < 3) {
+ return;
+ }
+
+ $sec = random_string();
+
+ dba::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
+
+ $url = curPageURL();
+
+ logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+ $dest = (($url) ? '&destination_url=' . $url : '');
+ goaway($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest);
+ }
+
+ return;
+ }
}