Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event

[friendica.git] / include / dfrn.php

diff --git a/include/dfrn.php b/include/dfrn.php
index 0b12f4d615fb02962846045cecbb6a2b32e0dd3f..55c51cb0118a69fd482b2f61c13a9046656647c0 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -289,10 +289,17 @@ class dfrn {
         * @brief Generate an atom entry for a given 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) {
+       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`,
                        `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
                        `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
@@ -302,8 +309,9 @@ class dfrn {
                        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
+                       WHERE %s = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
                        AND NOT `item`.`private`",
+                       $condition,
                        intval($item_id)
                );
 
@@ -311,6 +319,7 @@ class dfrn {
                        killme();
                }
 
+               $items = $r;
                $item = $r[0];
 
                $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
@@ -327,12 +336,31 @@ class dfrn {
 
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
+               $type = 'html';
 
-               $alternatelink = $owner['url'];
+               if ($conversation) {
+                       $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
+                       $doc->appendChild($root);
 
-               $type = 'html';
+                       $root->setAttribute("xmlns:thr", NAMESPACE_THREAD);
+                       $root->setAttribute("xmlns:at", NAMESPACE_TOMB);
+                       $root->setAttribute("xmlns:media", NAMESPACE_MEDIA);
+                       $root->setAttribute("xmlns:dfrn", NAMESPACE_DFRN);
+                       $root->setAttribute("xmlns:activity", NAMESPACE_ACTIVITY);
+                       $root->setAttribute("xmlns:georss", NAMESPACE_GEORSS);
+                       $root->setAttribute("xmlns:poco", NAMESPACE_POCO);
+                       $root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
+                       $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
+
+                       //$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
 
-               $root = self::entry($doc, $type, $item, $owner, true, 0, true);
+                       foreach ($items as $item) {
+                               $entry = self::entry($doc, $type, $item, $owner, true, 0);
+                               $root->appendChild($entry);
+                       }
+               } else {
+                       $root = self::entry($doc, $type, $item, $owner, true, 0, true);
+               }
 
                $atom = trim($doc->saveXML());
                return $atom;
@@ -820,6 +848,7 @@ class dfrn {
         * @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
@@ -1668,9 +1697,7 @@ class dfrn {
                $msg["seen"] = 0;
                $msg["replied"] = 0;
 
-               dbm::esc_array($msg, true);
-
-               $r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
+               dba::insert('mail', $msg);
 
                // send notifications.
                /// @TODO Arange this mess
@@ -2830,13 +2857,6 @@ class dfrn {
                        return 400;
                }
 
-               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"]);
-                       return 403;
-               }
-
                $doc = new DOMDocument();
                @$doc->loadXML($xml);
 
@@ -2879,11 +2899,7 @@ class dfrn {
                        $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
 
                        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"])
-                               );
+                               dba::update('contact', array('contact-type' => $accounttype), array('id' => $importer["id"]));
                        }
                }
 
@@ -2892,10 +2908,21 @@ class dfrn {
                $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
 
                if ($forum != $importer["forum"]) {
-                       q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
-                               intval($forum), intval($forum),
-                               intval($importer["id"])
-                       );
+                       $condition = array('`forum` != ? AND `id` = ?', $forum, $importer["id"]);
+                       dba::update('contact', array('forum' => $forum), $condition);
+               }
+
+               // 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);
+               }
+
+               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"]);
+                       return 403;
                }
 
                $mails = $xpath->query("/atom:feed/dfrn:mail");
@@ -2908,11 +2935,6 @@ class dfrn {
                        self::process_suggestion($xpath, $suggestion, $importer);
                }
 
-               $relocations = $xpath->query("/atom:feed/dfrn:relocate");
-               foreach ($relocations AS $relocation) {
-                       self::process_relocation($xpath, $relocation, $importer);
-               }
-
                $deletions = $xpath->query("/atom:feed/at:deleted-entry");
                foreach ($deletions AS $deletion) {
                        self::process_deletion($xpath, $deletion, $importer);