* @param array $owner Owner record
*
* @return string DFRN entries
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function entries($items, $owner)
{
}
foreach ($items as $item) {
+ // These values aren't sent when sending from the queue.
+ /// @todo Check if we can set these values from the queue or if they are needed at all.
+ $item["entry:comment-allow"] = defaults($item, "entry:comment-allow", true);
+ $item["entry:cid"] = defaults($item, "entry:cid", 0);
+
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
$root->appendChild($entry);
}
- return(trim($doc->saveXML()));
+ return trim($doc->saveXML());
}
/**
}
}
-
-
// default permissions - anonymous user
$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' ";
);
if (! DBM::is_result($r)) {
+ logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_WARNING);
killme();
}
);
if (! DBM::is_result($r)) {
+ logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_WARNING);
killme();
}
$groups = Group::getIdsByContactId($contact['id']);
if (count($groups)) {
- for ($x = 0; $x < count($groups); $x ++)
+ for ($x = 0; $x < count($groups); $x ++) {
$groups[$x] = '<' . intval($groups[$x]) . '>' ;
+ }
+
$gs = implode('|', $groups);
} else {
$gs = '<<>>' ; // Impossible to match
//$sql_extra .= file_tag_file_query('item',$category,'category');
}
- if ($public_feed) {
- if (! $converse) {
- $sql_extra .= " AND `contact`.`self` = 1 ";
- }
+ if ($public_feed && ! $converse) {
+ $sql_extra .= " AND `contact`.`self` = 1 ";
}
$check_date = DateTimeFormat::utc($last_update);
$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`
+ "SELECT `item`.`id`
FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- AND (NOT `contact`.`blocked` OR `contact`.`pending`)
- LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
- WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
- AND `item`.`wall` AND `item`.`changed` > '%s'
+ WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s'
$sql_extra
ORDER BY `item`.`parent` ".$sort.", `item`.`created` ASC LIMIT 0, 300",
intval($owner_id),
dbesc($sort)
);
+ $ids = [];
+ foreach ($r as $item) {
+ $ids[] = $item['id'];
+ }
+
+ if (!empty($ids)) {
+ $ret = Item::select(Item::DELIVER_FIELDLIST, ['id' => $ids]);
+ $items = Item::inArray($ret);
+ } else {
+ $items = [];
+ }
+
/*
* Will check further below if this actually returned results.
* We will provide an empty feed if that is the case.
*/
- $items = $r;
-
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
public static function itemFeed($item_id, $conversation = false)
{
if ($conversation) {
- $condition = '`item`.`parent`';
+ $condition = ['parent' => $item_id];
} else {
- $condition = '`item`.`id`';
+ $condition = ['id' => $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 %s = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
- AND NOT `item`.`private`",
- $condition,
- intval($item_id)
- );
-
- if (!DBM::is_result($r)) {
+ $ret = Item::select(Item::DELIVER_FIELDLIST, $condition);
+ $items = Item::inArray($ret);
+ if (!DBM::is_result($items)) {
killme();
}
- $items = $r;
- $item = $r[0];
+ $item = $items[0];
if ($item['uid'] != 0) {
$owner = User::getOwnerDataById($item['uid']);
* @param array $owner Owner record
*
* @return string DFRN mail
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function mail($item, $owner)
{
$root->appendChild($mail);
- return(trim($doc->saveXML()));
+ return trim($doc->saveXML());
}
/**
* @param array $owner Owner record
*
* @return string DFRN suggestions
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function fsuggest($item, $owner)
{
$root->appendChild($suggest);
- return(trim($doc->saveXML()));
+ return trim($doc->saveXML());
}
/**
* @param int $uid User ID
*
* @return string DFRN relocations
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
public static function relocate($owner, $uid)
{
$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
- unset($rp, $ext);
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
$root->appendChild($relocate);
- return(trim($doc->saveXML()));
+ return trim($doc->saveXML());
}
/**
* @param bool $public Is it a header for public posts?
*
* @return object XML root object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
{
* @param boolean $public boolean
*
* @return object XML author object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addAuthor($doc, $owner, $authorelement, $public)
{
* @param array $item Item elements
*
* @return object XML author object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function addEntryAuthor($doc, $element, $contact_url, $item)
{
* @param string $activity activity value
*
* @return object XML activity object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function createActivity($doc, $element, $activity)
{
if (!$r) {
return false;
}
+
if ($r->type) {
XML::addElement($doc, $entry, "activity:object-type", $r->type);
}
+
if ($r->id) {
XML::addElement($doc, $entry, "id", $r->id);
}
+
if ($r->title) {
XML::addElement($doc, $entry, "title", $r->title);
}
* @param array $item Item element
*
* @return object XML attachment object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
private static function getAttachment($doc, $root, $item)
{
* @param bool $single If set, the entry is created as an XML document with a single "entry" element
*
* @return object XML entry object
- * @todo Add type-hints
+ * @todo Find proper type-hints
*/
- private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
+ private static function entry($doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
{
$mentioned = [];
$htmlbody = $body;
if ($item['title'] != "") {
- $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+ $htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
}
$htmlbody = BBCode::convert($htmlbody, false, 7);
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
- $parent = q("SELECT `guid`,`plink` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", dbesc($parent_item), intval($item['uid']));
+ $parent = Item::selectFirst(['guid', 'plink'], ['uri' => $parent_item, 'uid' => $item['uid']]);
$attributes = ["ref" => $parent_item, "type" => "text/html",
- "href" => $parent[0]['plink'],
- "dfrn:diaspora_guid" => $parent[0]['guid']];
+ "href" => $parent['plink'],
+ "dfrn:diaspora_guid" => $parent['guid']];
XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
}
$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'];
+ $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]);
+ if (DBM::is_result($conversation)) {
+ if ($conversation['conversation-uri'] != '') {
+ $conversation_uri = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
- $conversation_href = $r['conversation-href'];
+ if ($conversation['conversation-href'] != '') {
+ $conversation_href = $conversation['conversation-href'];
}
}
}
$tags = Item::getFeedTags($item);
+ /// @TODO Combine this with similar below if() block?
if (count($tags)) {
foreach ($tags as $t) {
if (($type != 'html') || ($t[0] != "@")) {
$postvars['dissolve'] = '1';
}
-
if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
$postvars['data'] = $atom;
$postvars['perm'] = 'rw';
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
{
$author = [];
- $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
- $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
-
- $contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`,
- `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
- FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?",
- $importer["importer_uid"],
- normalise_link($author["link"]),
- NETWORK_STATUSNET
- );
+ $author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context);
+ $author["link"] = XML::getFirstNodeValue($xpath, $element."/atom:uri/text()", $context);
+
+ $fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
+ 'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
+ $condition = ["`uid` = ? AND `nurl` = ? AND `network` != ?",
+ $importer["importer_uid"], normalise_link($author["link"]), NETWORK_STATUSNET];
+ $contact_old = dba::selectFirst('contact', $fields, $condition);
if (DBM::is_result($contact_old)) {
$author["contact-id"] = $contact_old["id"];
logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG);
}
+ $author["contact-unknown"] = true;
$author["contact-id"] = $importer["id"];
$author["network"] = $importer["network"];
$onlyfetch = true;
// Until now we aren't serving different sizes - but maybe later
$avatarlist = [];
/// @todo check if "avatar" or "photo" would be the best field in the specification
- $avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
+ $avatars = $xpath->query($element . "/atom:link[@rel='avatar']", $context);
foreach ($avatars as $avatar) {
$href = "";
$width = 0;
foreach ($avatar->attributes as $attributes) {
- /// @TODO Rewrite these similar if () to one switch
+ /// @TODO Rewrite these similar if() to one switch
if ($attributes->name == "href") {
$href = $attributes->textContent;
}
$avatarlist[$width] = $href;
}
}
+
if (count($avatarlist) > 0) {
krsort($avatarlist);
$author["avatar"] = current($avatarlist);
}
// Update contact data
- $value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, $element . "/dfrn:handle/text()", $context);
if ($value != "") {
$poco["addr"] = $value;
}
- $value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, $element . "/poco:displayName/text()", $context);
if ($value != "") {
$poco["name"] = $value;
}
- $value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, $element . "/poco:preferredUsername/text()", $context);
if ($value != "") {
$poco["nick"] = $value;
}
- $value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, $element . "/poco:note/text()", $context);
if ($value != "") {
$poco["about"] = $value;
}
- $value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+ $value = XML::getFirstNodeValue($xpath, $element . "/poco:address/poco:formatted/text()", $context);
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 = XML::getFirstNodeValue($xpath, $element . "/poco:ims/poco:value/text()", $context);
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(XML::getFirstNodeValue($xpath, $element . "/dfrn:hide/text()", $context) == "true");
logger("Hidden status for contact " . $contact_old["url"] . ": " . $hide, LOGGER_DEBUG);
}
// "dfrn:birthday" contains the birthday converted to UTC
- $birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+ $birthday = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context);
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 = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context);
if (!in_array($value, ["", "0000-00-00", "0001-01-01"])) {
$bdyear = date("Y");
'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
+
dba::update('contact', $fields, $condition);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
logger('Contacts are updated.');
- // update items
- // This is an extreme performance killer
- Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
- Item::update(['author-link' => $relocate["url"]], ['author-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
-
- logger('Items are updated.');
-
/// @TODO
/// merge with current record, current contents have priority
/// update record, set url-updated
$is_a_remote_action = false;
- $r = q(
- "SELECT `item`.`parent-uri` FROM `item`
- WHERE `item`.`uri` = '%s'
- LIMIT 1",
- dbesc($item["parent-uri"])
- );
- if (DBM::is_result($r)) {
+ $parent = Item::selectFirst(['parent-uri'], ['uri' => $item["parent-uri"]]);
+ if (DBM::is_result($parent)) {
$r = q(
"SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `item`.`uid` = %d
$sql_extra
LIMIT 1",
- dbesc($r[0]["parent-uri"]),
- dbesc($r[0]["parent-uri"]),
- dbesc($r[0]["parent-uri"]),
+ dbesc($parent["parent-uri"]),
+ dbesc($parent["parent-uri"]),
+ dbesc($parent["parent-uri"]),
intval($importer["importer_uid"])
);
if (DBM::is_result($r)) {
}
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
+ $author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]);
+
// send a notification
notification(
[
"uid" => $importer["importer_uid"],
"item" => $item,
"link" => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
- "source_name" => stripslashes($item["author-name"]),
- "source_link" => $item["author-link"],
- "source_photo" => ((link_compare($item["author-link"], $importer["url"]))
- ? $importer["thumb"] : $item["author-avatar"]),
+ "source_name" => $author["name"],
+ "source_link" => $author["url"],
+ "source_photo" => $author["thumb"],
"verb" => $item["verb"],
"otype" => "person",
"activity" => $verb,
) {
$is_like = true;
$item["type"] = "activity";
- $item["gravity"] = GRAVITY_LIKE;
+ $item["gravity"] = GRAVITY_ACTIVITY;
// only one like or dislike per person
// splitted into two queries for performance issues
- $r = q(
- "SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
- intval($item["uid"]),
- dbesc($item["author-link"]),
- dbesc($item["verb"]),
- dbesc($item["parent-uri"])
- );
- if (DBM::is_result($r)) {
+ $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
+ 'verb' => $item["verb"], 'parent-uri' => $item["parent-uri"]];
+ if (Item::exists($condition)) {
return false;
}
- $r = q(
- "SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
- intval($item["uid"]),
- dbesc($item["author-link"]),
- dbesc($item["verb"]),
- dbesc($item["parent-uri"])
- );
- if (DBM::is_result($r)) {
+ $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
+ 'verb' => $item["verb"], 'thr-parent' => $item["parent-uri"]];
+ if (Item::exists($condition)) {
return false;
}
} else {
$xt = XML::parseString($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
- $r = q(
- "SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($xt->id),
- intval($importer["importer_uid"])
- );
-
- if (!DBM::is_result($r)) {
+ $item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
+ if (!DBM::is_result($item_tag)) {
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))) {
- $tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
- Item::update(['tag' => $tag], ['id' => $r[0]["id"]]);
+ if (!stristr($item_tag["tag"], trim($xo->content))) {
+ $tag = $item_tag["tag"] . (strlen($item_tag["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+ Item::update(['tag' => $tag], ['id' => $item_tag["id"]]);
}
}
}
$item["source"] = $xml;
// Get the uri
- $item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
+ $item["uri"] = XML::getFirstNodeValue($xpath, "atom:id/text()", $entry);
- $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
+ $item["edited"] = XML::getFirstNodeValue($xpath, "atom:updated/text()", $entry);
- $current = dba::selectFirst('item',
- ['id', 'uid', 'edited', 'body'],
+ $current = Item::selectFirst(['id', 'uid', 'edited', 'body'],
['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]
);
// Is there an existing item?
// Fetch the owner
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
- $item["owner-name"] = $owner["name"];
+ $owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
+
$item["owner-link"] = $owner["link"];
- $item["owner-avatar"] = $owner["avatar"];
+ $item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
// fetch the author
$author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true);
- $item["author-name"] = $author["name"];
$item["author-link"] = $author["link"];
- $item["author-avatar"] = $author["avatar"];
+ $item["author-id"] = Contact::getIdForURL($author["link"], 0);
- $item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
+ $item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
- $item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+ $item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
- $item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
+ $item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
$item["body"] = str_replace([' ',"\t","\r","\n"], ['','','',''], $item["body"]);
// make sure nobody is trying to sneak some html tags by us
$item["body"] = notags(base64url_decode($item["body"]));
// We don't need the content element since "dfrn:env" is always present
//$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
- $item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
+ $item["location"] = XML::getFirstNodeValue($xpath, "dfrn:location/text()", $entry);
- $georsspoint = $xpath->query("georss:point", $entry);
- if ($georsspoint) {
- $item["coord"] = $georsspoint->item(0)->nodeValue;
- }
+ $item["coord"] = XML::getFirstNodeValue($xpath, "georss:point", $entry);
- $item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
+ $item["private"] = XML::getFirstNodeValue($xpath, "dfrn:private/text()", $entry);
- $item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
+ $item["extid"] = XML::getFirstNodeValue($xpath, "dfrn:extid/text()", $entry);
- if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
+ if (XML::getFirstNodeValue($xpath, "dfrn:bookmark/text()", $entry) == "true") {
$item["bookmark"] = true;
}
}
}
- $item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
+ $item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry);
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
- $dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
+ $dsprsig = unxmlify(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
}
- $item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
+ $item["verb"] = XML::getFirstNodeValue($xpath, "activity:verb/text()", $entry);
- if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
- $item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+ if (XML::getFirstNodeValue($xpath, "activity:object-type/text()", $entry) != "") {
+ $item["object-type"] = XML::getFirstNodeValue($xpath, "activity:object-type/text()", $entry);
}
$object = $xpath->query("activity:object", $entry)->item(0);
$termhash = array_shift($parts);
$termurl = implode(":", $parts);
- if (strlen($item["tag"])) {
+ if (!empty($item["tag"])) {
$item["tag"] .= ",";
+ } else {
+ $item["tag"] = "";
}
$item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
self::parseLinks($links, $item);
}
- $item['conversation-uri'] = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
+ $item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
$conv = $xpath->query('ostatus:conversation', $entry);
if (is_object($conv->item(0))) {
}
// Is it an event?
- if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
+ if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
$ev = Event::fromBBCode($item["body"]);
if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
return;
}
+ // This check is done here to be able to receive connection requests in "processVerbs"
+ if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) {
+ logger("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", LOGGER_DEBUG);
+ return;
+ }
+
+
// Update content if 'updated' changes
if (DBM::is_result($current)) {
if (self::updateContent($current, $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
} else {
- logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ logger("Item " . $item["uri"] . " already existed.", LOGGER_DEBUG);
}
return;
}
* 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"];
+ $item["owner-link"] = $importer["url"];
+ $item["owner-id"] = Contact::getIdForURL($importer["url"], 0);
}
if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
{
logger("Processing deletions");
$uri = null;
+
foreach ($deletion->attributes as $attributes) {
if ($attributes->name == "ref") {
$uri = $attributes->textContent;
return false;
}
- $condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["importer_uid"]];
- $item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition);
+ $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
+ $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted'], $condition);
if (!DBM::is_result($item)) {
logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG);
return;
}
+ if (strstr($item['file'], '[')) {
+ logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+ return;
+ }
+
// When it is a starting post it has to belong to the person that wants to delete it
if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
// Comments can be deleted by the thread owner or comment owner
if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) {
$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
- if (!dba::exists('item', $condition)) {
+ if (!Item::exists($condition)) {
logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
return;
}
logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
// is it a public forum? Private forums aren't exposed with this method
- $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
+ $forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
- $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
+ $accounttype = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:account_type/text()"));
if ($accounttype != $importer["contact-type"]) {
dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
$newentries = [];
$entries = $xpath->query("/atom:feed/atom:entry");
foreach ($entries as $entry) {
- $created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+ $created = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
$newentries[strtotime($created)] = $entry;
}
projects / friendica.git / blobdiff