]> git.mxchange.org Git - friendica.git/commitdiff
Code beautification
authorMichael Vogel <icarus@dabo.de>
Mon, 1 Feb 2016 22:52:37 +0000 (23:52 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 1 Feb 2016 22:52:37 +0000 (23:52 +0100)
include/import-dfrn.php

index 0e185d3f44e4a9219a85649a7f7c9ca5f3878d46..bfcb002bb13df373ebddd1b7b2bd51107d68e15a 100644 (file)
@@ -18,9 +18,9 @@ require_once("include/items.php");
 require_once("include/tags.php");
 require_once("include/files.php");
 
-define('DFRN_TOP_LEVEL', 0);
-define('DFRN_REPLY', 1);
-define('DFRN_REPLY_RC', 2);
+define("DFRN_TOP_LEVEL", 0);
+define("DFRN_REPLY", 1);
+define("DFRN_REPLY_RC", 2);
 
 class dfrn2 {
 
@@ -33,23 +33,23 @@ class dfrn2 {
         */
        private function birthday_event($contact, $birthday) {
 
-               logger('updating birthday: '.$birthday.' for contact '.$contact['id']);
+               logger("updating birthday: ".$birthday." for contact ".$contact["id"]);
 
-               $bdtext = sprintf(t('%s\'s birthday'), $contact['name']);
-               $bdtext2 = sprintf(t('Happy Birthday %s'), ' [url=' . $contact['url'].']'.$contact['name'].'[/url]') ;
+               $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
+               $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ;
 
 
                $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
-                       intval($contact['uid']),
-                       intval($contact['id']),
+                       intval($contact["uid"]),
+                       intval($contact["id"]),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
-                       dbesc(datetime_convert('UTC','UTC', $birthday)),
-                       dbesc(datetime_convert('UTC','UTC', $birthday.' + 1 day ')),
+                       dbesc(datetime_convert("UTC","UTC", $birthday)),
+                       dbesc(datetime_convert("UTC","UTC", $birthday." + 1 day ")),
                        dbesc($bdtext),
                        dbesc($bdtext2),
-                       dbesc('birthday')
+                       dbesc("birthday")
                );
        }
 
@@ -68,8 +68,8 @@ class dfrn2 {
        private function fetchauthor($xpath, $context, $importer, $element, $contact, $onlyfetch) {
 
                $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;
+               $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`,
                                `name`, `nick`, `about`, `location`, `keywords`, `bdyear`, `bd`
@@ -124,23 +124,23 @@ class dfrn2 {
                                        $contact["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 != "")
                                $contact["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 != "")
                                $contact["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 != "")
                                $contact["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 != "")
                                $contact["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 != "")
                                $contact["location"] = $value;
 
@@ -154,7 +154,7 @@ class dfrn2 {
 
                        // 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;
 
@@ -164,7 +164,7 @@ class dfrn2 {
                        // "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);
@@ -173,7 +173,7 @@ class dfrn2 {
                        }
 
                        // "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"))) {
                                $bdyear = date("Y");
@@ -229,27 +229,27 @@ class dfrn2 {
                if (!is_object($activity))
                        return "";
 
-               $obj_doc = new DOMDocument('1.0', 'utf-8');
+               $obj_doc = new DOMDocument("1.0", "utf-8");
                $obj_doc->formatOutput = true;
 
                $obj_element = $obj_doc->createElementNS(NAMESPACE_ATOM1, $element);
 
-               $activity_type = $xpath->query('activity:object-type/text()', $activity)->item(0)->nodeValue;
+               $activity_type = $xpath->query("activity:object-type/text()", $activity)->item(0)->nodeValue;
                xml_add_element($obj_doc, $obj_element, "type", $activity_type);
 
-               $id = $xpath->query('atom:id', $activity)->item(0);
+               $id = $xpath->query("atom:id", $activity)->item(0);
                if (is_object($id))
                        $obj_element->appendChild($obj_doc->importNode($id, true));
 
-               $title = $xpath->query('atom:title', $activity)->item(0);
+               $title = $xpath->query("atom:title", $activity)->item(0);
                if (is_object($title))
                        $obj_element->appendChild($obj_doc->importNode($title, true));
 
-               $link = $xpath->query('atom:link', $activity)->item(0);
+               $link = $xpath->query("atom:link", $activity)->item(0);
                if (is_object($link))
                        $obj_element->appendChild($obj_doc->importNode($link, true));
 
-               $content = $xpath->query('atom:content', $activity)->item(0);
+               $content = $xpath->query("atom:content", $activity)->item(0);
                if (is_object($content))
                        $obj_element->appendChild($obj_doc->importNode($content, true));
 
@@ -258,7 +258,7 @@ class dfrn2 {
                $objxml = $obj_doc->saveXML($obj_element);
 
                // @todo This isn't totally clean. We should find a way to transform the namespaces
-               $objxml = str_replace('<'.$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
+               $objxml = str_replace("<".$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
                return($objxml);
        }
 
@@ -267,16 +267,16 @@ class dfrn2 {
                logger("Processing mails");
 
                $msg = array();
-               $msg["uid"] = $importer['importer_uid'];
-               $msg["from-name"] = $xpath->query('dfrn:sender/dfrn:name/text()', $mail)->item(0)->nodeValue;
-               $msg["from-url"] = $xpath->query('dfrn:sender/dfrn:uri/text()', $mail)->item(0)->nodeValue;
-               $msg["from-photo"] = $xpath->query('dfrn:sender/dfrn:avatar/text()', $mail)->item(0)->nodeValue;
+               $msg["uid"] = $importer["importer_uid"];
+               $msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
+               $msg["from-url"] = $xpath->query("dfrn:sender/dfrn:uri/text()", $mail)->item(0)->nodeValue;
+               $msg["from-photo"] = $xpath->query("dfrn:sender/dfrn:avatar/text()", $mail)->item(0)->nodeValue;
                $msg["contact-id"] = $importer["id"];
-               $msg["uri"] = $xpath->query('dfrn:id/text()', $mail)->item(0)->nodeValue;
-               $msg["parent-uri"] = $xpath->query('dfrn:in-reply-to/text()', $mail)->item(0)->nodeValue;
-               $msg["created"] = $xpath->query('dfrn:sentdate/text()', $mail)->item(0)->nodeValue;
-               $msg["title"] = $xpath->query('dfrn:subject/text()', $mail)->item(0)->nodeValue;
-               $msg["body"] = $xpath->query('dfrn:content/text()', $mail)->item(0)->nodeValue;
+               $msg["uri"] = $xpath->query("dfrn:id/text()", $mail)->item(0)->nodeValue;
+               $msg["parent-uri"] = $xpath->query("dfrn:in-reply-to/text()", $mail)->item(0)->nodeValue;
+               $msg["created"] = $xpath->query("dfrn:sentdate/text()", $mail)->item(0)->nodeValue;
+               $msg["title"] = $xpath->query("dfrn:subject/text()", $mail)->item(0)->nodeValue;
+               $msg["body"] = $xpath->query("dfrn:content/text()", $mail)->item(0)->nodeValue;
                $msg["seen"] = 0;
                $msg["replied"] = 0;
 
@@ -287,18 +287,18 @@ class dfrn2 {
                // send notifications.
 
                $notif_params = array(
-                       'type' => NOTIFY_MAIL,
-                       'notify_flags' => $importer['notify-flags'],
-                       'language' => $importer['language'],
-                       'to_name' => $importer['username'],
-                       'to_email' => $importer['email'],
-                       'uid' => $importer['importer_uid'],
-                       'item' => $msg,
-                       'source_name' => $msg['from-name'],
-                       'source_link' => $importer['url'],
-                       'source_photo' => $importer['thumb'],
-                       'verb' => ACTIVITY_POST,
-                       'otype' => 'mail'
+                       "type" => NOTIFY_MAIL,
+                       "notify_flags" => $importer["notify-flags"],
+                       "language" => $importer["language"],
+                       "to_name" => $importer["username"],
+                       "to_email" => $importer["email"],
+                       "uid" => $importer["importer_uid"],
+                       "item" => $msg,
+                       "source_name" => $msg["from-name"],
+                       "source_link" => $importer["url"],
+                       "source_photo" => $importer["thumb"],
+                       "verb" => ACTIVITY_POST,
+                       "otype" => "mail"
                );
 
                notification($notif_params);
@@ -311,11 +311,11 @@ class dfrn2 {
                $suggest = array();
                $suggest["uid"] = $importer["importer_uid"];
                $suggest["cid"] = $importer["id"];
-               $suggest["url"] = $xpath->query('dfrn:url/text()', $suggestion)->item(0)->nodeValue;
-               $suggest["name"] = $xpath->query('dfrn:name/text()', $suggestion)->item(0)->nodeValue;
-               $suggest["photo"] = $xpath->query('dfrn:photo/text()', $suggestion)->item(0)->nodeValue;
-               $suggest["request"] = $xpath->query('dfrn:request/text()', $suggestion)->item(0)->nodeValue;
-               $suggest["body"] = $xpath->query('dfrn:note/text()', $suggestion)->item(0)->nodeValue;
+               $suggest["url"] = $xpath->query("dfrn:url/text()", $suggestion)->item(0)->nodeValue;
+               $suggest["name"] = $xpath->query("dfrn:name/text()", $suggestion)->item(0)->nodeValue;
+               $suggest["photo"] = $xpath->query("dfrn:photo/text()", $suggestion)->item(0)->nodeValue;
+               $suggest["request"] = $xpath->query("dfrn:request/text()", $suggestion)->item(0)->nodeValue;
+               $suggest["body"] = $xpath->query("dfrn:note/text()", $suggestion)->item(0)->nodeValue;
 
                // Does our member already have a friend matching this description?
 
@@ -379,19 +379,19 @@ class dfrn2 {
                );
 
                notification(array(
-                       'type'         => NOTIFY_SUGGEST,
-                       'notify_flags' => $importer["notify-flags"],
-                       'language'     => $importer["language"],
-                       'to_name'      => $importer["username"],
-                       'to_email'     => $importer["email"],
-                       'uid'          => $importer["importer_uid"],
-                       'item'         => $suggest,
-                       'link'         => App::get_baseurl()."/notifications/intros",
-                       'source_name'  => $importer["name"],
-                       'source_link'  => $importer["url"],
-                       'source_photo' => $importer["photo"],
-                       'verb'         => ACTIVITY_REQ_FRIEND,
-                       'otype'        => "intro"
+                       "type"         => NOTIFY_SUGGEST,
+                       "notify_flags" => $importer["notify-flags"],
+                       "language"     => $importer["language"],
+                       "to_name"      => $importer["username"],
+                       "to_email"     => $importer["email"],
+                       "uid"          => $importer["importer_uid"],
+                       "item"         => $suggest,
+                       "link"         => App::get_baseurl()."/notifications/intros",
+                       "source_name"  => $importer["name"],
+                       "source_link"  => $importer["url"],
+                       "source_photo" => $importer["photo"],
+                       "verb"         => ACTIVITY_REQ_FRIEND,
+                       "otype"        => "intro"
                ));
 
                return true;
@@ -405,16 +405,16 @@ class dfrn2 {
                $relocate = array();
                $relocate["uid"] = $importer["importer_uid"];
                $relocate["cid"] = $importer["id"];
-               $relocate["url"] = $xpath->query('dfrn:url/text()', $relocation)->item(0)->nodeValue;
-               $relocate["name"] = $xpath->query('dfrn:name/text()', $relocation)->item(0)->nodeValue;
-               $relocate["photo"] = $xpath->query('dfrn:photo/text()', $relocation)->item(0)->nodeValue;
-               $relocate["thumb"] = $xpath->query('dfrn:thumb/text()', $relocation)->item(0)->nodeValue;
-               $relocate["micro"] = $xpath->query('dfrn:micro/text()', $relocation)->item(0)->nodeValue;
-               $relocate["request"] = $xpath->query('dfrn:request/text()', $relocation)->item(0)->nodeValue;
-               $relocate["confirm"] = $xpath->query('dfrn:confirm/text()', $relocation)->item(0)->nodeValue;
-               $relocate["notify"] = $xpath->query('dfrn:notify/text()', $relocation)->item(0)->nodeValue;
-               $relocate["poll"] = $xpath->query('dfrn:poll/text()', $relocation)->item(0)->nodeValue;
-               $relocate["sitepubkey"] = $xpath->query('dfrn:sitepubkey/text()', $relocation)->item(0)->nodeValue;
+               $relocate["url"] = $xpath->query("dfrn:url/text()", $relocation)->item(0)->nodeValue;
+               $relocate["name"] = $xpath->query("dfrn:name/text()", $relocation)->item(0)->nodeValue;
+               $relocate["photo"] = $xpath->query("dfrn:photo/text()", $relocation)->item(0)->nodeValue;
+               $relocate["thumb"] = $xpath->query("dfrn:thumb/text()", $relocation)->item(0)->nodeValue;
+               $relocate["micro"] = $xpath->query("dfrn:micro/text()", $relocation)->item(0)->nodeValue;
+               $relocate["request"] = $xpath->query("dfrn:request/text()", $relocation)->item(0)->nodeValue;
+               $relocate["confirm"] = $xpath->query("dfrn:confirm/text()", $relocation)->item(0)->nodeValue;
+               $relocate["notify"] = $xpath->query("dfrn:notify/text()", $relocation)->item(0)->nodeValue;
+               $relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
+               $relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
 
                // update contact
                $r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
@@ -479,60 +479,60 @@ class dfrn2 {
                return true;
        }
 
-       private function upate_content($current, $item, $importer, $entrytype) {
+       private function update_content($current, $item, $importer, $entrytype) {
                if (edited_timestamp_is_newer($current, $item)) {
 
                        // do not accept (ignore) an earlier edit than one we currently have.
-                       if(datetime_convert('UTC','UTC',$item['edited']) < $current['edited'])
+                       if(datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"])
                                return;
 
                        $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                               dbesc($item['title']),
-                               dbesc($item['body']),
-                               dbesc($item['tag']),
-                               dbesc(datetime_convert('UTC','UTC',$item['edited'])),
+                               dbesc($item["title"]),
+                               dbesc($item["body"]),
+                               dbesc($item["tag"]),
+                               dbesc(datetime_convert("UTC","UTC",$item["edited"])),
                                dbesc(datetime_convert()),
                                dbesc($item["uri"]),
-                               intval($importer['importer_uid'])
+                               intval($importer["importer_uid"])
                        );
-                       create_tags_from_itemuri($item["uri"], $importer['importer_uid']);
-                       update_thread_uri($item["uri"], $importer['importer_uid']);
+                       create_tags_from_itemuri($item["uri"], $importer["importer_uid"]);
+                       update_thread_uri($item["uri"], $importer["importer_uid"]);
 
                        if ($entrytype == DFRN_REPLY_RC)
-                               proc_run('php',"include/notifier.php","comment-import",$current["id"]);
+                               proc_run("php", "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"] AND ($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"]),
-                               intval($importer['importer_uid'])
+                               intval($importer["importer_uid"])
                        );
                        $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
                                intval($item["last-child"]),
                                dbesc(datetime_convert()),
                                dbesc($item["uri"]),
-                               intval($importer['importer_uid'])
+                               intval($importer["importer_uid"])
                        );
                }
        }
 
-       private function get_entry_type($is_reply, $importer, $item) {
-               if ($is_reply) {
+       private 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) {
-                               $sql_extra = '';
+                       if($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
+                               $sql_extra = "";
                                $community = true;
-                               logger('possible community reply');
+                               logger("possible community action");
                        } else
-                               $sql_extra = " and contact.self = 1 and item.wall = 1 ";
+                               $sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
 
-                       // was the top-level post for this reply written by somebody on this site?
+                       // was the top-level post for this action written by somebody on this site?
                        // Specifically, the recipient?
 
-                       $is_a_remote_comment = false;
+                       $is_a_remote_action = false;
 
                        $r = q("SELECT `item`.`parent-uri` FROM `item`
                                WHERE `item`.`uri` = '%s'
@@ -546,37 +546,81 @@ class dfrn2 {
                                        AND `item`.`uid` = %d
                                        $sql_extra
                                        LIMIT 1",
-                                       dbesc($r[0]['parent-uri']),
-                                       dbesc($r[0]['parent-uri']),
-                                       dbesc($r[0]['parent-uri']),
-                                       intval($importer['importer_uid'])
+                                       dbesc($r[0]["parent-uri"]),
+                                       dbesc($r[0]["parent-uri"]),
+                                       dbesc($r[0]["parent-uri"]),
+                                       intval($importer["importer_uid"])
                                );
                                if($r && count($r))
-                                       $is_a_remote_comment = true;
+                                       $is_a_remote_action = true;
                        }
 
-                       // Does this have the characteristics of a community or private group comment?
-                       // If it's a reply to a wall post on a community/prvgroup page it's a
-                       // valid community comment. Also forum_mode makes it valid for sure.
+                       // 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_comment && $community) {
-                               if((!$r[0]['forum_mode']) && (!$r[0]['wall'])) {
-                                       $is_a_remote_comment = false;
-                                       logger('not a community reply');
+                       if($is_a_remote_action && $community) {
+                               if((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+                                       $is_a_remote_action = false;
+                                       logger("not a community action");
                                }
                        }
-               } else {
-                       $is_reply = false;
-                       $is_a_remote_comment = false;
-               }
 
-               if ($is_a_remote_comment)
-                       return DFRN_REPLY_RC;
-               elseif ($is_reply)
-                       return DFRN_REPLY;
-               else
+                       if ($is_a_remote_action)
+                               return DFRN_REPLY_RC;
+                       else
+                               return DFRN_REPLY;
+
+               } else
                        return DFRN_TOP_LEVEL;
+
+       }
+
+       private function do_poke($item, $importer, $posted_id) {
+               $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
+               if(!$verb)
+                       return;
+               $xo = parse_xml_string($item["object"],false);
+
+               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) {
+                               $atts = $l->attributes();
+                               switch($atts["rel"]) {
+                                       case "alternate":
+                                               $Blink = $atts["href"];
+                                               break;
+                                       default:
+                                               break;
+                               }
+                       }
+                       if($Blink && link_compare($Blink,$a->get_baseurl()."/profile/".$importer["nickname"])) {
+
+                               // send a notification
+                               notification(array(
+                                       "type"         => NOTIFY_POKE,
+                                       "notify_flags" => $importer["notify-flags"],
+                                       "language"     => $importer["language"],
+                                       "to_name"      => $importer["username"],
+                                       "to_email"     => $importer["email"],
+                                       "uid"          => $importer["importer_uid"],
+                                       "item"         => $item,
+                                       "link"         => $a->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"]))
+                                               ? $importer["thumb"] : $item["author-avatar"]),
+                                       "verb"         => $item["verb"],
+                                       "otype"        => "person",
+                                       "activity"     => $verb,
+                                       "parent"       => $item["parent"]
+                               ));
+                       }
+               }
        }
 
        private function process_entry($header, $xpath, $entry, $importer, $contact) {
@@ -586,7 +630,7 @@ class dfrn2 {
                $item = $header;
 
                // Get the uri
-               $item["uri"] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue;
+               $item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
 
                // Fetch the owner
                $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", $contact, true);
@@ -614,12 +658,12 @@ class dfrn2 {
                if (($header["network"] != $author["network"]) AND ($author["network"] != ""))
                        $item["network"] = $author["network"];
 
-               $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+               $item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
 
-               $item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
-               $item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
+               $item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+               $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
 
-               $item["body"] = $xpath->query('dfrn:env/text()', $entry)->item(0)->nodeValue;
+               $item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
                $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
                // make sure nobody is trying to sneak some html tags by us
                $item["body"] = notags(base64url_decode($item["body"]));
@@ -629,23 +673,23 @@ class dfrn2 {
                /// @todo Do we need the old check for HTML elements?
 
                // 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["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
 
-               $item["last-child"] = $xpath->query('dfrn:comment-allow/text()', $entry)->item(0)->nodeValue;
-               $item["location"] = $xpath->query('dfrn:location/text()', $entry)->item(0)->nodeValue;
+               $item["last-child"] = $xpath->query("dfrn:comment-allow/text()", $entry)->item(0)->nodeValue;
+               $item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
 
-               $georsspoint = $xpath->query('georss:point', $entry);
+               $georsspoint = $xpath->query("georss:point", $entry);
                if ($georsspoint)
                        $item["coord"] = $georsspoint->item(0)->nodeValue;
 
-               $item["private"] = $xpath->query('dfrn:private/text()', $entry)->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;
+               $item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
 
-               if ($xpath->query('dfrn:extid/text()', $entry)->item(0)->nodeValue == "true")
+               if ($xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue == "true")
                        $item["bookmark"] = true;
 
-               $notice_info = $xpath->query('statusnet:notice_info', $entry);
+               $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")
@@ -653,32 +697,30 @@ class dfrn2 {
                        }
                }
 
-               $item["guid"] = $xpath->query('dfrn:diaspora_guid/text()', $entry)->item(0)->nodeValue;
+               $item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
 
-               // We store the data from "dfrn:diaspora_signature" in a later step. See some lines below
-               $item["dsprsig"] = unxmlify($xpath->query('dfrn:diaspora_signature/text()', $entry)->item(0)->nodeValue);
+               // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
+               $item["dsprsig"] = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
 
-               $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
+               $item["verb"] = $xpath->query("activity:verb/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;
+               if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "")
+                       $item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
 
-               // I have the feeling that we don't do anything with this data
-               $object = $xpath->query('activity:object', $entry)->item(0);
+               $object = $xpath->query("activity:object", $entry)->item(0);
                $item["object"] = self::transform_activity($xpath, $object, "object");
 
-               // Could someone explain what this is for?
-               $target = $xpath->query('activity:target', $entry)->item(0);
+               $target = $xpath->query("activity:target", $entry)->item(0);
                $item["target"] = self::transform_activity($xpath, $target, "target");
 
-               $categories = $xpath->query('atom:category', $entry);
+               $categories = $xpath->query("atom:category", $entry);
                if ($categories) {
                        foreach ($categories AS $category) {
                                foreach($category->attributes AS $attributes)
                                        if ($attributes->name == "term") {
                                                $term = $attributes->textContent;
                                                if(strlen($item["tag"]))
-                                                       $item["tag"] .= ',';
+                                                       $item["tag"] .= ",";
 
                                                $item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
                                        }
@@ -687,7 +729,7 @@ class dfrn2 {
 
                $enclosure = "";
 
-               $links = $xpath->query('atom:link', $entry);
+               $links = $xpath->query("atom:link", $entry);
                if ($links) {
                        $rel = "";
                        $href = "";
@@ -715,7 +757,7 @@ class dfrn2 {
                                                case "enclosure":
                                                        $enclosure = $href;
                                                        if(strlen($item["attach"]))
-                                                               $item["attach"] .= ',';
+                                                               $item["attach"] .= ",";
 
                                                        $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
                                                        break;
@@ -726,21 +768,22 @@ class dfrn2 {
                // Is it a reply or a top level posting?
                $item["parent-uri"] = $item["uri"];
 
-               $inreplyto = $xpath->query('thr:in-reply-to', $entry);
+               $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")
                                        $item["parent-uri"] = $attributes->textContent;
 
-               $entrytype = get_entry_type(( $item["parent-uri"] != $item["uri"]),  $importer, $item);
+               // Get the type of the item (Top level post, reply or remote reply)
+               $entrytype = get_entry_type($importer, $item);
 
                // Now assign the rest of the values that depend on the type of the message
                if ($entrytype == DFRN_REPLY_RC) {
                        if (!isset($item["object-type"]))
                                $item["object-type"] = ACTIVITY_OBJ_COMMENT;
 
-                       $item["type"] = 'remote-comment';
-                       $item['wall'] = 1;
+                       $item["type"] = "remote-comment";
+                       $item["wall"] = 1;
                } elseif ($entrytype == DFRN_REPLY) {
                        if (!isset($item["object-type"]))
                                $item["object-type"] = ACTIVITY_OBJ_COMMENT;
@@ -749,21 +792,21 @@ class dfrn2 {
                                $item["object-type"] = ACTIVITY_OBJ_NOTE;
 
                        if ($item["object-type"] === ACTIVITY_OBJ_EVENT) {
-                               $ev = bbtoevent($item['body']);
-                               if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) {
-                                       $ev['cid'] = $importer['id'];
-                                       $ev['uid'] = $importer['uid'];
-                                       $ev['uri'] = $item["uri"];
-                                       $ev['edited'] = $item['edited'];
+                               $ev = bbtoevent($item["body"]);
+                               if((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+                                       $ev["cid"] = $importer["id"];
+                                       $ev["uid"] = $importer["uid"];
+                                       $ev["uri"] = $item["uri"];
+                                       $ev["edited"] = $item["edited"];
                                        $ev['private'] = $item['private'];
-                                       $ev['guid'] = $item['guid'];
+                                       $ev["guid"] = $item["guid"];
 
-                                       $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       $r = q("SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                                dbesc($item["uri"]),
-                                               intval($importer['uid'])
+                                               intval($importer["uid"])
                                        );
                                        if(count($r))
-                                               $ev['id'] = $r[0]['id'];
+                                               $ev["id"] = $r[0]["id"];
                                                $xyz = event_store($ev);
                                                        return;
                                }
@@ -772,43 +815,43 @@ class dfrn2 {
 
                $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($item["uri"]),
-                       intval($importer['importer_uid'])
+                       intval($importer["importer_uid"])
                );
 
                // Update content if 'updated' changes
                if(count($r)) {
-                       self::upate_content($r[0], $item, $importer, $entrytype);
+                       self::update_content($r[0], $item, $importer, $entrytype);
                        return;
                }
 
                if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
-                       if($importer['rel'] == CONTACT_IS_FOLLOWER)
+                       if($importer["rel"] == CONTACT_IS_FOLLOWER)
                                return;
 
-                       if(($item['verb'] === ACTIVITY_LIKE)
-                               || ($item['verb'] === ACTIVITY_DISLIKE)
-                               || ($item['verb'] === ACTIVITY_ATTEND)
-                               || ($item['verb'] === ACTIVITY_ATTENDNO)
-                               || ($item['verb'] === ACTIVITY_ATTENDMAYBE)) {
+                       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;
+                               $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'])
+                                       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'])
+                                       intval($item["uid"]),
+                                       dbesc($item["author-link"]),
+                                       dbesc($item["verb"]),
+                                       dbesc($item["parent-uri"])
                                );
                                if($r && count($r))
                                        return;
@@ -816,15 +859,15 @@ class dfrn2 {
                        } 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);
+                               $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'])
+                                               intval($importer["importer_uid"])
                                        );
 
                                        if(!count($r))
@@ -832,12 +875,12 @@ class dfrn2 {
 
                                        // extract tag, if not duplicate, add to parent item
                                        if($xo->content) {
-                                               if(!(stristr($r[0]['tag'],trim($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'])
+                                                               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']);
+                                                       create_tags_from_item($r[0]["id"]);
                                                }
                                        }
                                }
@@ -852,46 +895,46 @@ class dfrn2 {
 
                                $r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                        intval($posted_id),
-                                       intval($importer['importer_uid'])
+                                       intval($importer["importer_uid"])
                                );
                                if(count($r)) {
-                                       $parent = $r[0]['parent'];
-                                       $parent_uri = $r[0]['parent-uri'];
+                                       $parent = $r[0]["parent"];
+                                       $parent_uri = $r[0]["parent-uri"];
                                }
 
                                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']),
-                                               intval($r[0]['parent'])
+                                               intval($importer["importer_uid"]),
+                                               intval($r[0]["parent"])
                                        );
 
                                        $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
                                                dbesc(datetime_convert()),
-                                               intval($importer['importer_uid']),
+                                               intval($importer["importer_uid"]),
                                                intval($posted_id)
                                        );
                                }
 
                                if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
-                                       proc_run('php',"include/notifier.php","comment-import","$posted_id");
+                                       proc_run("php", "include/notifier.php", "comment-import", $posted_id);
                                }
 
                                return true;
                        }
                } else {
-                       if(!link_compare($item['owner-link'],$importer['url'])) {
+                       if(!link_compare($item["owner-link"],$importer["url"])) {
                                // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
                                // but otherwise there's a possible data mixup on the sender's system.
                                // 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'];
+                               $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)))
                                return;
 
                        // This is my contact on another system, but it's really me.
@@ -900,53 +943,8 @@ class dfrn2 {
 
                        $posted_id = item_store($item, false, $notify);
 
-                       if(stristr($item['verb'],ACTIVITY_POKE)) {
-                               $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
-                               if(!$verb)
-                                       return;
-                               $xo = parse_xml_string($item['object'],false);
-
-                               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) {
-                                               $atts = $l->attributes();
-                                               switch($atts['rel']) {
-                                                       case "alternate":
-                                                               $Blink = $atts['href'];
-                                                               break;
-                                                       default:
-                                                               break;
-                                               }
-                                       }
-                                       if($Blink && link_compare($Blink,$a->get_baseurl() . '/profile/' . $importer['nickname'])) {
-
-                                               // send a notification
-                                               require_once('include/enotify.php');
-
-                                               notification(array(
-                                                       'type'         => NOTIFY_POKE,
-                                                       'notify_flags' => $importer['notify-flags'],
-                                                       'language'     => $importer['language'],
-                                                       'to_name'      => $importer['username'],
-                                                       'to_email'     => $importer['email'],
-                                                       'uid'          => $importer['importer_uid'],
-                                                       'item'         => $item,
-                                                       'link'             => $a->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']))
-                                                               ? $importer['thumb'] : $item['author-avatar']),
-                                                       'verb'         => $item['verb'],
-                                                       'otype'        => 'person',
-                                                       'activity'     => $verb,
-                                                       'parent'       => $item['parent']
-                                               ));
-                                       }
-                               }
-                       }
+                       if(stristr($item["verb"],ACTIVITY_POKE))
+                               self::do_poke($item, $importer, $posted_id);
                }
        }
 
@@ -961,84 +959,31 @@ class dfrn2 {
                                $when = $attributes->textContent;
                }
                if ($when)
-                       $when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
+                       $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
                else
-                       $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+                       $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
 
                if (!$uri OR !$contact_id)
                        return false;
 
-
-               $is_reply = false;
-               $r = q("SELECT `id`, `parent-uri`, `parent` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc($uri),
-                       intval($importer['importer_uid'])
-               );
-               if(count($r)) {
-                       $parent_uri = $r[0]['parent-uri'];
-                       if($r[0]['id'] != $r[0]['parent'])
-                               $is_reply = true;
-               }
-
-               if($is_reply) {
-                       $community = false;
-
-                       if($importer['page-flags'] == PAGE_COMMUNITY || $importer['page-flags'] == PAGE_PRVGROUP) {
-                               $sql_extra = '';
-                               $community = true;
-                               logger('possible community delete');
-                       } else
-                               $sql_extra = " AND `contact`.`self` AND `item`.`wall`";
-
-                       // was the top-level post for this reply written by somebody on this site?
-                       // Specifically, the recipient?
-
-                       $is_a_remote_delete = false;
-
-                       $r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
-                               INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                               WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
-                               AND `item`.`uid` = %d
-                               $sql_extra
-                               LIMIT 1",
-                               dbesc($parent_uri),
-                               dbesc($parent_uri),
-                               dbesc($parent_uri),
-                               intval($importer['importer_uid'])
-                       );
-                       if($r && count($r))
-                               $is_a_remote_delete = true;
-
-                       // Does this have the characteristics of a community or private group comment?
-                       // If it's a reply to a wall post on a community/prvgroup page it's a
-                       // valid community comment. Also forum_mode makes it valid for sure.
-                       // If neither, it's not.
-
-                       if($is_a_remote_delete && $community) {
-                               if((!$r[0]['forum_mode']) && (!$r[0]['wall'])) {
-                                       $is_a_remote_delete = false;
-                                       logger('not a community delete');
-                               }
-                       }
-
-                       if($is_a_remote_delete) {
-                               logger('received remote delete');
-                       }
-               }
-
+               /// @todo Only select the used fields
                $r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
                                WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
                                dbesc($uri),
                                intval($importer["uid"]),
                                intval($contact_id)
                        );
-               if(!count($r))
+               if(!count($r)) {
                        logger("Item with uri ".$uri." from contact ".$contact_id." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
-               else {
+                       return;
+               } else {
+
                        $item = $r[0];
 
+                       $entrytype = get_entry_type($importer, $item);
+
                        if(!$item["deleted"])
-                               logger('deleting item '.$item["id"].' uri='.$item['uri'], LOGGER_DEBUG);
+                               logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
                        else
                                return;
 
@@ -1059,14 +1004,14 @@ class dfrn2 {
 
                                                // For tags, the owner cannot remove the tag on the author's copy of the post.
 
-                                               $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
-                                               $author_remove = (($item['origin'] && $item['self']) ? true : false);
-                                               $author_copy = (($item['origin']) ? true : false);
+                                               $owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
+                                               $author_remove = (($item["origin"] && $item["self"]) ? true : false);
+                                               $author_copy = (($item["origin"]) ? true : false);
 
                                                if($owner_remove && $author_copy)
                                                        return;
                                                if($author_remove || $owner_remove) {
-                                                       $tags = explode(',',$i[0]['tag']);
+                                                       $tags = explode(',',$i[0]["tag"]);
                                                        $newtags = array();
                                                        if(count($tags)) {
                                                                foreach($tags as $tag)
@@ -1075,26 +1020,26 @@ class dfrn2 {
                                                        }
                                                        q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
                                                                dbesc(implode(',',$newtags)),
-                                                               intval($i[0]['id'])
+                                                               intval($i[0]["id"])
                                                        );
-                                                       create_tags_from_item($i[0]['id']);
+                                                       create_tags_from_item($i[0]["id"]);
                                                }
                                        }
                                }
                        }
 
-                       if($item['uri'] == $item['parent-uri']) {
+                       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",
                                                dbesc($when),
                                                dbesc(datetime_convert()),
-                                               dbesc($item['uri']),
-                                               intval($importer['uid'])
+                                               dbesc($uri),
+                                               intval($importer["uid"])
                                        );
-                               create_tags_from_itemuri($item['uri'], $importer['uid']);
-                               create_files_from_itemuri($item['uri'], $importer['uid']);
-                               update_thread_uri($item['uri'], $importer['uid']);
+                               create_tags_from_itemuri($uri, $importer["uid"]);
+                               create_files_from_itemuri($uri, $importer["uid"]);
+                               update_thread_uri($uri, $importer["uid"]);
                        } else {
                                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
                                                `body` = '', `title` = ''
@@ -1102,34 +1047,34 @@ class dfrn2 {
                                                dbesc($when),
                                                dbesc(datetime_convert()),
                                                dbesc($uri),
-                                               intval($importer['uid'])
+                                               intval($importer["uid"])
                                        );
-                               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']) {
+                               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"]) {
                                        // 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()),
-                                               dbesc($item['parent-uri']),
-                                               intval($item['uid'])
+                                               dbesc($item["parent-uri"]),
+                                               intval($item["uid"])
                                        );
                                        // who is the last child now?
                                        $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
                                                ORDER BY `created` DESC LIMIT 1",
-                                                       dbesc($item['parent-uri']),
-                                                       intval($importer['uid'])
+                                                       dbesc($item["parent-uri"]),
+                                                       intval($importer["uid"])
                                        );
                                        if(count($r)) {
                                                q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
-                                                       intval($r[0]['id'])
+                                                       intval($r[0]["id"])
                                                );
                                        }
                                }
                                // if this is a relayed delete, propagate it to other recipients
 
-                               if($is_a_remote_delete)
-                                       proc_run('php',"include/notifier.php","drop",$item['id']);
+                               if($entrytype == DFRN_REPLY_RC)
+                                       proc_run("php", "include/notifier.php","drop", $item["id"]);
                        }
                }
        }
@@ -1143,17 +1088,18 @@ class dfrn2 {
                @$doc->loadXML($xml);
 
                $xpath = new DomXPath($doc);
-               $xpath->registerNamespace('atom', NAMESPACE_ATOM1);
-               $xpath->registerNamespace('thr', NAMESPACE_THREAD);
-               $xpath->registerNamespace('at', NAMESPACE_TOMB);
-               $xpath->registerNamespace('media', NAMESPACE_MEDIA);
-               $xpath->registerNamespace('dfrn', NAMESPACE_DFRN);
-               $xpath->registerNamespace('activity', NAMESPACE_ACTIVITY);
-               $xpath->registerNamespace('georss', NAMESPACE_GEORSS);
-               $xpath->registerNamespace('poco', NAMESPACE_POCO);
-               $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
-               $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
-
+               $xpath->registerNamespace("atom", NAMESPACE_ATOM1);
+               $xpath->registerNamespace("thr", NAMESPACE_THREAD);
+               $xpath->registerNamespace("at", NAMESPACE_TOMB);
+               $xpath->registerNamespace("media", NAMESPACE_MEDIA);
+               $xpath->registerNamespace("dfrn", NAMESPACE_DFRN);
+               $xpath->registerNamespace("activity", NAMESPACE_ACTIVITY);
+               $xpath->registerNamespace("georss", NAMESPACE_GEORSS);
+               $xpath->registerNamespace("poco", NAMESPACE_POCO);
+               $xpath->registerNamespace("ostatus", NAMESPACE_OSTATUS);
+               $xpath->registerNamespace("statusnet", NAMESPACE_STATUSNET);
+
+               /// @todo Do we need this?
                if (!$contact) {
                        $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `self`", intval($importer["uid"]));
                        $contact = $r[0];
@@ -1179,7 +1125,7 @@ class dfrn2 {
                //}
 
                // is it a public forum? Private forums aren't supported by now with this method
-               $forum = intval($xpath->evaluate('/atom:feed/dfrn:community/text()', $context)->item(0)->nodeValue);
+               $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
 
                if ($forum AND ($dfrn_owner["contact-id"] != 0))
                        q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
@@ -1187,23 +1133,23 @@ class dfrn2 {
                                intval($dfrn_owner["contact-id"])
                        );
 
-               $mails = $xpath->query('/atom:feed/dfrn:mail');
+               $mails = $xpath->query("/atom:feed/dfrn:mail");
                foreach ($mails AS $mail)
                        self::process_mail($xpath, $mail, $importer);
 
-               $suggestions = $xpath->query('/atom:feed/dfrn:suggest');
+               $suggestions = $xpath->query("/atom:feed/dfrn:suggest");
                foreach ($suggestions AS $suggestion)
                        self::process_suggestion($xpath, $suggestion, $importer);
 
-               $relocations = $xpath->query('/atom:feed/dfrn:relocate');
+               $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');
+               $deletions = $xpath->query("/atom:feed/at:deleted-entry");
                foreach ($deletions AS $deletion)
                        self::process_deletion($header, $xpath, $deletion, $importer, $dfrn_owner["contact-id"]);
 
-               $entries = $xpath->query('/atom:feed/atom:entry');
+               $entries = $xpath->query("/atom:feed/atom:entry");
                foreach ($entries AS $entry)
                        self::process_entry($header, $xpath, $entry, $importer, $contact);
        }