]> git.mxchange.org Git - friendica.git/blobdiff - include/dfrn.php
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is...
[friendica.git] / include / dfrn.php
index e286b75cceb02337bc469aac535e8977b75a390a..ad04a91295da29f4932024a9efee0c3f4bf4b549 100644 (file)
@@ -18,7 +18,7 @@ require_once("include/event.php");
 require_once("include/text.php");
 require_once("include/oembed.php");
 require_once("include/html2bbcode.php");
-require_once("library/HTMLPurifier.auto.php");
+require_once("include/bbcode.php");
 
 /**
  * @brief This class contain functions to create and send DFRN XML files
@@ -26,9 +26,9 @@ require_once("library/HTMLPurifier.auto.php");
  */
 class dfrn {
 
-       const DFRN_TOP_LEVEL = 0;
-       const DFRN_REPLY = 1;
-       const DFRN_REPLY_RC = 2;
+       const DFRN_TOP_LEVEL = 0;       // Top level posting
+       const DFRN_REPLY = 1;           // Regular reply that is stored locally
+       const DFRN_REPLY_RC = 2;        // Reply that will be relayed
 
        /**
         * @brief Generates the atom entries for delivery.php
@@ -40,7 +40,7 @@ class dfrn {
         *
         * @return string DFRN entries
         */
-       function entries($items,$owner) {
+       public static function entries($items,$owner) {
 
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
@@ -70,7 +70,7 @@ class dfrn {
         *
         * @return string DFRN feed entries
         */
-       function feed($dfrn_id, $owner_nick, $last_update, $direction = 0) {
+       public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
                $a = get_app();
 
@@ -96,7 +96,7 @@ class dfrn {
 
                $sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ";
 
-               $r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
+               $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
                        WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1",
                        dbesc($owner_nick)
@@ -106,7 +106,7 @@ class dfrn {
                        killme();
 
                $owner = $r[0];
-               $owner_id = $owner['user_uid'];
+               $owner_id = $owner['uid'];
                $owner_nick = $owner['nickname'];
 
                $sql_post_table = "";
@@ -277,7 +277,7 @@ class dfrn {
         *
         * @return string DFRN mail
         */
-       function mail($item, $owner) {
+       public static function mail($item, $owner) {
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
 
@@ -311,7 +311,7 @@ class dfrn {
         *
         * @return string DFRN suggestions
         */
-       function fsuggest($item, $owner) {
+       public static function fsuggest($item, $owner) {
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
 
@@ -338,7 +338,7 @@ class dfrn {
         *
         * @return string DFRN relocations
         */
-       function relocate($owner, $uid) {
+       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');
@@ -484,7 +484,7 @@ class dfrn {
                                        "media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
                xml_add_element($doc, $author, "link", "", $attributes);
 
-               $birthday = feed_birthday($owner['user_uid'], $owner['timezone']);
+               $birthday = feed_birthday($owner['uid'], $owner['timezone']);
 
                if ($birthday)
                        xml_add_element($doc, $author, "dfrn:birthday", $birthday);
@@ -499,7 +499,7 @@ class dfrn {
                        FROM `profile`
                                INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
                                WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
-                       intval($owner['user_uid']));
+                       intval($owner['uid']));
                if ($r) {
                        $profile = $r[0];
                        xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
@@ -634,13 +634,20 @@ class dfrn {
 
                                        $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
 
-                                       $data = parse_xml_string($r->link, false);
-                                       foreach ($data->attributes() AS $parameter => $value)
-                                               $attributes[$parameter] = $value;
-                               } else
+                                       // 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);
+                                       if (is_object($data)) {
+                                               foreach ($data->link AS $link) {
+                                                       $attributes = array();
+                                                       foreach ($link->attributes() AS $parameter => $value)
+                                                               $attributes[$parameter] = $value;
+                                                       xml_add_element($doc, $entry, "link", "", $attributes);
+                                               }
+                                       }
+                               } else {
                                        $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $r->link);
-
-                               xml_add_element($doc, $entry, "link", "", $attributes);
+                                       xml_add_element($doc, $entry, "link", "", $attributes);
+                               }
                        }
                        if($r->content)
                                xml_add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
@@ -714,6 +721,9 @@ class dfrn {
                else
                        $body = $item['body'];
 
+               // Remove the abstract element. It is only locally important.
+               $body = remove_abstract($body);
+
                if ($type == 'html') {
                        $htmlbody = $body;
 
@@ -846,7 +856,7 @@ class dfrn {
         *
         * @return int Deliver status. -1 means an error.
         */
-       function deliver($owner,$contact,$atom, $dissolve = false) {
+       public static function deliver($owner,$contact,$atom, $dissolve = false) {
 
                $a = get_app();
 
@@ -1108,13 +1118,13 @@ class dfrn {
         *
         * @return Returns an array with relevant data of the author
         */
-       private function fetchauthor($xpath, $context, $importer, $element, $onlyfetch) {
+       private function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
 
                $author = array();
                $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
                $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
 
-               $r = q("SELECT `id`, `uid`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
+               $r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
                                `name`, `nick`, `about`, `location`, `keywords`, `bdyear`, `bd`
                                FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
                        intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET));
@@ -1123,6 +1133,9 @@ class dfrn {
                        $author["contact-id"] = $r[0]["id"];
                        $author["network"] = $r[0]["network"];
                } else {
+                       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"];
                        $onlyfetch = true;
@@ -1152,38 +1165,41 @@ class dfrn {
                }
 
                if ($r AND !$onlyfetch) {
+                       logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+
+                       $poco = array("url" => $contact["url"]);
 
                        // When was the last change to name or uri?
                        $name_element = $xpath->query($element."/atom:name", $context)->item(0);
                        foreach($name_element->attributes AS $attributes)
                                if ($attributes->name == "updated")
-                                       $contact["name-date"] = $attributes->textContent;
+                                       $poco["name-date"] = $attributes->textContent;
 
                        $link_element = $xpath->query($element."/atom:link", $context)->item(0);
                        foreach($link_element->attributes AS $attributes)
                                if ($attributes->name == "updated")
-                                       $contact["uri-date"] = $attributes->textContent;
+                                       $poco["uri-date"] = $attributes->textContent;
 
                        // Update contact data
                        $value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
                        if ($value != "")
-                               $contact["addr"] = $value;
+                               $poco["addr"] = $value;
 
                        $value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
                        if ($value != "")
-                               $contact["name"] = $value;
+                               $poco["name"] = $value;
 
                        $value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
                        if ($value != "")
-                               $contact["nick"] = $value;
+                               $poco["nick"] = $value;
 
                        $value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
                        if ($value != "")
-                               $contact["about"] = $value;
+                               $poco["about"] = $value;
 
                        $value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
                        if ($value != "")
-                               $contact["location"] = $value;
+                               $poco["location"] = $value;
 
                        /// @todo Add support for the following fields that we don't support by now in the contact table:
                        /// - poco:utcOffset
@@ -1200,7 +1216,7 @@ class dfrn {
                                $tags[$tag->nodeValue] = $tag->nodeValue;
 
                        if (count($tags))
-                               $contact["keywords"] = implode(", ", $tags);
+                               $poco["keywords"] = implode(", ", $tags);
 
                        // "dfrn:birthday" contains the birthday converted to UTC
                        $old_bdyear = $contact["bdyear"];
@@ -1210,7 +1226,7 @@ class dfrn {
                        if (strtotime($birthday) > time()) {
                                $bd_timestamp = strtotime($birthday);
 
-                               $contact["bdyear"] = date("Y", $bd_timestamp);
+                               $poco["bdyear"] = date("Y", $bd_timestamp);
                        }
 
                        // "poco:birthday" is the birthday in the format "yyyy-mm-dd"
@@ -1225,9 +1241,11 @@ class dfrn {
                                        $bdyear = $bdyear + 1;
                                }
 
-                               $contact["bd"] = $value;
+                               $poco["bd"] = $value;
                        }
 
+                       $contact = array_merge($contact, $poco);
+
                        if ($old_bdyear != $contact["bdyear"])
                                self::birthday_event($contact, $birthday);
 
@@ -1238,6 +1256,7 @@ class dfrn {
 
                        unset($fields["id"]);
                        unset($fields["uid"]);
+                       unset($fields["url"]);
                        unset($fields["avatar-date"]);
                        unset($fields["name-date"]);
                        unset($fields["uri-date"]);
@@ -1245,8 +1264,10 @@ class dfrn {
                         // Update check for this field has to be done differently
                        $datefields = array("name-date", "uri-date");
                        foreach ($datefields AS $field)
-                               if (strtotime($contact[$field]) > strtotime($r[0][$field]))
+                               if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
+                                       logger("Difference for contact ".$contact["id"]." in field '".$field."'. Old value: '".$contact[$field]."', new value '".$r[0][$field]."'", LOGGER_DEBUG);
                                        $update = true;
+                               }
 
                        foreach ($fields AS $field => $data)
                                if ($contact[$field] != $r[0][$field]) {
@@ -1255,7 +1276,7 @@ class dfrn {
                                }
 
                        if ($update) {
-                               logger("Update contact data for contact ".$contact["id"], 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',
@@ -1270,14 +1291,28 @@ class dfrn {
                        update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
                                                (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
 
-                       $contact["generation"] = 2;
-                       $contact["photo"] = $author["avatar"];
-                       update_gcontact($contact);
+                       // 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"];
+                       update_gcontact($poco);
                }
 
                return($author);
        }
 
+       /**
+        * @brief Transforms activity objects into an XML string
+        *
+        * @param object $xpath XPath object
+        * @param object $activity Activity object
+        * @param text $element element name
+        *
+        * @return string XML string
+        */
        private function transform_activity($xpath, $activity, $element) {
                if (!is_object($activity))
                        return "";
@@ -1298,9 +1333,10 @@ class dfrn {
                if (is_object($title))
                        $obj_element->appendChild($obj_doc->importNode($title, true));
 
-               $link = $xpath->query("atom:link", $activity)->item(0);
-               if (is_object($link))
-                       $obj_element->appendChild($obj_doc->importNode($link, true));
+               $links = $xpath->query("atom:link", $activity);
+               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))
@@ -1315,6 +1351,13 @@ class dfrn {
                return($objxml);
        }
 
+       /**
+        * @brief Processes the mail elements
+        *
+        * @param object $xpath XPath object
+        * @param object $mail mail elements
+        * @param array $importer Record of the importer user mixed with contact of the content
+        */
        private function process_mail($xpath, $mail, $importer) {
 
                logger("Processing mails");
@@ -1359,6 +1402,13 @@ class dfrn {
                logger("Mail is processed, notification was sent.");
        }
 
+       /**
+        * @brief Processes the suggestion elements
+        *
+        * @param object $xpath XPath object
+        * @param object $suggestion suggestion elements
+        * @param array $importer Record of the importer user mixed with contact of the content
+        */
        private function process_suggestion($xpath, $suggestion, $importer) {
 
                logger("Processing suggestions");
@@ -1453,6 +1503,13 @@ class dfrn {
 
        }
 
+       /**
+        * @brief Processes the relocation elements
+        *
+        * @param object $xpath XPath object
+        * @param object $relocation relocation elements
+        * @param array $importer Record of the importer user mixed with contact of the content
+        */
        private function process_relocation($xpath, $relocation, $importer) {
 
                logger("Processing relocations");
@@ -1534,6 +1591,14 @@ class dfrn {
                return true;
        }
 
+       /**
+        * @brief Updates an item
+        *
+        * @param array $current the current item record
+        * @param array $item the new item record
+        * @param array $importer Record of the importer user mixed with contact of the content
+        * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+        */
        private function update_content($current, $item, $importer, $entrytype) {
                $changed = false;
 
@@ -1578,6 +1643,14 @@ class dfrn {
                return $changed;
        }
 
+       /**
+        * @brief Detects the entry type of the item
+        *
+        * @param array $importer Record of the importer user mixed with contact of the content
+        * @param array $item the new item record
+        *
+        * @return int Is it a toplevel entry, a comment or a relayed comment?
+        */
        private function get_entry_type($importer, $item) {
                if ($item["parent-uri"] != $item["uri"]) {
                        $community = false;
@@ -1637,6 +1710,13 @@ class dfrn {
 
        }
 
+       /**
+        * @brief Send a "poke"
+        *
+        * @param array $item the new item record
+        * @param array $importer Record of the importer user mixed with contact of the content
+        * @param int $posted_id The record number of item record that was just posted
+        */
        private function do_poke($item, $importer, $posted_id) {
                $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
                if(!$verb)
@@ -1646,9 +1726,7 @@ class dfrn {
                if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
 
                        // somebody was poked/prodded. Was it me?
-                       $links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false);
-
-                       foreach($links->link as $l) {
+                       foreach($xo->link as $l) {
                                $atts = $l->attributes();
                                switch($atts["rel"]) {
                                        case "alternate":
@@ -1658,7 +1736,8 @@ class dfrn {
                                                break;
                                }
                        }
-                       if($Blink && link_compare($Blink,$a->get_baseurl()."/profile/".$importer["nickname"])) {
+
+                       if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
 
                                // send a notification
                                notification(array(
@@ -1669,7 +1748,7 @@ class dfrn {
                                        "to_email"     => $importer["email"],
                                        "uid"          => $importer["importer_uid"],
                                        "item"         => $item,
-                                       "link"         => $a->get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
+                                       "link"         => App::get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
                                        "source_name"  => stripslashes($item["author-name"]),
                                        "source_link"  => $item["author-link"],
                                        "source_photo" => ((link_compare($item["author-link"],$importer["url"]))
@@ -1683,6 +1762,156 @@ class dfrn {
                }
        }
 
+       /**
+        * @brief Processes several actions, depending on the verb
+        *
+        * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+        * @param array $importer Record of the importer user mixed with contact of the content
+        * @param array $item the new item record
+        * @param bool $is_like Is the verb a "like"?
+        *
+        * @return bool Should the processing of the entries be continued?
+        */
+       private function process_verbs($entrytype, $importer, &$item, &$is_like) {
+               if (($entrytype == DFRN_TOP_LEVEL)) {
+                       // The filling of the the "contact" variable is done for legcy reasons
+                       // The functions below are partly used by ostatus.php as well - where we have this variable
+                       $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
+                       $contact = $r[0];
+                       $nickname = $contact["nick"];
+
+                       // 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)) {
+                               logger("New follower");
+                               new_follower($importer, $contact, $item, $nickname);
+                               return false;
+                       }
+                       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)) {
+                               logger("New friend request");
+                               new_follower($importer, $contact, $item, $nickname, true);
+                               return false;
+                       }
+                       if(activity_match($item["verb"],ACTIVITY_UNFRIEND))  {
+                               logger("Lost sharer");
+                               lose_sharer($importer, $contact, $item);
+                               return false;
+                       }
+               } else {
+                       if(($item["verb"] === ACTIVITY_LIKE)
+                               || ($item["verb"] === ACTIVITY_DISLIKE)
+                               || ($item["verb"] === ACTIVITY_ATTEND)
+                               || ($item["verb"] === ACTIVITY_ATTENDNO)
+                               || ($item["verb"] === ACTIVITY_ATTENDMAYBE)) {
+                               $is_like = true;
+                               $item["type"] = "activity";
+                               $item["gravity"] = GRAVITY_LIKE;
+                               // only one like or dislike per person
+                               // splitted into two queries for performance issues
+                               $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
+                                       intval($item["uid"]),
+                                       dbesc($item["author-link"]),
+                                       dbesc($item["verb"]),
+                                       dbesc($item["parent-uri"])
+                               );
+                               if($r && count($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["author-link"]),
+                                       dbesc($item["verb"]),
+                                       dbesc($item["parent-uri"])
+                               );
+                               if($r && count($r))
+                                       return false;
+                       } else
+                               $is_like = false;
+
+                       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) {
+                                       $r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($xt->id),
+                                               intval($importer["importer_uid"])
+                                       );
+
+                                       if(!count($r))
+                                               return false;
+
+                                       // extract tag, if not duplicate, add to parent item
+                                       if($xo->content) {
+                                               if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+                                                       q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
+                                                               dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+                                                               intval($r[0]["id"])
+                                                       );
+                                                       create_tags_from_item($r[0]["id"]);
+                                               }
+                                       }
+                               }
+                       }
+               }
+               return true;
+       }
+
+       /**
+        * @brief Processes the link elements
+        *
+        * @param object $links link elements
+        * @param array $item the item record
+        */
+       private function parse_links($links, &$item) {
+               $rel = "";
+               $href = "";
+               $type = "";
+               $length = "0";
+               $title = "";
+               foreach ($links AS $link) {
+                       foreach($link->attributes AS $attributes) {
+                               if ($attributes->name == "href")
+                                       $href = $attributes->textContent;
+                               if ($attributes->name == "rel")
+                                       $rel = $attributes->textContent;
+                               if ($attributes->name == "type")
+                                       $type = $attributes->textContent;
+                               if ($attributes->name == "length")
+                                       $length = $attributes->textContent;
+                               if ($attributes->name == "title")
+                                       $title = $attributes->textContent;
+                       }
+                       if (($rel != "") AND ($href != ""))
+                               switch($rel) {
+                                       case "alternate":
+                                               $item["plink"] = $href;
+                                               break;
+                                       case "enclosure":
+                                               $enclosure = $href;
+                                               if(strlen($item["attach"]))
+                                                       $item["attach"] .= ",";
+
+                                               $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+                                               break;
+                               }
+               }
+       }
+
+       /**
+        * @brief Processes the entry elements which contain the items and comments
+        *
+        * @param array $header Array of the header elements that always stay the same
+        * @param object $xpath XPath object
+        * @param object $entry entry elements
+        * @param array $importer Record of the importer user mixed with contact of the content
+        */
        private function process_entry($header, $xpath, $entry, $importer) {
 
                logger("Processing entries");
@@ -1739,6 +1968,8 @@ class dfrn {
                        $item['body'] = @html2bbcode($item['body']);
                }
 
+               /// @todo We should check for a repeated post and if we know the repeated author.
+
                // We don't need the content element since "dfrn:env" is always present
                //$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
 
@@ -1805,40 +2036,8 @@ class dfrn {
                $enclosure = "";
 
                $links = $xpath->query("atom:link", $entry);
-               if ($links) {
-                       $rel = "";
-                       $href = "";
-                       $type = "";
-                       $length = "0";
-                       $title = "";
-                       foreach ($links AS $link) {
-                               foreach($link->attributes AS $attributes) {
-                                       if ($attributes->name == "href")
-                                               $href = $attributes->textContent;
-                                       if ($attributes->name == "rel")
-                                               $rel = $attributes->textContent;
-                                       if ($attributes->name == "type")
-                                               $type = $attributes->textContent;
-                                       if ($attributes->name == "length")
-                                               $length = $attributes->textContent;
-                                       if ($attributes->name == "title")
-                                               $title = $attributes->textContent;
-                               }
-                               if (($rel != "") AND ($href != ""))
-                                       switch($rel) {
-                                               case "alternate":
-                                                       $item["plink"] = $href;
-                                                       break;
-                                               case "enclosure":
-                                                       $enclosure = $href;
-                                                       if(strlen($item["attach"]))
-                                                               $item["attach"] .= ",";
-
-                                                       $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
-                                                       break;
-                                       }
-                       }
-               }
+               if ($links)
+                       self::parse_links($links, $item);
 
                // Is it a reply or a top level posting?
                $item["parent-uri"] = $item["uri"];
@@ -1868,6 +2067,15 @@ class dfrn {
 
                        if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
                                $item["network"] = $author["network"];
+
+                       // This code was taken from the old DFRN code
+                       // When activated, forums don't work.
+                       // And: Why should we disallow commenting by followers?
+                       // the behaviour is now similar to the Diaspora part.
+                       //if($importer["rel"] == CONTACT_IS_FOLLOWER) {
+                       //      logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
+                       //      return;
+                       //}
                }
 
                if ($entrytype == DFRN_REPLY_RC) {
@@ -1877,6 +2085,7 @@ class dfrn {
                        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"]);
@@ -1901,35 +2110,6 @@ class dfrn {
                                        return;
                                }
                        }
-
-                       // The filling of the the "contact" variable is done for legcy reasons
-                       // The functions below are partly used by ostatus.php as well - where we have this variable
-                       $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
-                       $contact = $r[0];
-                       $nickname = $contact["nick"];
-
-                       // 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)) {
-                               logger('New follower');
-                               new_follower($importer, $contact, $item, $nickname);
-                               return;
-                       }
-                       if(activity_match($item['verb'],ACTIVITY_UNFOLLOW))  {
-                               logger('Lost follower');
-                               lose_follower($importer, $contact, $item);
-                               return;
-                       }
-                       if(activity_match($item['verb'],ACTIVITY_REQ_FRIEND)) {
-                               logger('New friend request');
-                               new_follower($importer, $contact, $item, $nickname, true);
-                               return;
-                       }
-                       if(activity_match($item['verb'],ACTIVITY_UNFRIEND))  {
-                               logger('Lost sharer');
-                               lose_sharer($importer, $contact, $item);
-                               return;
-                       }
                }
 
                $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -1937,6 +2117,11 @@ class dfrn {
                        intval($importer["importer_uid"])
                );
 
+               if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
+                       logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
+                       return;
+               }
+
                // Update content if 'updated' changes
                if(count($r)) {
                        if (self::update_content($r[0], $item, $importer, $entrytype))
@@ -1947,69 +2132,6 @@ class dfrn {
                }
 
                if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
-                       if($importer["rel"] == CONTACT_IS_FOLLOWER) {
-                               logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
-                               return;
-                       }
-
-                       if(($item["verb"] === ACTIVITY_LIKE)
-                               || ($item["verb"] === ACTIVITY_DISLIKE)
-                               || ($item["verb"] === ACTIVITY_ATTEND)
-                               || ($item["verb"] === ACTIVITY_ATTENDNO)
-                               || ($item["verb"] === ACTIVITY_ATTENDMAYBE)) {
-                               $is_like = true;
-                               $item["type"] = "activity";
-                               $item["gravity"] = GRAVITY_LIKE;
-                               // 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($r && count($r))
-                                       return;
-
-                               $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($r && count($r))
-                                       return;
-
-                       } else
-                               $is_like = false;
-
-                       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) {
-                                       $r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($xt->id),
-                                               intval($importer["importer_uid"])
-                                       );
-
-                                       if(!count($r))
-                                               return;
-
-                                       // extract tag, if not duplicate, add to parent item
-                                       if($xo->content) {
-                                               if(!(stristr($r[0]["tag"],trim($xo->content)))) {
-                                                       q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
-                                                               dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
-                                                               intval($r[0]["id"])
-                                                       );
-                                                       create_tags_from_item($r[0]["id"]);
-                                               }
-                                       }
-                               }
-                       }
-
                        $posted_id = item_store($item);
                        $parent = 0;
 
@@ -2049,7 +2171,7 @@ class dfrn {
 
                                return true;
                        }
-               } else {
+               } 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.
@@ -2079,7 +2201,14 @@ class dfrn {
                }
        }
 
-       private function process_deletion($header, $xpath, $deletion, $importer) {
+       /**
+        * @brief Deletes items
+        *
+        * @param object $xpath XPath object
+        * @param object $deletion deletion elements
+        * @param array $importer Record of the importer user mixed with contact of the content
+        */
+       private function process_deletion($xpath, $deletion, $importer) {
 
                logger("Processing deletions");
 
@@ -2219,7 +2348,7 @@ class dfrn {
         * @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
         */
-       function import($xml,$importer, $sort_by_date = false) {
+       public static function import($xml,$importer, $sort_by_date = false) {
 
                if ($xml == "")
                        return;
@@ -2255,8 +2384,14 @@ class dfrn {
                $header["contact-id"] = $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)
+                       self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
+
                // Only the "dfrn:owner" in the head section contains all data
-               self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false);
+               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);
 
@@ -2283,7 +2418,7 @@ class dfrn {
 
                $deletions = $xpath->query("/atom:feed/at:deleted-entry");
                foreach ($deletions AS $deletion)
-                       self::process_deletion($header, $xpath, $deletion, $importer);
+                       self::process_deletion($xpath, $deletion, $importer);
 
                if (!$sort_by_date) {
                        $entries = $xpath->query("/atom:feed/atom:entry");