* https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
*/
+use Friendica\App;
+
require_once("include/Contact.php");
require_once("include/ostatus.php");
require_once("include/enotify.php");
* @param array $owner Owner record
*
* @return string DFRN entries
+ * @todo Add type-hints
*/
public static function entries($items,$owner) {
$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
- if(! count($items))
+ if (! count($items)) {
return trim($doc->saveXML());
+ }
- foreach($items as $item) {
+ foreach ($items as $item) {
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
$root->appendChild($entry);
}
$starred = false; // not yet implemented, possible security issues
$converse = false;
- if($public_feed && $a->argc > 2) {
- for($x = 2; $x < $a->argc; $x++) {
- if($a->argv[$x] == 'converse')
+ if ($public_feed && $a->argc > 2) {
+ for ($x = 2; $x < $a->argc; $x++) {
+ if ($a->argv[$x] == 'converse') {
$converse = true;
- if($a->argv[$x] == 'starred')
+ }
+ if ($a->argv[$x] == 'starred') {
$starred = true;
- if($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+ }
+ if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) {
$category = $a->argv[$x+1];
+ }
}
}
$sql_post_table = "";
- if(! $public_feed) {
+ if (! $public_feed) {
$sql_extra = '';
switch($direction) {
require_once('include/security.php');
$groups = init_groups_visitor($contact['id']);
- if(count($groups)) {
- for($x = 0; $x < count($groups); $x ++)
+ if (count($groups)) {
+ for ($x = 0; $x < count($groups); $x ++)
$groups[$x] = '<' . intval($groups[$x]) . '>' ;
$gs = implode('|', $groups);
- } else
+ } else {
$gs = '<<>>' ; // Impossible to match
+ }
$sql_extra = sprintf("
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
);
}
- if($public_feed)
+ if ($public_feed) {
$sort = 'DESC';
- else
+ } else {
$sort = 'ASC';
+ }
- if(! strlen($last_update))
+ if (! strlen($last_update)) {
$last_update = 'now -30 days';
+ }
- if(isset($category)) {
+ if (isset($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
//$sql_extra .= file_tag_file_query('item',$category,'category');
}
- if($public_feed) {
- if(! $converse)
+ if ($public_feed) {
+ if (! $converse) {
$sql_extra .= " AND `contact`.`self` = 1 ";
+ }
}
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
dbesc($sort)
);
- // Will check further below if this actually returned results.
- // We will provide an empty feed if that is the case.
+ /*
+ * Will check further below if this actually returned results.
+ * We will provide an empty feed if that is the case.
+ */
$items = $r;
$alternatelink = $owner['url'];
- if(isset($category))
+ if (isset($category)) {
$alternatelink .= "/category/".$category;
+ }
- if ($public_feed)
+ if ($public_feed) {
$author = "dfrn:owner";
- else
+ } else {
$author = "author";
+ }
$root = self::add_header($doc, $owner, $author, $alternatelink, true);
- // This hook can't work anymore
+ /// @TODO This hook can't work anymore
// call_hooks('atom_feed', $atom);
- if (!count($items) OR $onlyheader) {
+ if (!dbm::is_result($items) || $onlyheader) {
$atom = trim($doc->saveXML());
call_hooks('atom_feed_end', $atom);
return $atom;
}
- foreach($items as $item) {
+ foreach ($items as $item) {
// prevent private email from leaking.
- if($item['network'] == NETWORK_MAIL)
+ if ($item['network'] == NETWORK_MAIL) {
continue;
+ }
// public feeds get html, our own nodes use bbcode
- if($public_feed) {
+ if ($public_feed) {
$type = 'html';
// catch any email that's in a public conversation and make sure it doesn't leak
- if($item['private'])
+ if ($item['private']) {
continue;
- } else
+ }
+ } else {
$type = 'text';
+ }
$entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry);
return $atom;
}
+ /**
+ * @brief Generate an atom entry for a given item id
+ *
+ * @param int $item_id The item id
+ *
+ * @return string DFRN feed entry
+ */
+ public static function itemFeed($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`,
+ `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
+ FROM `item`
+ STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+ LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
+ WHERE `item`.`id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
+ AND `item`.`wall` AND NOT `item`.`private`",
+ intval($item_id)
+ );
+
+ if (!dbm::is_result($r)) {
+ killme();
+ }
+
+ $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();
+ }
+
+ $owner = $r[0];
+
+ $doc = new DOMDocument('1.0', 'utf-8');
+ $doc->formatOutput = true;
+
+ $alternatelink = $owner['url'];
+
+ $root = self::add_header($doc, $owner, 'dfrn:owner', $alternatelink, true);
+
+ $type = 'html';
+
+ $entry = self::entry($doc, $type, $item, $owner, true);
+ $root->appendChild($entry);
+
+ $atom = trim($doc->saveXML());
+ return $atom;
+ }
+
/**
* @brief Create XML text for DFRN mails
*
* @param array $owner Owner record
*
* @return string DFRN mail
+ * @todo Add type-hints
*/
public static function mail($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
* @param array $owner Owner record
*
* @return string DFRN suggestions
+ * @todo Add type-hints
*/
public static function fsuggest($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
* @param int $uid User ID
*
* @return string DFRN relocations
+ * @todo Add type-hints
*/
public static function relocate($owner, $uid) {
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = get_config('system','site_pubkey');
- if(! $pubkey) {
+ if (! $pubkey) {
$res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']);
$photos = array();
$ext = Photo::supportedTypes();
- foreach($rp as $p)
- $photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+ foreach ($rp as $p) {
+ $photos[$p['scale']] = App::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+ }
unset($rp, $ext);
* @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) {
- if ($alternatelink == "")
+ if ($alternatelink == "") {
$alternatelink = $owner['url'];
+ }
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
$doc->appendChild($root);
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
- xml::add_element($doc, $root, "id", app::get_baseurl()."/profile/".$owner["nick"]);
+ xml::add_element($doc, $root, "id", App::get_baseurl()."/profile/".$owner["nick"]);
xml::add_element($doc, $root, "title", $owner["name"]);
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
ostatus::hublinks($doc, $root);
- $attributes = array("rel" => "salmon", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+ $attributes = array("rel" => "salmon", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
xml::add_element($doc, $root, "link", "", $attributes);
- $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+ $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
xml::add_element($doc, $root, "link", "", $attributes);
- $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => app::get_baseurl()."/salmon/".$owner["nick"]);
+ $attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
xml::add_element($doc, $root, "link", "", $attributes);
}
// For backward compatibility we keep this element
- if ($owner['page-flags'] == PAGE_COMMUNITY)
+ if ($owner['page-flags'] == PAGE_COMMUNITY) {
xml::add_element($doc, $root, "dfrn:community", 1);
+ }
// The former element is replaced by this one
xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
* @param string $authorelement Element name for the author
*
* @return object XML author object
+ * @todo Add type-hints
*/
private static function add_author($doc, $owner, $authorelement, $public) {
$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
intval($owner['uid']));
- if ($r)
+ if (dbm::is_result($r)) {
$hidewall = true;
- else
+ } else {
$hidewall = false;
+ }
$author = $doc->createElement($authorelement);
$uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
$picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
- if (!$public OR !$hidewall)
+ $attributes = array();
+
+ if (!$public || !$hidewall) {
$attributes = array("dfrn:updated" => $namdate);
- else
- $attributes = array();
+ }
xml::add_element($doc, $author, "name", $owner["name"], $attributes);
- xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
+ xml::add_element($doc, $author, "uri", App::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
- if (!$public OR !$hidewall)
+ if (!$public || !$hidewall) {
$attributes["dfrn:updated"] = $picdate;
+ }
xml::add_element($doc, $author, "link", "", $attributes);
$attributes["rel"] = "avatar";
xml::add_element($doc, $author, "link", "", $attributes);
- if ($hidewall)
+ if ($hidewall) {
xml::add_element($doc, $author, "dfrn:hide", "true");
+ }
// The following fields will only be generated if the data isn't meant for a public feed
- if ($public)
+ if ($public) {
return $author;
+ }
$birthday = feed_birthday($owner['uid'], $owner['timezone']);
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
intval($owner['uid']));
- if ($r) {
+ if (dbm::is_result($r)) {
$profile = $r[0];
xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
xml::add_element($doc, $author, "poco:updated", $namdate);
- if (trim($profile["dob"]) != "0000-00-00")
+ if (trim($profile["dob"]) > '0001-01-01') {
xml::add_element($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
+ }
xml::add_element($doc, $author, "poco:note", $profile["about"]);
xml::add_element($doc, $author, "poco:preferredUsername", $profile["nickname"]);
if (trim($profile["pub_keywords"]) != "") {
$keywords = explode(",", $profile["pub_keywords"]);
- foreach ($keywords AS $keyword)
+ foreach ($keywords AS $keyword) {
xml::add_element($doc, $author, "poco:tags", trim($keyword));
+ }
}
xml::add_element($doc, $element, "poco:formatted", formatted_location($profile));
- if (trim($profile["locality"]) != "")
+ if (trim($profile["locality"]) != "") {
xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
+ }
- if (trim($profile["region"]) != "")
+ if (trim($profile["region"]) != "") {
xml::add_element($doc, $element, "poco:region", $profile["region"]);
+ }
- if (trim($profile["country-name"]) != "")
+ if (trim($profile["country-name"]) != "") {
xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
+ }
$author->appendChild($element);
}
* @param array $items Item elements
*
* @return object XML author object
+ * @todo Add type-hints
*/
private static function add_entry_author($doc, $element, $contact_url, $item) {
* @param string $activity activity value
*
* @return object XML activity object
+ * @todo Add type-hints
*/
private static function create_activity($doc, $element, $activity) {
- if($activity) {
+ if ($activity) {
$entry = $doc->createElement($element);
$r = parse_xml_string($activity, false);
}
if ($r->link) {
- if (substr($r->link,0,1) == '<') {
- if (strstr($r->link,'&') && (! strstr($r->link,'&'))) {
- $r->link = str_replace('&','&', $r->link);
+ if (substr($r->link, 0, 1) == '<') {
+ if (strstr($r->link, '&') && (! strstr($r->link, '&'))) {
+ $r->link = str_replace('&', '&', $r->link);
}
- $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
+ $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
// XML does need a single element as root element so we add a dummy element here
- $data = parse_xml_string("<dummy>".$r->link."</dummy>", false);
+ $data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
if (is_object($data)) {
foreach ($data->link AS $link) {
$attributes = array();
* @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']);
* @param int $cid Contact ID of the recipient
*
* @return object XML entry object
+ * @todo Add type-hints
*/
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$attributes = array("ref" => $parent_item, "type" => "text/html",
- "href" => app::get_baseurl().'/display/'.$parent[0]['guid'],
+ "href" => App::get_baseurl().'/display/'.$parent[0]['guid'],
"dfrn:diaspora_guid" => $parent[0]['guid']);
xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
}
+ // Add conversation data. This is used for OStatus
+ $conversation_href = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
+ $conversation_uri = $conversation_href;
+
+ if (isset($parent_item)) {
+ $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $item['parent-uri']);
+ if (dbm::is_result($r)) {
+ if ($r['conversation-uri'] != '') {
+ $conversation_uri = $r['conversation-uri'];
+ }
+ if ($r['conversation-href'] != '') {
+ $conversation_href = $r['conversation-href'];
+ }
+ }
+ }
+
+ $attributes = array(
+ "href" => $conversation_href,
+ "ref" => $conversation_uri);
+
+ xml::add_element($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
+
xml::add_element($doc, $entry, "id", $item["uri"]);
xml::add_element($doc, $entry, "title", $item["title"]);
// 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" => app::get_baseurl()."/display/".$item["guid"]));
+ "href" => App::get_baseurl()."/display/".$item["guid"]));
// "comment-allow" is some old fashioned stuff for old Friendica versions.
// It is included in the rewritten code for completeness
// 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']) {
+ 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);
}
$tags = item_getfeedtags($item);
- if( count($tags)) {
+ if (count($tags)) {
foreach ($tags as $t) {
- if (($type != 'html') OR ($t[0] != "@")) {
+ if (($type != 'html') || ($t[0] != "@")) {
xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
}
}
}
if (count($tags)) {
- foreach($tags as $t) {
+ foreach ($tags as $t) {
if ($t[0] == "@") {
$mentioned[$t[1]] = $t[1];
}
intval($owner["uid"]),
dbesc(normalise_link($mention)));
- if ($r[0]["forum"] OR $r[0]["prv"]) {
+ 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));
return $entry;
}
+ /**
+ * @brief encrypts data via AES
+ *
+ * @param string $data The data that is to be encrypted
+ * @param string $key The AES key
+ *
+ * @return string encrypted data
+ */
+ private static function aes_encrypt($data, $key) {
+ return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
+ }
+
+ /**
+ * @brief decrypts data via AES
+ *
+ * @param string $encrypted The encrypted data
+ * @param string $key The AES key
+ *
+ * @return string decrypted data
+ */
+ public static function aes_decrypt($encrypted, $key) {
+ return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
+ }
+
/**
* @brief Delivers the atom content to the contacts
*
* @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) {
$idtosend = '1:' . $orig_id;
}
- $rino = get_config('system','rino_encrypt');
+ $rino = get_config('system', 'rino_encrypt');
$rino = intval($rino);
- // use RINO1 if mcrypt isn't installed and RINO2 was selected
- if ($rino==2 and !function_exists('mcrypt_create_iv')) {
- $rino=1;
- }
-
logger("Local rino version: ". $rino, LOGGER_DEBUG);
$ssl_val = intval(get_config('system','ssl_policy'));
$ssl_policy = '';
- switch($ssl_val){
+ switch ($ssl_val) {
case SSL_POLICY_FULL:
$ssl_policy = 'full';
break;
}
- if ($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+ if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
logger('rino version: '. $rino_remote_version);
- switch($rino_remote_version) {
+ switch ($rino_remote_version) {
case 1:
// Deprecated rino version!
- $key = substr(random_string(),0,16);
- $data = aes_encrypt($postvars['data'],$key);
+ $key = openssl_random_pseudo_bytes(16);
+ $data = self::aes_encrypt($postvars['data'], $key);
break;
case 2:
// RINO 2 based on php-encryption
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'])))
-
+ if (($contact['duplex'] && strlen($contact['pubkey']))
+ || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+ || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
} else {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
*
* @param array $contact Contact record
* @param string $birthday Birthday of the contact
- *
+ * @todo Add array type-hint for $contact
*/
private static function birthday_event($contact, $birthday) {
* @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
*
* @return Returns an array with relevant data of the author
+ * @todo Find good type-hints for all parameter
*/
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
$author["contact-id"] = $r[0]["id"];
$author["network"] = $r[0]["network"];
} else {
- if (!$onlyfetch)
+ if (!$onlyfetch) {
logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
+ }
$author["contact-id"] = $importer["id"];
$author["network"] = $importer["network"];
$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;
}
$contact["avatar-date"] = $attributes->textContent;
}
}
- if (($width > 0) AND ($href != "")) {
+ if (($width > 0) && ($href != "")) {
$avatarlist[$width] = $href;
}
}
$author["avatar"] = current($avatarlist);
}
- if ($r AND !$onlyfetch) {
- logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+ if (dbm::is_result($r) && !$onlyfetch) {
+ logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
$poco = array("url" => $contact["url"]);
// When was the last change to name or uri?
- $name_element = $xpath->query($element."/atom:name", $context)->item(0);
+ $name_element = $xpath->query($element . "/atom:name", $context)->item(0);
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);
+ $link_element = $xpath->query($element . "/atom:link", $context)->item(0);
foreach ($link_element->attributes AS $attributes) {
if ($attributes->name == "updated") {
$poco["uri-date"] = $attributes->textContent;
}
// Update contact data
- $value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["addr"] = $value;
}
- $value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["name"] = $value;
}
- $value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["nick"] = $value;
}
- $value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["about"] = $value;
}
- $value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["location"] = $value;
}
/// @todo Only search for elements with "poco:type" = "xmpp"
- $value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
if ($value != "") {
$poco["xmpp"] = $value;
}
/// - poco:country
// If the "hide" element is present then the profile isn't searchable.
- $hide = intval($xpath->evaluate($element."/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+ $hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
- logger("Hidden status for contact ".$contact["url"].": ".$hide, LOGGER_DEBUG);
+ logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG);
// If the contact isn't searchable then set the contact to "hidden".
// Problem: This can be manually overridden by the user.
// Save the keywords into the contact table
$tags = array();
- $tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
+ $tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
foreach ($tagelements AS $tag) {
$tags[$tag->nodeValue] = $tag->nodeValue;
}
// "dfrn:birthday" contains the birthday converted to UTC
$old_bdyear = $contact["bdyear"];
- $birthday = $xpath->evaluate($element."/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+ $birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
if (strtotime($birthday) > time()) {
$bd_timestamp = strtotime($birthday);
}
// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
- $value = $xpath->evaluate($element."/poco:birthday/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
- if (!in_array($value, array("", "0000-00-00"))) {
+ if (!in_array($value, array("", "0000-00-00", "0001-01-01"))) {
$bdyear = date("Y");
$value = str_replace("0000", $bdyear, $value);
// 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);
+ 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);
+ logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
$update = true;
}
+ }
if ($update) {
- logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
+ logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
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($contact["name-date"]), dbesc($contact["uri-date"]),
+ dbesc(dbm::date($contact["name-date"])), dbesc(dbm::date($contact["uri-date"])),
intval($contact["id"]), dbesc($contact["network"]));
}
update_contact_avatar($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.
- // It is used in the socgraph.php to prevent that old contact data
- // that was relayed over several servers can overwrite contact
- // data that we received directly.
+ /*
+ * The generation is a sign for the reliability of the provided data.
+ * It is used in the socgraph.php to prevent that old contact data
+ * that was relayed over several servers can overwrite contact
+ * data that we received directly.
+ */
$poco["generation"] = 2;
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
- update_gcontact($poco);
+ $gcid = update_gcontact($poco);
+
+ link_gcontact($gcid, $importer["uid"], $contact["id"]);
}
return($author);
* @param text $element element name
*
* @return string XML string
+ * @todo Find good type-hints for all parameter
*/
private static function transform_activity($xpath, $activity, $element) {
if (!is_object($activity)) {
xml::add_element($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0);
- if (is_object($id))
+ if (is_object($id)) {
$obj_element->appendChild($obj_doc->importNode($id, true));
+ }
$title = $xpath->query("atom:title", $activity)->item(0);
- if (is_object($title))
+ if (is_object($title)) {
$obj_element->appendChild($obj_doc->importNode($title, true));
+ }
$links = $xpath->query("atom:link", $activity);
- if (is_object($links))
- foreach ($links AS $link)
+ if (is_object($links)) {
+ foreach ($links AS $link) {
$obj_element->appendChild($obj_doc->importNode($link, true));
+ }
+ }
$content = $xpath->query("atom:content", $activity)->item(0);
- if (is_object($content))
+ if (is_object($content)) {
$obj_element->appendChild($obj_doc->importNode($content, true));
+ }
$obj_doc->appendChild($obj_element);
* @param object $xpath XPath object
* @param object $mail mail elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_mail($xpath, $mail, $importer) {
logger("Processing mails");
+ /// @TODO Rewrite this to one statement
$msg = array();
$msg["uid"] = $importer["importer_uid"];
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
$r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
// send notifications.
-
+ /// @TODO Arange this mess
$notif_params = array(
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
* @param object $xpath XPath object
* @param object $suggestion suggestion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_suggestion($xpath, $suggestion, $importer) {
$a = get_app();
logger("Processing suggestions");
+ /// @TODO Rewrite this to one statement
$suggest = array();
$suggest["uid"] = $importer["importer_uid"];
$suggest["cid"] = $importer["id"];
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
);
- if (dbm::is_result($r))
+
+ /*
+ * The valid result means the friend we're about to send a friend
+ * suggestion already has them in their contact, which means no further
+ * action is required.
+ *
+ * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+ */
+ if (dbm::is_result($r)) {
return false;
+ }
// Do we already have an fcontact record for this person?
intval($suggest["uid"]),
intval($fid)
);
- if (dbm::is_result($r))
+
+ /*
+ * The valid result means the friend we're about to send a friend
+ * suggestion already has them in their contact, which means no further
+ * action is required.
+ *
+ * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+ */
+ if (dbm::is_result($r)) {
return false;
+ }
}
- if(!$fid)
+ if (!$fid) {
$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
- dbesc($suggest["name"]),
- dbesc($suggest["url"]),
- dbesc($suggest["photo"]),
- dbesc($suggest["request"])
- );
+ 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",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
);
- if (dbm::is_result($r))
- $fid = $r[0]["id"];
- else
+
+ /*
+ * If no record in fcontact is found, below INSERT statement will not
+ * link an introduction to it.
+ */
+ if (!dbm::is_result($r)) {
// database record did not get created. Quietly give up.
- return false;
+ killme();
+ }
+ $fid = $r[0]["id"];
$hash = random_string();
* @param object $xpath XPath object
* @param object $relocation relocation elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_relocation($xpath, $relocation, $importer) {
logger("Processing relocations");
+ /// @TODO Rewrite this to one statement
$relocate = array();
$relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"];
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
- if (($relocate["avatar"] == "") AND ($relocate["photo"] != ""))
+ if (($relocate["avatar"] == "") && ($relocate["photo"] != "")) {
$relocate["avatar"] = $relocate["photo"];
+ }
- if ($relocate["addr"] == "")
+ if ($relocate["addr"] == "") {
$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
+ }
// update contact
$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]),
intval($importer["importer_uid"]));
- if (!$r)
+
+ if (!dbm::is_result($r)) {
+ logger("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
+ }
$old = $r[0];
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
- if ($x === false)
+ if ($x === false) {
return false;
+ }
// update items
/// @todo This is an extreme performance killer
'author-link' => array($old["url"], $relocate["url"]),
//'owner-avatar' => array($old["photo"], $relocate["photo"]),
//'author-avatar' => array($old["photo"], $relocate["photo"]),
- );
+ );
foreach ($fields as $n=>$f) {
$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
- if ($r) {
+ if (dbm::is_result($r)) {
$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n, dbesc($f[1]),
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
- if ($x === false)
+
+ if ($x === false) {
return false;
+ }
}
}
* @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?
+ * @todo set proper type-hints (array?)
*/
private static function update_content($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"])
- return(false);
+ if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
+ return false;
+ }
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["title"]),
$changed = true;
- if ($entrytype == DFRN_REPLY_RC)
+ if ($entrytype == DFRN_REPLY_RC) {
proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
+ }
}
// update last-child if it changes
- if($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
+ if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
* @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) {
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
- if($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
+ if ($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
$sql_extra = "";
$community = true;
logger("possible community action");
- } else
+ } else {
$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
+ }
// was the top-level post for this action written by somebody on this site?
// Specifically, the recipient?
dbesc($r[0]["parent-uri"]),
intval($importer["importer_uid"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$is_a_remote_action = true;
+ }
}
- // Does this have the characteristics of a community or private group action?
- // If it's an action to a wall post on a community/prvgroup page it's a
- // valid community action. Also forum_mode makes it valid for sure.
- // If neither, it's not.
-
- if($is_a_remote_action && $community) {
- if((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
- $is_a_remote_action = false;
- logger("not a community action");
- }
+ /*
+ * Does this have the characteristics of a community or private group action?
+ * If it's an action to a wall post on a community/prvgroup page it's a
+ * valid community action. Also forum_mode makes it valid for sure.
+ * If neither, it's not.
+ */
+
+ /// @TODO Maybe merge these if() blocks into one?
+ if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+ $is_a_remote_action = false;
+ logger("not a community action");
}
- if ($is_a_remote_action)
+ if ($is_a_remote_action) {
return DFRN_REPLY_RC;
- else
+ } else {
return DFRN_REPLY;
-
- } else
+ }
+ } else {
return DFRN_TOP_LEVEL;
+ }
}
* @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
+ * @todo set proper type-hints (array?)
*/
private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
- if(!$verb)
+ if (!$verb) {
return;
+ }
$xo = parse_xml_string($item["object"],false);
- if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+ if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
- foreach($xo->link as $l) {
+ foreach ($xo->link as $l) {
$atts = $l->attributes();
- switch($atts["rel"]) {
+ switch ($atts["rel"]) {
case "alternate":
$Blink = $atts["href"];
break;
}
}
- if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
+ if ($Blink && link_compare($Blink, App::get_baseurl() . "/profile/" . $importer["nickname"])) {
// send a notification
notification(array(
* @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) {
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
- if(activity_match($item["verb"],ACTIVITY_FOLLOW)) {
+ if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
logger("New follower");
new_follower($importer, $contact, $item, $nickname);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_UNFOLLOW)) {
+ if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
logger("Lost follower");
lose_follower($importer, $contact, $item);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+ if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
logger("New friend request");
new_follower($importer, $contact, $item, $nickname, true);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_UNFRIEND)) {
+ if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
logger("Lost sharer");
lose_sharer($importer, $contact, $item);
return false;
}
} else {
- if(($item["verb"] == ACTIVITY_LIKE)
+ if (($item["verb"] == ACTIVITY_LIKE)
|| ($item["verb"] == ACTIVITY_DISLIKE)
|| ($item["verb"] == ACTIVITY_ATTEND)
|| ($item["verb"] == ACTIVITY_ATTENDNO)
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
return false;
+ }
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
intval($item["uid"]),
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
return false;
- } else
+ }
+ } else {
$is_like = false;
+ }
- if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+ if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
- if($xt->type == ACTIVITY_OBJ_NOTE) {
+ if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
- if (!dbm::is_result($r))
+ if (!dbm::is_result($r)) {
+ logger("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
+ }
// extract tag, if not duplicate, add to parent item
- if($xo->content) {
- if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+ if ($xo->content) {
+ if (!(stristr($r[0]["tag"],trim($xo->content)))) {
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
intval($r[0]["id"])
*
* @param object $links link elements
* @param array $item the item record
+ * @todo set proper type-hints
*/
private static function parse_links($links, &$item) {
$rel = "";
$length = "0";
$title = "";
foreach ($links AS $link) {
- foreach($link->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($link->attributes AS $attributes) {
+ /// @TODO Rewrite these repeated (same) if () statements to a switch()
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "rel")
+ }
+ if ($attributes->name == "rel") {
$rel = $attributes->textContent;
- if ($attributes->name == "type")
+ }
+ if ($attributes->name == "type") {
$type = $attributes->textContent;
- if ($attributes->name == "length")
+ }
+ if ($attributes->name == "length") {
$length = $attributes->textContent;
- if ($attributes->name == "title")
+ }
+ if ($attributes->name == "title") {
$title = $attributes->textContent;
+ }
}
- if (($rel != "") AND ($href != ""))
- switch($rel) {
+ if (($rel != "") && ($href != "")) {
+ switch ($rel) {
case "alternate":
$item["plink"] = $href;
break;
case "enclosure":
$enclosure = $href;
- if(strlen($item["attach"]))
+ if (strlen($item["attach"])) {
$item["attach"] .= ",";
+ }
- $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+ $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
break;
}
+ }
}
}
* @param object $xpath XPath object
* @param object $entry entry elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Add type-hints
*/
- private static function process_entry($header, $xpath, $entry, $importer) {
+ private static function process_entry($header, $xpath, $entry, $importer, $xml) {
logger("Processing entries");
$item = $header;
+ $item["protocol"] = PROTOCOL_DFRN;
+
+ $item["source"] = $xml;
+
// Get the uri
$item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
);
// Is there an existing item?
- if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND
+ 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;
$item["body"] = limit_body_size($item["body"]);
/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
- if((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
+ if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
$item['body'] = reltoabs($item['body'],$base_url);
$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
$georsspoint = $xpath->query("georss:point", $entry);
- if ($georsspoint)
+ if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue;
+ }
$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true")
+ if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
$item["bookmark"] = true;
+ }
$notice_info = $xpath->query("statusnet:notice_info", $entry);
- if ($notice_info AND ($notice_info->length > 0)) {
- foreach($notice_info->item(0)->attributes AS $attributes) {
- if ($attributes->name == "source")
+ if ($notice_info && ($notice_info->length > 0)) {
+ foreach ($notice_info->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
+ }
}
}
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
- if ($dsprsig != "")
+ if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
+ }
$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "")
+ if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+ }
$object = $xpath->query("activity:object", $entry)->item(0);
$item["object"] = self::transform_activity($xpath, $object, "object");
if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false);
- if (isset($r->type))
+ if (isset($r->type)) {
$item["object-type"] = $r->type;
+ }
}
$target = $xpath->query("activity:target", $entry)->item(0);
foreach ($categories AS $category) {
$term = "";
$scheme = "";
- foreach($category->attributes AS $attributes) {
- if ($attributes->name == "term")
+ foreach ($category->attributes AS $attributes) {
+ if ($attributes->name == "term") {
$term = $attributes->textContent;
+ }
- if ($attributes->name == "scheme")
+ if ($attributes->name == "scheme") {
$scheme = $attributes->textContent;
+ }
}
- if (($term != "") AND ($scheme != "")) {
+ if (($term != "") && ($scheme != "")) {
$parts = explode(":", $scheme);
- if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) {
+ if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) {
$termhash = array_shift($parts);
$termurl = implode(":", $parts);
- if(strlen($item["tag"]))
+ if (strlen($item["tag"])) {
$item["tag"] .= ",";
+ }
- $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
+ $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
}
}
}
$enclosure = "";
$links = $xpath->query("atom:link", $entry);
- if ($links)
+ if ($links) {
self::parse_links($links, $item);
+ }
+
+ $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) {
+ if ($attributes->name == "ref") {
+ $item['conversation-uri'] = $attributes->textContent;
+ }
+ if ($attributes->name == "href") {
+ $item['conversation-href'] = $attributes->textContent;
+ }
+ }
+ }
// Is it a reply or a top level posting?
$item["parent-uri"] = $item["uri"];
$inreplyto = $xpath->query("thr:in-reply-to", $entry);
- if (is_object($inreplyto->item(0)))
- foreach($inreplyto->item(0)->attributes AS $attributes)
- if ($attributes->name == "ref")
+ if (is_object($inreplyto->item(0))) {
+ foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
+ }
+ }
+ }
// Get the type of the item (Top level post, reply or remote reply)
$entrytype = self::get_entry_type($importer, $item);
// Now assign the rest of the values that depend on the type of the message
if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_COMMENT;
+ }
- if ($item["contact-id"] != $owner["contact-id"])
+ if ($item["contact-id"] != $owner["contact-id"]) {
$item["contact-id"] = $owner["contact-id"];
+ }
- if (($item["network"] != $owner["network"]) AND ($owner["network"] != ""))
+ if (($item["network"] != $owner["network"]) && ($owner["network"] != "")) {
$item["network"] = $owner["network"];
+ }
- if ($item["contact-id"] != $author["contact-id"])
+ if ($item["contact-id"] != $author["contact-id"]) {
$item["contact-id"] = $author["contact-id"];
+ }
- if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
+ if (($item["network"] != $author["network"]) && ($author["network"] != "")) {
$item["network"] = $author["network"];
+ }
+ /// @TODO maybe remove this old-lost code then?
// This code was taken from the old DFRN code
// When activated, forums don't work.
// And: Why should we disallow commenting by followers?
// the behaviour is now similar to the Diaspora part.
- //if($importer["rel"] == CONTACT_IS_FOLLOWER) {
+ //if ($importer["rel"] == CONTACT_IS_FOLLOWER) {
// logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
// return;
//}
$item["type"] = "remote-comment";
$item["wall"] = 1;
} elseif ($entrytype == DFRN_TOP_LEVEL) {
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_NOTE;
+ }
// Is it an event?
if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
$ev = bbtoevent($item["body"]);
- if((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+ if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
+ /// @TODO Mixure of "/' ahead ...
$ev["cid"] = $importer["id"];
$ev["uid"] = $importer["uid"];
$ev["uri"] = $item["uri"];
dbesc($item["uri"]),
intval($importer["uid"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$ev["id"] = $r[0]["id"];
+ }
$event_id = event_store($ev);
logger("Event ".$event_id." was stored", LOGGER_DEBUG);
// Update content if 'updated' changes
if (dbm::is_result($current)) {
- if (self::update_content($r[0], $item, $importer, $entrytype))
+ if (self::update_content($r[0], $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
- else
+ } else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ }
return;
}
$posted_id = item_store($item);
$parent = 0;
- if($posted_id) {
+ if ($posted_id) {
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
$parent_uri = $r[0]["parent-uri"];
}
- if(!$is_like) {
+ if (!$is_like) {
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
);
}
- if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+ if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
}
return true;
}
} else { // $entrytype == DFRN_TOP_LEVEL
- if(!link_compare($item["owner-link"],$importer["url"])) {
- // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
- // but otherwise there's a possible data mixup on the sender's system.
- // the tgroup delivery code called from item_store will correct it if it's a forum,
- // but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ if (!link_compare($item["owner-link"],$importer["url"])) {
+ /*
+ * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+ * but otherwise there's a possible data mixup on the sender's system.
+ * the tgroup delivery code called from item_store will correct it if it's a forum,
+ * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ */
logger('Correcting item owner.', LOGGER_DEBUG);
$item["owner-name"] = $importer["senderName"];
$item["owner-link"] = $importer["url"];
$item["owner-avatar"] = $importer["thumb"];
}
- if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+ if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return;
}
logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
- if(stristr($item["verb"],ACTIVITY_POKE))
+ if (stristr($item["verb"],ACTIVITY_POKE))
self::do_poke($item, $importer, $posted_id);
}
}
* @param object $xpath XPath object
* @param object $deletion deletion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo set proper type-hints
*/
private static function process_deletion($xpath, $deletion, $importer) {
logger("Processing deletions");
- foreach($deletion->attributes AS $attributes) {
- if ($attributes->name == "ref")
+ foreach ($deletion->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$uri = $attributes->textContent;
- if ($attributes->name == "when")
+ }
+ if ($attributes->name == "when") {
$when = $attributes->textContent;
+ }
}
- if ($when)
+ if ($when) {
$when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
- else
+ } else {
$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
+ }
- if (!$uri OR !$importer["id"])
+ if (!$uri || !$importer["id"]) {
return false;
+ }
/// @todo Only select the used fields
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
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);
+ logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
return;
} else {
$entrytype = self::get_entry_type($importer, $item);
- if(!$item["deleted"])
+ if (!$item["deleted"]) {
logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
- else
+ } else {
return;
+ }
- if($item["object-type"] == ACTIVITY_OBJ_EVENT) {
+ if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
event_delete($item["event-id"]);
}
- if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+ if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
- if($xt->type == ACTIVITY_OBJ_NOTE) {
+ if ($xt->type == ACTIVITY_OBJ_NOTE) {
$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
$author_remove = (($item["origin"] && $item["self"]) ? true : false);
$author_copy = (($item["origin"]) ? true : false);
- if($owner_remove && $author_copy)
+ if ($owner_remove && $author_copy) {
return;
- if($author_remove || $owner_remove) {
+ }
+ if ($author_remove || $owner_remove) {
$tags = explode(',',$i[0]["tag"]);
$newtags = array();
- if(count($tags)) {
- foreach($tags as $tag)
- if(trim($tag) !== trim($xo->body))
+ if (count($tags)) {
+ foreach ($tags as $tag) {
+ if (trim($tag) !== trim($xo->body)) {
$newtags[] = trim($tag);
+ }
+ }
}
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc(implode(',',$newtags)),
+ dbesc(implode(',', $newtags)),
intval($i[0]["id"])
);
create_tags_from_item($i[0]["id"]);
}
}
- if($entrytype == DFRN_TOP_LEVEL) {
+ if ($entrytype == DFRN_TOP_LEVEL) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `parent-uri` = '%s' AND `uid` = %d",
create_tags_from_itemuri($uri, $importer["uid"]);
create_files_from_itemuri($uri, $importer["uid"]);
update_thread_uri($uri, $importer["importer_uid"]);
- if($item["last-child"]) {
+ 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` = %d ",
dbesc(datetime_convert()),
}
// if this is a relayed delete, propagate it to other recipients
- if($entrytype == DFRN_REPLY_RC) {
- logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
+ if ($entrytype == DFRN_REPLY_RC) {
+ logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
}
}
* @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
+ * @todo set proper type-hints
*/
public static function import($xml,$importer, $sort_by_date = false) {
- if ($xml == "")
+ if ($xml == "") {
return;
+ }
- if($importer["readonly"]) {
+ if ($importer["readonly"]) {
// We aren't receiving stuff from this person. But we will quietly ignore them
// rather than a blatant "go away" message.
logger('ignoring contact '.$importer["id"]);
// Update the contact table if the data has changed
// The "atom:author" is only present in feeds
- if ($xpath->query("/atom:feed/atom:author")->length > 0)
+ if ($xpath->query("/atom:feed/atom:author")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
+ }
// Only the "dfrn:owner" in the head section contains all data
- if ($xpath->query("/atom:feed/dfrn:owner")->length > 0)
+ if ($xpath->query("/atom:feed/dfrn:owner")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
+ }
- logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+ logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
- if ($accounttype != $importer["contact-type"])
+ if ($accounttype != $importer["contact-type"]) {
+ /// @TODO this way is the norm or putting ); at the end of the line?
q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
intval($accounttype),
intval($importer["id"])
);
+ }
}
// is it a public forum? Private forums aren't supported with this method
// This is deprecated since 3.5.1
$forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
- if ($forum != $importer["forum"])
+ if ($forum != $importer["forum"]) {
q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
intval($forum), intval($forum),
intval($importer["id"])
);
+ }
$mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails AS $mail)
+ foreach ($mails AS $mail) {
self::process_mail($xpath, $mail, $importer);
+ }
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions AS $suggestion)
+ foreach ($suggestions AS $suggestion) {
self::process_suggestion($xpath, $suggestion, $importer);
+ }
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
- foreach ($relocations AS $relocation)
+ foreach ($relocations AS $relocation) {
self::process_relocation($xpath, $relocation, $importer);
+ }
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
- foreach ($deletions AS $deletion)
+ foreach ($deletions AS $deletion) {
self::process_deletion($xpath, $deletion, $importer);
+ }
if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry)
- self::process_entry($header, $xpath, $entry, $importer);
+ foreach ($entries AS $entry) {
+ self::process_entry($header, $xpath, $entry, $importer, $xml);
+ }
} else {
$newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry");
// Now sort after the publishing date
ksort($newentries);
- foreach ($newentries AS $entry)
- self::process_entry($header, $xpath, $entry, $importer);
+ foreach ($newentries AS $entry) {
+ self::process_entry($header, $xpath, $entry, $importer, $xml);
+ }
}
- logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+ logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
}
}
-?>
projects / friendica.git / blobdiff