]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
[friendica.git] / include / items.php
index cf044d883738716bcc917f84e25f211ab1076c3c..da9147faddddd4da00cc2d7050b74cfe6c2d7dd2 100644 (file)
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @file include/items.php
+ */
+
+use \Friendica\ParseUrl;
+
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/salmon.php');
@@ -16,11 +22,14 @@ require_once('include/ostatus.php');
 require_once('include/feed.php');
 require_once('include/Contact.php');
 require_once('mod/share.php');
+require_once('include/enotify.php');
+require_once('include/dfrn.php');
+require_once('include/group.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
 function construct_verb($item) {
-       if($item['verb'])
+       if ($item['verb'])
                return $item['verb'];
        return ACTIVITY_POST;
 }
@@ -30,7 +39,7 @@ function construct_verb($item) {
  *             The purpose of this function is to apply system message length limits to
  *             imported messages without including any embedded photos in the length
  */
-if(! function_exists('limit_body_size')) {
+if (! function_exists('limit_body_size')) {
 function limit_body_size($body) {
 
 //     logger('limit_body_size: start', LOGGER_DEBUG);
@@ -39,7 +48,7 @@ function limit_body_size($body) {
 
        // If the length of the body, including the embedded images, is smaller
        // than the maximum, then don't waste time looking for the images
-       if($maxlen && (strlen($body) > $maxlen)) {
+       if ($maxlen && (strlen($body) > $maxlen)) {
 
                logger('limit_body_size: the total body length exceeds the limit', LOGGER_DEBUG);
 
@@ -57,40 +66,37 @@ function limit_body_size($body) {
                        $img_end += $img_start;
                        $img_end += strlen('[/img]');
 
-                       if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+                       if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
                                // This is an embedded image
 
-                               if( ($textlen + $img_start) > $maxlen ) {
-                                       if($textlen < $maxlen) {
+                               if ( ($textlen + $img_start) > $maxlen ) {
+                                       if ($textlen < $maxlen) {
                                                logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG);
                                                $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
                                                $textlen = $maxlen;
                                        }
-                               }
-                               else {
+                               } else {
                                        $new_body = $new_body . substr($orig_body, 0, $img_start);
                                        $textlen += $img_start;
                                }
 
                                $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start);
-                       }
-                       else {
+                       } else {
 
-                               if( ($textlen + $img_end) > $maxlen ) {
-                                       if($textlen < $maxlen) {
+                               if ( ($textlen + $img_end) > $maxlen ) {
+                                       if ($textlen < $maxlen) {
                                                logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG);
                                                $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
                                                $textlen = $maxlen;
                                        }
-                               }
-                               else {
+                               } else {
                                        $new_body = $new_body . substr($orig_body, 0, $img_end);
                                        $textlen += $img_end;
                                }
                        }
                        $orig_body = substr($orig_body, $img_end);
 
-                       if($orig_body === false) // in case the body ends on a closing image tag
+                       if ($orig_body === false) // in case the body ends on a closing image tag
                                $orig_body = '';
 
                        $img_start = strpos($orig_body, '[img');
@@ -98,22 +104,20 @@ function limit_body_size($body) {
                        $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
                }
 
-               if( ($textlen + strlen($orig_body)) > $maxlen) {
-                       if($textlen < $maxlen) {
+               if ( ($textlen + strlen($orig_body)) > $maxlen) {
+                       if ($textlen < $maxlen) {
                                logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG);
                                $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
                                $textlen = $maxlen;
                        }
-               }
-               else {
+               } else {
                        logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG);
                        $new_body = $new_body . $orig_body;
                        $textlen += strlen($orig_body);
                }
 
                return $new_body;
-       }
-       else
+       } else
                return $body;
 }}
 
@@ -143,446 +147,64 @@ function title_is_body($title, $body) {
        return($title == $body);
 }
 
-function get_atom_elements($feed, $item, $contact = array()) {
-
-       require_once('library/HTMLPurifier.auto.php');
-       require_once('include/html2bbcode.php');
-
-       $best_photo = array();
-
-       $res = array();
-
-       $author = $item->get_author();
-       if($author) {
-               $res['author-name'] = unxmlify($author->get_name());
-               $res['author-link'] = unxmlify($author->get_link());
-       }
-       else {
-               $res['author-name'] = unxmlify($feed->get_title());
-               $res['author-link'] = unxmlify($feed->get_permalink());
-       }
-       $res['uri'] = unxmlify($item->get_id());
-       $res['title'] = unxmlify($item->get_title());
-       $res['body'] = unxmlify($item->get_content());
-       $res['plink'] = unxmlify($item->get_link(0));
-
-       if($res['plink'])
-               $base_url = implode('/', array_slice(explode('/',$res['plink']),0,3));
-       else
-               $base_url = '';
-
-       // look for a photo. We should check media size and find the best one,
-       // but for now let's just find any author photo
-       // Additionally we look for an alternate author link. On OStatus this one is the one we want.
-
-       $authorlinks = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
-       if (is_array($authorlinks)) {
-               foreach ($authorlinks as $link) {
-                       $linkdata = array_shift($link["attribs"]);
-
-                       if ($linkdata["rel"] == "alternate")
-                               $res["author-link"] = $linkdata["href"];
-               };
-       }
-
-       $rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-
-       if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-               $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-               foreach($base as $link) {
-                       if($link['attribs']['']['rel'] === 'alternate')
-                               $res['author-link'] = unxmlify($link['attribs']['']['href']);
-
-                       if(!x($res, 'author-avatar') || !$res['author-avatar']) {
-                               if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-                                       $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
-                       }
-               }
-       }
-
-       $rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
-
-       if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-               $base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-               if($base && count($base)) {
-                       foreach($base as $link) {
-                               if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
-                                       $res['author-link'] = unxmlify($link['attribs']['']['href']);
-                               if(!x($res, 'author-avatar') || !$res['author-avatar']) {
-                                       if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-                                               $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
-                               }
-                       }
-               }
-       }
-
-       // No photo/profile-link on the item - look at the feed level
-
-       if((! (x($res,'author-link'))) || (! (x($res,'author-avatar')))) {
-               $rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-               if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-                       $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-                       foreach($base as $link) {
-                               if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
-                                       $res['author-link'] = unxmlify($link['attribs']['']['href']);
-                               if(! $res['author-avatar']) {
-                                       if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-                                               $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
-                               }
-                       }
-               }
-
-               $rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
-
-               if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-                       $base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
-                       if($base && count($base)) {
-                               foreach($base as $link) {
-                                       if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
-                                               $res['author-link'] = unxmlify($link['attribs']['']['href']);
-                                       if(! (x($res,'author-avatar'))) {
-                                               if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-                                                       $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
-                                       }
-                               }
-                       }
-               }
-       }
-
-       $apps = $item->get_item_tags(NAMESPACE_STATUSNET,'notice_info');
-       if($apps && $apps[0]['attribs']['']['source']) {
-               $res['app'] = strip_tags(unxmlify($apps[0]['attribs']['']['source']));
-               if($res['app'] === 'web')
-                       $res['app'] = 'OStatus';
-       }
-
-       // base64 encoded json structure representing Diaspora signature
-
-       $dsig = $item->get_item_tags(NAMESPACE_DFRN,'diaspora_signature');
-       if($dsig) {
-               $res['dsprsig'] = unxmlify($dsig[0]['data']);
-       }
-
-       $dguid = $item->get_item_tags(NAMESPACE_DFRN,'diaspora_guid');
-       if($dguid)
-               $res['guid'] = unxmlify($dguid[0]['data']);
-
-       $bm = $item->get_item_tags(NAMESPACE_DFRN,'bookmark');
-       if($bm)
-               $res['bookmark'] = ((unxmlify($bm[0]['data']) === 'true') ? 1 : 0);
-
-
-       /**
-        * If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.
-        */
-
-       $have_real_body = false;
-
-       $rawenv = $item->get_item_tags(NAMESPACE_DFRN, 'env');
-       if($rawenv) {
-               $have_real_body = true;
-               $res['body'] = $rawenv[0]['data'];
-               $res['body'] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$res['body']);
-               // make sure nobody is trying to sneak some html tags by us
-               $res['body'] = notags(base64url_decode($res['body']));
-       }
-
-
-       $res['body'] = limit_body_size($res['body']);
-
-       // It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust
-       // the content type. Our own network only emits text normally, though it might have been converted to
-       // html if we used a pubsubhubbub transport. But if we see even one html tag in our text, we will
-       // have to assume it is all html and needs to be purified.
-
-       // It doesn't matter all that much security wise - because before this content is used anywhere, we are
-       // going to escape any tags we find regardless, but this lets us import a limited subset of html from
-       // the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
-       // html.
-
-       if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
-
-               $res['body'] = reltoabs($res['body'],$base_url);
-
-               $res['body'] = html2bb_video($res['body']);
-
-               $res['body'] = oembed_html2bbcode($res['body']);
-
-               $config = HTMLPurifier_Config::createDefault();
-               $config->set('Cache.DefinitionImpl', null);
-
-               // we shouldn't need a whitelist, because the bbcode converter
-               // will strip out any unsupported tags.
-
-               $purifier = new HTMLPurifier($config);
-               $res['body'] = $purifier->purify($res['body']);
-
-               $res['body'] = @html2bbcode($res['body']);
-
+function add_page_info_data($data) {
+       call_hooks('page_info_data', $data);
 
+       // It maybe is a rich content, but if it does have everything that a link has,
+       // then treat it that way
+       if (($data["type"] == "rich") AND is_string($data["title"]) AND
+               is_string($data["text"]) AND (sizeof($data["images"]) > 0)) {
+               $data["type"] = "link";
        }
-       elseif(! $have_real_body) {
 
-               // it's not one of our messages and it has no tags
-               // so it's probably just text. We'll escape it just to be safe.
-
-               $res['body'] = escape_tags($res['body']);
+       if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $data["url"])) {
+               return "";
        }
 
-
-       // this tag is obsolete but we keep it for really old sites
-
-       $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
-       if($allow && $allow[0]['data'] == 1)
-               $res['last-child'] = 1;
-       else
-               $res['last-child'] = 0;
-
-       $private = $item->get_item_tags(NAMESPACE_DFRN,'private');
-       if($private && intval($private[0]['data']) > 0)
-               $res['private'] = intval($private[0]['data']);
-       else
-               $res['private'] = 0;
-
-       $extid = $item->get_item_tags(NAMESPACE_DFRN,'extid');
-       if($extid && $extid[0]['data'])
-               $res['extid'] = $extid[0]['data'];
-
-       $rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
-       if($rawlocation)
-               $res['location'] = unxmlify($rawlocation[0]['data']);
-
-
-       $rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'published');
-       if($rawcreated)
-               $res['created'] = unxmlify($rawcreated[0]['data']);
-
-
-       $rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
-       if($rawedited)
-               $res['edited'] = unxmlify($rawedited[0]['data']);
-
-       if((x($res,'edited')) && (! (x($res,'created'))))
-               $res['created'] = $res['edited'];
-
-       if(! $res['created'])
-               $res['created'] = $item->get_date('c');
-
-       if(! $res['edited'])
-               $res['edited'] = $item->get_date('c');
-
-
-       // Disallow time travelling posts
-
-       $d1 = strtotime($res['created']);
-       $d2 = strtotime($res['edited']);
-       $d3 = strtotime('now');
-
-       if($d1 > $d3)
-               $res['created'] = datetime_convert();
-       if($d2 > $d3)
-               $res['edited'] = datetime_convert();
-
-       $rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner');
-       if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])
-               $res['owner-name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
-       elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data'])
-               $res['owner-name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']);
-       if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
-               $res['owner-link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
-       elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
-               $res['owner-link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']);
-
-       if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-               $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
-               foreach($base as $link) {
-                       if(!x($res, 'owner-avatar') || !$res['owner-avatar']) {
-                               if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-                                       $res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
-                       }
-               }
+       if ($no_photos AND ($data["type"] == "photo")) {
+               return "";
        }
 
-       $rawgeo = $item->get_item_tags(NAMESPACE_GEORSS,'point');
-       if($rawgeo)
-               $res['coord'] = unxmlify($rawgeo[0]['data']);
-
-       if ($contact["network"] == NETWORK_FEED) {
-               $res['verb'] = ACTIVITY_POST;
-               $res['object-type'] = ACTIVITY_OBJ_NOTE;
+       if (sizeof($data["images"]) > 0) {
+               $preview = $data["images"][0];
+       } else {
+               $preview = "";
        }
 
-       $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
+       // Escape some bad characters
+       $data["url"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false));
+       $data["title"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false));
 
-       // select between supported verbs
+       $text = "[attachment type='".$data["type"]."'";
 
-       if($rawverb) {
-               $res['verb'] = unxmlify($rawverb[0]['data']);
+       if ($data["text"] == "") {
+               $data["text"] = $data["title"];
        }
 
-       // translate OStatus unfollow to activity streams if it happened to get selected
-
-       if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
-               $res['verb'] = ACTIVITY_UNFOLLOW;
-
-       $cats = $item->get_categories();
-       if($cats) {
-               $tag_arr = array();
-               foreach($cats as $cat) {
-                       $term = $cat->get_term();
-                       if(! $term)
-                               $term = $cat->get_label();
-                       $scheme = $cat->get_scheme();
-                       if($scheme && $term && stristr($scheme,'X-DFRN:'))
-                               $tag_arr[] = substr($scheme,7,1) . '[url=' . unxmlify(substr($scheme,9)) . ']' . unxmlify($term) . '[/url]';
-                       elseif($term)
-                               $tag_arr[] = notags(trim($term));
-               }
-               $res['tag'] =  implode(',', $tag_arr);
+       if ($data["text"] == "") {
+               $data["text"] = $data["url"];
        }
 
-       $attach = $item->get_enclosures();
-       if($attach) {
-               $att_arr = array();
-               foreach($attach as $att) {
-                       $len   = intval($att->get_length());
-                       $link  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link()))));
-                       $title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title()))));
-                       $type  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type()))));
-                       if(strpos($type,';'))
-                               $type = substr($type,0,strpos($type,';'));
-                       if((! $link) || (strpos($link,'http') !== 0))
-                               continue;
-
-                       if(! $title)
-                               $title = ' ';
-                       if(! $type)
-                               $type = 'application/octet-stream';
-
-                       $att_arr[] = '[attach]href="' . $link . '" length="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]';
-               }
-               $res['attach'] = implode(',', $att_arr);
+       if ($data["url"] != "") {
+               $text .= " url='".$data["url"]."'";
        }
 
-       $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
-
-       if($rawobj) {
-               $res['object'] = '<object>' . "\n";
-               $child = $rawobj[0]['child'];
-               if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-                       $res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-                       $res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
-               }
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-                       $res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-                       $res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-                       $res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-                       $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
-                       if(! $body)
-                               $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
-                       // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-                       $res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
-                       if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-
-                               $body = html2bb_video($body);
-
-                               $config = HTMLPurifier_Config::createDefault();
-                               $config->set('Cache.DefinitionImpl', null);
-
-                               $purifier = new HTMLPurifier($config);
-                               $body = $purifier->purify($body);
-                               $body = html2bbcode($body);
-                       }
-
-                       $res['object'] .= '<content>' . $body . '</content>' . "\n";
-               }
-
-               $res['object'] .= '</object>' . "\n";
+       if ($data["title"] != "") {
+               $text .= " title='".$data["title"]."'";
        }
 
-       $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'target');
-
-       if($rawobj) {
-               $res['target'] = '<target>' . "\n";
-               $child = $rawobj[0]['child'];
-               if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-                       $res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
-               }
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-                       $res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-                       $res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-                       $res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-               if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-                       $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
-                       if(! $body)
-                               $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
-                       // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-                       $res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
-                       if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-
-                               $body = html2bb_video($body);
-
-                               $config = HTMLPurifier_Config::createDefault();
-                               $config->set('Cache.DefinitionImpl', null);
-
-                               $purifier = new HTMLPurifier($config);
-                               $body = $purifier->purify($body);
-                               $body = html2bbcode($body);
-                       }
-
-                       $res['target'] .= '<content>' . $body . '</content>' . "\n";
+       if (sizeof($data["images"]) > 0) {
+               $preview = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
+               // if the preview picture is larger than 500 pixels then show it in a larger mode
+               // But only, if the picture isn't higher than large (To prevent huge posts)
+               if (($data["images"][0]["width"] >= 500) AND ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
+                       $text .= " image='".$preview."'";
+               } else {
+                       $text .= " preview='".$preview."'";
                }
-
-               $res['target'] .= '</target>' . "\n";
-       }
-
-       $arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
-
-       call_hooks('parse_atom', $arr);
-
-       return $res;
-}
-
-function add_page_info_data($data) {
-       call_hooks('page_info_data', $data);
-
-       // It maybe is a rich content, but if it does have everything that a link has,
-       // then treat it that way
-       if (($data["type"] == "rich") AND is_string($data["title"]) AND
-               is_string($data["text"]) AND (sizeof($data["images"]) > 0))
-               $data["type"] = "link";
-
-       if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $url))
-               return("");
-
-       if ($no_photos AND ($data["type"] == "photo"))
-               return("");
-
-       // If the link contains BBCode stuff, make a short link out of this to avoid parsing problems
-       if (strpos($data["url"], '[') OR strpos($data["url"], ']')) {
-               require_once("include/network.php");
-               $data["url"] = short_link($data["url"]);
-       }
-
-       if (($data["type"] != "photo") AND is_string($data["title"]))
-               $text .= "[bookmark=".$data["url"]."]".trim($data["title"])."[/bookmark]";
-
-       if (($data["type"] != "video") AND ($photo != ""))
-               $text .= '[img]'.$photo.'[/img]';
-       elseif (($data["type"] != "video") AND (sizeof($data["images"]) > 0)) {
-               $imagedata = $data["images"][0];
-               $text .= '[img]'.$imagedata["src"].'[/img]';
        }
 
-       if (($data["type"] != "photo") AND is_string($data["text"]))
-               $text .= "[quote]".$data["text"]."[/quote]";
+       $text .= "]".$data["text"]."[/attachment]";
 
        $hashtags = "";
        if (isset($data["keywords"]) AND count($data["keywords"])) {
@@ -596,13 +218,12 @@ function add_page_info_data($data) {
                }
        }
 
-       return("\n[class=type-".$data["type"]."]".$text."[/class]".$hashtags);
+       return "\n".$text.$hashtags;
 }
 
 function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
-       require_once("mod/parse_url.php");
 
-       $data = parseurl_getsiteinfo_cached($url, true);
+       $data = ParseUrl::getSiteinfoCached($url, true);
 
        if ($photo != "")
                $data["images"][0]["src"] = $photo;
@@ -659,6 +280,10 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 
        $URLSearchString = "^\[\]";
 
+       // Fix for Mastodon where the mentions are in a different format
+       $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism",
+                               '$2[url=$1]$3[/url]', $body);
+
        // Adding these spaces is a quick hack due to my problems with regular expressions :)
        preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches);
 
@@ -696,37 +321,6 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
        return $body;
 }
 
-function encode_rel_links($links) {
-       $o = '';
-       if(! ((is_array($links)) && (count($links))))
-               return $o;
-       foreach($links as $link) {
-               $o .= '<link ';
-               if($link['attribs']['']['rel'])
-                       $o .= 'rel="' . $link['attribs']['']['rel'] . '" ';
-               if($link['attribs']['']['type'])
-                       $o .= 'type="' . $link['attribs']['']['type'] . '" ';
-               if($link['attribs']['']['href'])
-                       $o .= 'href="' . $link['attribs']['']['href'] . '" ';
-               if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
-                       $o .= 'media:width="' . $link['attribs'][NAMESPACE_MEDIA]['width'] . '" ';
-               if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
-                       $o .= 'media:height="' . $link['attribs'][NAMESPACE_MEDIA]['height'] . '" ';
-               $o .= ' />' . "\n" ;
-       }
-       return xmlify($o);
-}
-
-function add_guid($item) {
-       $r = q("SELECT `guid` FROM `guid` WHERE `guid` = '%s' LIMIT 1", dbesc($item["guid"]));
-       if ($r)
-               return;
-
-       q("INSERT INTO `guid` (`guid`,`plink`,`uri`,`network`) VALUES ('%s','%s','%s','%s')",
-               dbesc($item["guid"]), dbesc($item["plink"]),
-               dbesc($item["uri"]), dbesc($item["network"]));
-}
-
 /**
  * Adds a "lang" specification in a "postopts" element of given $arr,
  * if possible and not already present.
@@ -747,9 +341,7 @@ function item_add_language_opt(&$arr) {
                        return;
                }
                $postopts = $arr['postopts'];
-       }
-       else
-       {
+       } else {
                $postopts = "";
        }
 
@@ -772,8 +364,40 @@ function item_add_language_opt(&$arr) {
        }
 }
 
+/**
+ * @brief Creates an unique guid out of a given uri
+ *
+ * @param string $uri uri of an item entry
+ * @param string $host (Optional) hostname for the GUID prefix
+ * @return string unique guid
+ */
+function uri_to_guid($uri, $host = "") {
+
+       // Our regular guid routine is using this kind of prefix as well
+       // We have to avoid that different routines could accidentally create the same value
+       $parsed = parse_url($uri);
+
+       if ($host == "") {
+               $host = $parsed["host"];
+       }
+
+       $guid_prefix = hash("crc32", $host);
+
+       // Remove the scheme to make sure that "https" and "http" doesn't make a difference
+       unset($parsed["scheme"]);
+
+       $host_id = implode("/", $parsed);
+
+       // We could use any hash algorithm since it isn't a security issue
+       $host_hash = hash("ripemd128", $host_id);
+
+       return $guid_prefix.$host_hash;
+}
+
 function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
 
+       $a = get_app();
+
        // If it is a posting where users should get notifications, then define it as wall posting
        if ($notify) {
                $arr['wall'] = 1;
@@ -781,13 +405,23 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                $arr['origin'] = 1;
                $arr['last-child'] = 1;
                $arr['network'] = NETWORK_DFRN;
+
+               // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
+               // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host.
+               // This is done because our host is the original creator of the post.
+               if (isset($arr['plink'])) {
+                       $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname());
+               } elseif (isset($arr['uri'])) {
+                       $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname());
+               }
        }
 
        // If a Diaspora signature structure was passed in, pull it out of the
        // item array and set it aside for later storage.
 
        $dsprsig = null;
-       if(x($arr,'dsprsig')) {
+       if (x($arr,'dsprsig')) {
+               $encoded_signature = $arr['dsprsig'];
                $dsprsig = json_decode(base64_decode($arr['dsprsig']));
                unset($arr['dsprsig']);
        }
@@ -795,21 +429,21 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        // Converting the plink
        if ($arr['network'] == NETWORK_OSTATUS) {
                if (isset($arr['plink']))
-                       $arr['plink'] = ostatus_convert_href($arr['plink']);
+                       $arr['plink'] = ostatus::convert_href($arr['plink']);
                elseif (isset($arr['uri']))
-                       $arr['plink'] = ostatus_convert_href($arr['uri']);
+                       $arr['plink'] = ostatus::convert_href($arr['uri']);
        }
 
-       if(x($arr, 'gravity'))
+       if (x($arr, 'gravity'))
                $arr['gravity'] = intval($arr['gravity']);
-       elseif($arr['parent-uri'] === $arr['uri'])
+       elseif ($arr['parent-uri'] === $arr['uri'])
                $arr['gravity'] = 0;
-       elseif(activity_match($arr['verb'],ACTIVITY_POST))
+       elseif (activity_match($arr['verb'],ACTIVITY_POST))
                $arr['gravity'] = 6;
        else
                $arr['gravity'] = 6;   // extensible catchall
 
-       if(! x($arr,'type'))
+       if (! x($arr,'type'))
                $arr['type']      = 'remote';
 
 
@@ -817,7 +451,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        /* check for create  date and expire time */
        $uid = intval($arr['uid']);
        $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid));
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $expire_interval = $r[0]['expire'];
                if ($expire_interval>0) {
                        $expire_date =  new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC'));
@@ -847,42 +481,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                }
        }
 
-       // If there is no guid then take the same guid that was taken before for the same uri
-       if ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "") AND (trim($arr['network']) != "")) {
-               logger('item_store: checking for an existing guid for uri '.$arr['uri'], LOGGER_DEBUG);
-               $r = q("SELECT `guid` FROM `guid` WHERE `uri` = '%s' AND `network` = '%s' LIMIT 1",
-                       dbesc(trim($arr['uri'])), dbesc(trim($arr['network'])));
-
-               if(count($r)) {
-                       $arr['guid'] = $r[0]["guid"];
-                       logger('item_store: found guid '.$arr['guid'].' for uri '.$arr['uri'], LOGGER_DEBUG);
-               }
-       }
-
-       // If there is no guid then take the same guid that was taken before for the same plink
-       if ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "") AND (trim($arr['network']) != "")) {
-               logger('item_store: checking for an existing guid for plink '.$arr['plink'], LOGGER_DEBUG);
-               $r = q("SELECT `guid`, `uri` FROM `guid` WHERE `plink` = '%s' AND `network` = '%s' LIMIT 1",
-                       dbesc(trim($arr['plink'])), dbesc(trim($arr['network'])));
-
-               if(count($r)) {
-                       $arr['guid'] = $r[0]["guid"];
-                       logger('item_store: found guid '.$arr['guid'].' for plink '.$arr['plink'], LOGGER_DEBUG);
-
-                       if ($r[0]["uri"] != $arr['uri'])
-                       logger('Different uri for same guid: '.$arr['uri'].' and '.$r[0]["uri"].' - this shouldnt happen!', LOGGER_DEBUG);
-               }
-       }
-
        // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin.
        // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<"
-       //if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
+       //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
        //      $arr['body'] = strip_tags($arr['body']);
 
        item_add_language_opt($arr);
 
        if ($notify)
                $guid_prefix = "";
+       elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != ""))
+               $arr['guid'] = uri_to_guid($arr['plink']);
+       elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != ""))
+               $arr['guid'] = uri_to_guid($arr['uri']);
        else {
                $parsed = parse_url($arr["author-link"]);
                $guid_prefix = hash("crc32", $parsed["host"]);
@@ -890,7 +501,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
        $arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
        $arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $guid_prefix));
-       $arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : $arr['guid']);
+       $arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : item_new_uri($a->get_hostname(), $uid, $arr['guid']));
        $arr['extid']         = ((x($arr,'extid'))         ? notags(trim($arr['extid']))         : '');
        $arr['author-name']   = ((x($arr,'author-name'))   ? trim($arr['author-name'])   : '');
        $arr['author-link']   = ((x($arr,'author-link'))   ? notags(trim($arr['author-link']))   : '');
@@ -909,7 +520,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        $arr['last-child']    = ((x($arr,'last-child'))    ? intval($arr['last-child'])          : 0 );
        $arr['visible']       = ((x($arr,'visible') !== false) ? intval($arr['visible'])         : 1 );
        $arr['deleted']       = 0;
-       $arr['parent-uri']    = ((x($arr,'parent-uri'))    ? notags(trim($arr['parent-uri']))    : '');
+       $arr['parent-uri']    = ((x($arr,'parent-uri'))    ? notags(trim($arr['parent-uri']))    : $arr['uri']);
        $arr['verb']          = ((x($arr,'verb'))          ? notags(trim($arr['verb']))          : '');
        $arr['object-type']   = ((x($arr,'object-type'))   ? notags(trim($arr['object-type']))   : '');
        $arr['object']        = ((x($arr,'object'))        ? trim($arr['object'])                : '');
@@ -934,6 +545,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        $arr['inform']        = ((x($arr,'inform'))        ? trim($arr['inform'])                : '');
        $arr['file']          = ((x($arr,'file'))          ? trim($arr['file'])                  : '');
 
+       // Items cannot be stored before they happen ...
+       if ($arr['created'] > datetime_convert())
+               $arr['created'] = datetime_convert();
+
+       // We haven't invented time travel by now.
+       if ($arr['edited'] > datetime_convert())
+               $arr['edited'] = datetime_convert();
+
+       if (($arr['author-link'] == "") AND ($arr['owner-link'] == ""))
+               logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG);
+
        if ($arr['plink'] == "") {
                $a = get_app();
                $arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']);
@@ -946,19 +568,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        intval($arr['uid'])
                );
 
-               if(!count($r))
+               if (!dbm::is_result($r))
                        $r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1",
                                dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
                                dbesc(normalise_link($arr['author-link']))
                        );
 
-               if(!count($r))
+               if (!dbm::is_result($r))
                        $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($arr['contact-id']),
                                intval($arr['uid'])
                        );
 
-               if(count($r))
+               if (dbm::is_result($r))
                        $arr['network'] = $r[0]["network"];
 
                // Fallback to friendica (why is it empty in some cases?)
@@ -971,7 +593,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        // The contact-id should be set before "item_store" was called - but there seems to be some issues
        if ($arr["contact-id"] == 0) {
                // First we are looking for a suitable contact that matches with the author of the post
-               $arr["contact-id"] = get_contact($arr['author-link'], $uid);
+               // This is done only for comments (See below explanation at "gcontact-id")
+               if ($arr['parent-uri'] != $arr['uri'])
+                       $arr["contact-id"] = get_contact($arr['author-link'], $uid);
 
                // If not present then maybe the owner was found
                if ($arr["contact-id"] == 0)
@@ -983,12 +607,26 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        if ($r)
                                $arr["contact-id"] = $r[0]["id"];
                }
-               logger("Contact-id was missing for post ".$arr["guid"]." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
+               logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
+       }
+
+       if ($arr["gcontact-id"] == 0) {
+               // The gcontact should mostly behave like the contact. But is is supposed to be global for the system.
+               // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner.
+               // On comments the author is the better choice.
+               if ($arr['parent-uri'] === $arr['uri'])
+                       $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'],
+                                                                "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']));
+               else
+                       $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'],
+                                                                "photo" => $arr['author-avatar'], "name" => $arr['author-name']));
        }
 
-       if ($arr["gcontact-id"] == 0)
-               $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'],
-                                                        "photo" => $arr['author-avatar'], "name" => $arr['author-name']));
+       if ($arr["author-id"] == 0)
+               $arr["author-id"] = get_contact($arr["author-link"], 0);
+
+       if ($arr["owner-id"] == 0)
+               $arr["owner-id"] = get_contact($arr["owner-link"], 0);
 
        if ($arr['guid'] != "") {
                // Checking if there is already an item with the same guid
@@ -996,7 +634,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                $r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
                        dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
 
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
                        return 0;
                }
@@ -1006,7 +644,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        item_body_set_hashtags($arr);
 
        $arr['thr-parent'] = $arr['parent-uri'];
-       if($arr['parent-uri'] === $arr['uri']) {
+       if ($arr['parent-uri'] === $arr['uri']) {
                $parent_id = 0;
                $parent_deleted = 0;
                $allow_cid = $arr['allow_cid'];
@@ -1014,8 +652,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                $deny_cid  = $arr['deny_cid'];
                $deny_gid  = $arr['deny_gid'];
                $notify_type = 'wall-new';
-       }
-       else {
+       } else {
 
                // find the parent and snarf the item id and ACLs
                // and anything else we need to inherit
@@ -1025,13 +662,13 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        intval($arr['uid'])
                );
 
-               if(count($r)) {
+               if (dbm::is_result($r)) {
 
                        // is the new message multi-level threaded?
                        // even though we don't support it now, preserve the info
                        // and re-attach to the conversation parent.
 
-                       if($r[0]['uri'] != $r[0]['parent-uri']) {
+                       if ($r[0]['uri'] != $r[0]['parent-uri']) {
                                $arr['parent-uri'] = $r[0]['parent-uri'];
                                $z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
                                        ORDER BY `id` ASC LIMIT 1",
@@ -1039,7 +676,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                                        dbesc($r[0]['parent-uri']),
                                        intval($arr['uid'])
                                );
-                               if($z && count($z))
+                               if ($z && count($z))
                                        $r = $z;
                        }
 
@@ -1056,21 +693,21 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        // This differs from the above settings as it subtly allows comments from
                        // email correspondents to be private even if the overall thread is not.
 
-                       if($r[0]['private'])
+                       if ($r[0]['private'])
                                $arr['private'] = $r[0]['private'];
 
                        // Edge case. We host a public forum that was originally posted to privately.
                        // The original author commented, but as this is a comment, the permissions
                        // weren't fixed up so it will still show the comment as private unless we fix it here.
 
-                       if((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private']))
+                       if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private']))
                                $arr['private'] = 0;
 
 
                        // If its a post from myself then tag the thread as "mention"
                        logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
-                       $u = q("select * from user where uid = %d limit 1", intval($arr['uid']));
-                       if(count($u)) {
+                       $u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
+                       if (count($u)) {
                                $a = get_app();
                                $self = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
                                logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
@@ -1079,19 +716,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                                        logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
                                }
                        }
-               }
-               else {
+               } else {
 
                        // Allow one to see reply tweets from status.net even when
                        // we don't have or can't see the original post.
 
-                       if($force_parent) {
+                       if ($force_parent) {
                                logger('item_store: $force_parent=true, reply converted to top-level post.');
                                $parent_id = 0;
                                $arr['parent-uri'] = $arr['uri'];
                                $arr['gravity'] = 0;
-                       }
-                       else {
+                       } else {
                                logger('item_store: item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item');
                                return 0;
                        }
@@ -1106,35 +741,61 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                dbesc(NETWORK_DFRN),
                intval($arr['uid'])
        );
-       if($r && count($r)) {
-               logger('duplicated item with the same uri found. ' . print_r($arr,true));
+       if (dbm::is_result($r)) {
+               logger('duplicated item with the same uri found. '.print_r($arr,true));
                return 0;
        }
 
-       // Check for an existing post with the same content. There seems to be a problem with OStatus.
-       $r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
-               dbesc($arr['body']),
-               dbesc($arr['network']),
-               dbesc($arr['created']),
-               intval($arr['contact-id']),
-               intval($arr['uid'])
-       );
-       if($r && count($r)) {
-               logger('duplicated item with the same body found. ' . print_r($arr,true));
-               return 0;
+       // On Friendica and Diaspora the GUID is unique
+       if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+               $r = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($arr['guid']),
+                       intval($arr['uid'])
+               );
+               if (dbm::is_result($r)) {
+                       logger('duplicated item with the same guid found. '.print_r($arr,true));
+                       return 0;
+               }
+       } else {
+               // Check for an existing post with the same content. There seems to be a problem with OStatus.
+               $r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
+                       dbesc($arr['body']),
+                       dbesc($arr['network']),
+                       dbesc($arr['created']),
+                       intval($arr['contact-id']),
+                       intval($arr['uid'])
+               );
+               if (dbm::is_result($r)) {
+                       logger('duplicated item with the same body found. '.print_r($arr,true));
+                       return 0;
+               }
        }
 
        // Is this item available in the global items (with uid=0)?
        if ($arr["uid"] == 0) {
                $arr["global"] = true;
 
-               q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($arr["guid"]));
-       }  else {
-               $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `guid` = '%s'", dbesc($arr["guid"]));
+               // Set the global flag on all items if this was a global item entry
+               q("UPDATE `item` SET `global` = 1 WHERE `uri` = '%s'", dbesc($arr["uri"]));
+       } else {
+               $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
 
                $arr["global"] = (count($isglobal) > 0);
        }
 
+       // ACL settings
+       if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
+               $private = 1;
+       else
+               $private = $arr['private'];
+
+       $arr["allow_cid"] = $allow_cid;
+       $arr["allow_gid"] = $allow_gid;
+       $arr["deny_cid"] = $deny_cid;
+       $arr["deny_gid"] = $deny_gid;
+       $arr["private"] = $private;
+       $arr["deleted"] = $parent_deleted;
+
        // Fill the cache field
        put_item_in_cache($arr);
 
@@ -1143,11 +804,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        else
                call_hooks('post_remote',$arr);
 
-       if(x($arr,'cancel')) {
+       if (x($arr,'cancel')) {
                logger('item_store: post cancelled by plugin.');
                return 0;
        }
 
+       // Check for already added items.
+       // There is a timing issue here that sometimes creates double postings.
+       // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
+       if ($arr["uid"] == 0) {
+               $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri'])));
+               if (dbm::is_result($r)) {
+                       logger('Global item already stored. URI: '.$arr['uri'].' on network '.$arr['network'], LOGGER_DEBUG);
+                       return 0;
+               }
+       }
+
        // Store the unescaped version
        $unescaped = $arr;
 
@@ -1155,96 +827,97 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
        logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
 
+       q("COMMIT");
+       q("START TRANSACTION;");
+
        $r = dbq("INSERT INTO `item` (`"
                        . implode("`, `", array_keys($arr))
                        . "`) VALUES ('"
                        . implode("', '", array_values($arr))
-                       . "')" );
+                       . "')");
 
        // And restore it
        $arr = $unescaped;
 
-       // find the item that we just created
-       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' ORDER BY `id` ASC",
+       // When the item was successfully stored we fetch the ID of the item.
+       if (dbm::is_result($r)) {
+               $r = q("SELECT LAST_INSERT_ID() AS `item-id`");
+               if (dbm::is_result($r)) {
+                       $current_post = $r[0]['item-id'];
+               } else {
+                       // This shouldn't happen
+                       $current_post = 0;
+               }
+       } else {
+               // This can happen - for example - if there are locking timeouts.
+               q("ROLLBACK");
+
+               // Store the data into a spool file so that we can try again later.
+
+               // At first we restore the Diaspora signature that we removed above.
+               if (isset($encoded_signature)) {
+                       $arr['dsprsig'] = $encoded_signature;
+               }
+
+               // Now we store the data in the spool directory
+               $file = 'item-'.round(microtime(true) * 10000).".msg";
+               $spool = get_spoolpath().'/'.$file;
+               file_put_contents($spool, json_encode($arr));
+               logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
+               return 0;
+       }
+
+       if ($current_post == 0) {
+               // This is one of these error messages that never should occur.
+               logger("couldn't find created item - we better quit now.");
+               q("ROLLBACK");
+               return 0;
+       }
+
+       // How much entries have we created?
+       // We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
+       $r = q("SELECT COUNT(*) AS `entries` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s'",
                dbesc($arr['uri']),
                intval($arr['uid']),
                dbesc($arr['network'])
        );
 
-       if(count($r) > 1) {
-               // There are duplicates. Keep the oldest one, delete the others
-               logger('item_store: duplicated post occurred. Removing newer duplicates. uri = '.$arr['uri'].' uid = '.$arr['uid']);
-               q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' AND `id` > %d",
-                       dbesc($arr['uri']),
-                       intval($arr['uid']),
-                       dbesc($arr['network']),
-                       intval($r[0]["id"])
-               );
+       if (!dbm::is_result($r)) {
+               // This shouldn't happen, since COUNT always works when the database connection is there.
+               logger("We couldn't count the stored entries. Very strange ...");
+               q("ROLLBACK");
                return 0;
-       } elseif(count($r)) {
-
-               // Store the guid and other relevant data
-               add_guid($arr);
-
-               $current_post = $r[0]['id'];
-               logger('item_store: created item ' . $current_post);
-
-               // Set "success_update" and "last-item" to the date of the last time we heard from this contact
-               // This can be used to filter for inactive contacts.
-               // Only do this for public postings to avoid privacy problems, since poco data is public.
-               // Don't set this value if it isn't from the owner (could be an author that we don't know)
-
-               $update = (!$arr['private'] AND (($arr["author-link"] === $arr["owner-link"]) OR ($arr["parent-uri"] === $arr["uri"])));
+       }
 
-               // Is it a forum? Then we don't care about the rules from above
-               if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) {
-                       $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
-                                       intval($arr['contact-id']));
-                       if ($isforum)
-                               $update = true;
-               }
+       if ($r[0]["entries"] > 1) {
+               // There are duplicates. We delete our just created entry.
+               logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']);
 
-               if ($update)
-                       q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
-                               dbesc($arr['received']),
-                               dbesc($arr['received']),
-                               intval($arr['contact-id'])
-                       );
-       } else {
-               logger('item_store: could not locate created item');
+               // Yes, we could do a rollback here - but we are having many users with MyISAM.
+               q("DELETE FROM `item` WHERE `id` = %d", intval($current_post));
+               q("COMMIT");
+               return 0;
+       } elseif ($r[0]["entries"] == 0) {
+               // This really should never happen since we quit earlier if there were problems.
+               logger("Something is terribly wrong. We haven't found our created entry.");
+               q("ROLLBACK");
                return 0;
        }
 
-       if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
-               $parent_id = $current_post;
-
-       if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
-               $private = 1;
-       else
-               $private = $arr['private'];
+       logger('item_store: created item '.$current_post);
+       item_set_last_item($arr);
 
-       // Set parent id - and also make sure to inherit the parent's ACLs.
+       if (!$parent_id || ($arr['parent-uri'] === $arr['uri']))
+               $parent_id = $current_post;
 
-       $r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s',
-               `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = %d WHERE `id` = %d",
+       // Set parent id
+       $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d",
                intval($parent_id),
-               dbesc($allow_cid),
-               dbesc($allow_gid),
-               dbesc($deny_cid),
-               dbesc($deny_gid),
-               intval($private),
-               intval($parent_deleted),
                intval($current_post)
        );
 
        $arr['id'] = $current_post;
        $arr['parent'] = $parent_id;
-       $arr['allow_cid'] = $allow_cid;
-       $arr['allow_gid'] = $allow_gid;
-       $arr['deny_cid'] = $deny_cid;
-       $arr['deny_gid'] = $deny_gid;
-       $arr['private'] = $private;
-       $arr['deleted'] = $parent_deleted;
 
        // update the commented timestamp on the parent
        // Only update "commented" if it is really a comment
@@ -1260,7 +933,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        intval($parent_id)
                );
 
-       if($dsprsig) {
+       if ($dsprsig) {
 
                // Friendica servers lower than 3.4.3-2 had double encoded the signature ...
                // We can check for this condition when we decode and encode the stuff again.
@@ -1277,20 +950,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                );
        }
 
-
-       /**
-        * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
-        */
-
-       if($arr['last-child']) {
-               $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
-                       dbesc($arr['uri']),
-                       intval($arr['uid']),
-                       intval($current_post)
-               );
-       }
-
-       $deleted = tag_deliver($arr['uid'],$current_post);
+       $deleted = tag_deliver($arr['uid'],$current_post);
 
        // current post can be deleted if is for a community page and no mention are
        // in it.
@@ -1306,78 +966,88 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        logger('item_store: new item not found in DB, id ' . $current_post);
        }
 
-       // Add every contact of the post to the global contact table
-       poco_store($arr);
+       if ($arr['parent-uri'] === $arr['uri']) {
+               add_thread($current_post);
+       } else {
+               update_thread($parent_id);
+       }
+
+       q("COMMIT");
 
+       // Due to deadlock issues with the "term" table we are doing these steps after the commit.
+       // This is not perfect - but a workable solution until we found the reason for the problem.
        create_tags_from_item($current_post);
        create_files_from_item($current_post);
 
-       // Only check for notifications on start posts
+       // If this is now the last-child, force all _other_ children of this parent to *not* be last-child
+       // It is done after the transaction to avoid dead locks.
+       if ($arr['last-child']) {
+               $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
+                       dbesc($arr['uri']),
+                       intval($arr['uid']),
+                       intval($current_post)
+               );
+       }
+
        if ($arr['parent-uri'] === $arr['uri']) {
-               add_thread($current_post);
-               logger('item_store: Check notification for contact '.$arr['contact-id'].' and post '.$current_post, LOGGER_DEBUG);
+               add_shadow_thread($current_post);
+       } else {
+               add_shadow_entry($current_post);
+       }
 
-               // Send a notification for every new post?
-               $r = q("SELECT `notify_new_posts` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `notify_new_posts` LIMIT 1",
-                       intval($arr['contact-id']),
-                       intval($arr['uid'])
-               );
-               $send_notification = count($r);
-
-               if (!$send_notification) {
-                       $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
-                               intval(TERM_OBJ_POST), intval($current_post), intval(TERM_MENTION), intval($arr['uid']));
-
-                       if (count($tags)) {
-                               foreach ($tags AS $tag) {
-                                       $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`",
-                                               normalise_link($tag["url"]), intval($arr['uid']));
-                                       if (count($r))
-                                               $send_notification = true;
-                               }
-                       }
-               }
+       check_item_notification($current_post, $uid);
 
-               if ($send_notification) {
-                       logger('item_store: Send notification for contact '.$arr['contact-id'].' and post '.$current_post, LOGGER_DEBUG);
-                       $u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
-                               intval($arr['uid']));
+       if ($notify)
+               proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post);
 
-                       $item = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d",
-                               intval($current_post),
-                               intval($arr['uid'])
-                       );
+       return $current_post;
+}
 
-                       $a = get_app();
-
-                       require_once('include/enotify.php');
-                       notification(array(
-                               'type'         => NOTIFY_SHARE,
-                               'notify_flags' => $u[0]['notify-flags'],
-                               'language'     => $u[0]['language'],
-                               'to_name'      => $u[0]['username'],
-                               'to_email'     => $u[0]['email'],
-                               'uid'          => $u[0]['uid'],
-                               'item'         => $item[0],
-                               'link'         => $a->get_baseurl().'/display/'.urlencode($arr['guid']),
-                               'source_name'  => $item[0]['author-name'],
-                               'source_link'  => $item[0]['author-link'],
-                               'source_photo' => $item[0]['author-avatar'],
-                               'verb'         => ACTIVITY_TAG,
-                               'otype'        => 'item',
-                               'parent'       => $arr['parent']
-                       ));
-                       logger('item_store: Notification sent for contact '.$arr['contact-id'].' and post '.$current_post, LOGGER_DEBUG);
+/**
+ * @brief Set "success_update" and "last-item" to the date of the last time we heard from this contact
+ *
+ * This can be used to filter for inactive contacts.
+ * Only do this for public postings to avoid privacy problems, since poco data is public.
+ * Don't set this value if it isn't from the owner (could be an author that we don't know)
+ *
+ * @param array $arr Contains the just posted item record
+ */
+function item_set_last_item($arr) {
+
+       $update = (!$arr['private'] AND (($arr["author-link"] === $arr["owner-link"]) OR ($arr["parent-uri"] === $arr["uri"])));
+
+       // Is it a forum? Then we don't care about the rules from above
+       if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) {
+               $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
+                               intval($arr['contact-id']));
+               if ($isforum) {
+                       $update = true;
                }
-       } else {
-               update_thread($parent_id);
-               add_shadow_entry($arr);
        }
 
-       if ($notify)
-               proc_run('php', "include/notifier.php", $notify_type, $current_post);
+       if ($update) {
+               q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
+                       dbesc($arr['received']),
+                       dbesc($arr['received']),
+                       intval($arr['contact-id'])
+               );
+       }
+       // Now do the same for the system wide contacts with uid=0
+       if (!$arr['private']) {
+               q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
+                       dbesc($arr['received']),
+                       dbesc($arr['received']),
+                       intval($arr['owner-id'])
+               );
 
-       return $current_post;
+               if ($arr['owner-id'] != $arr['author-id']) {
+                       q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
+                               dbesc($arr['received']),
+                               dbesc($arr['received']),
+                               intval($arr['author-id'])
+                       );
+               }
+       }
 }
 
 function item_body_set_hashtags(&$item) {
@@ -1385,7 +1055,7 @@ function item_body_set_hashtags(&$item) {
        $tags = get_tags($item["body"]);
 
        // No hashtags?
-       if(!count($tags))
+       if (!count($tags))
                return(false);
 
        // This sorting is important when there are hashtags that are part of other hashtags
@@ -1425,10 +1095,10 @@ function item_body_set_hashtags(&$item) {
 
 
        foreach($tags as $tag) {
-               if(strpos($tag,'#') !== 0)
+               if (strpos($tag,'#') !== 0)
                        continue;
 
-               if(strpos($tag,'[url='))
+               if (strpos($tag,'[url='))
                        continue;
 
                $basetag = str_replace('_',' ',substr($tag,1));
@@ -1437,8 +1107,8 @@ function item_body_set_hashtags(&$item) {
 
                $item["body"] = str_replace($tag, $newtag, $item["body"]);
 
-               if(!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) {
-                       if(strlen($item["tag"]))
+               if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) {
+                       if (strlen($item["tag"]))
                                $item["tag"] = ','.$item["tag"];
                        $item["tag"] = $newtag.$item["tag"];
                }
@@ -1450,7 +1120,7 @@ function item_body_set_hashtags(&$item) {
 
 function get_item_guid($id) {
        $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id));
-       if (count($r))
+       if (dbm::is_result($r))
                return($r[0]["guid"]);
        else
                return("");
@@ -1469,7 +1139,7 @@ function get_item_id($guid, $uid = 0) {
                $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                                AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
-               if (count($r)) {
+               if (dbm::is_result($r)) {
                        $id = $r[0]["id"];
                        $nick = $r[0]["nickname"];
                }
@@ -1483,7 +1153,7 @@ function get_item_id($guid, $uid = 0) {
                                AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
                                AND `item`.`private` = 0 AND `item`.`wall` = 1
                                AND `item`.`guid` = '%s'", dbesc($guid));
-               if (count($r)) {
+               if (dbm::is_result($r)) {
                        $id = $r[0]["id"];
                        $nick = $r[0]["nickname"];
                }
@@ -1493,10 +1163,10 @@ function get_item_id($guid, $uid = 0) {
 
 // return - test
 function get_item_contact($item,$contacts) {
-       if(! count($contacts) || (! is_array($item)))
+       if (! count($contacts) || (! is_array($item)))
                return false;
        foreach($contacts as $contact) {
-               if($contact['id'] == $item['contact-id']) {
+               if ($contact['id'] == $item['contact-id']) {
                        return $contact;
                        break; // NOTREACHED
                }
@@ -1521,7 +1191,7 @@ function tag_deliver($uid,$item_id) {
        $u = q("select * from user where uid = %d limit 1",
                intval($uid)
        );
-       if(! count($u))
+       if (! count($u))
                return;
 
        $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@@ -1532,7 +1202,7 @@ function tag_deliver($uid,$item_id) {
                intval($item_id),
                intval($uid)
        );
-       if(! count($i))
+       if (! count($i))
                return;
 
        $item = $i[0];
@@ -1545,2065 +1215,279 @@ function tag_deliver($uid,$item_id) {
        $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
 
        $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
-       if($cnt) {
+       if ($cnt) {
                foreach($matches as $mtch) {
-                       if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
+                       if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
                                $mention = true;
                                logger('tag_deliver: mention found: ' . $mtch[2]);
                        }
                }
-       }
-
-       if(! $mention){
-               if ( ($community_page || $prvgroup) &&
-                         (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
-                       // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
-                       // delete it!
-                       logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
-                       q("DELETE FROM item WHERE id = %d and uid = %d",
-                               intval($item_id),
-                               intval($uid)
-                       );
-                       return true;
-               }
-               return;
-       }
-
-
-       // send a notification
-
-       // use a local photo if we have one
-
-       $r = q("select * from contact where uid = %d and nurl = '%s' limit 1",
-               intval($u[0]['uid']),
-               dbesc(normalise_link($item['author-link']))
-       );
-       $photo = (($r && count($r)) ? $r[0]['thumb'] : $item['author-avatar']);
-
-
-       require_once('include/enotify.php');
-       notification(array(
-               'type'         => NOTIFY_TAGSELF,
-               'notify_flags' => $u[0]['notify-flags'],
-               'language'     => $u[0]['language'],
-               'to_name'      => $u[0]['username'],
-               'to_email'     => $u[0]['email'],
-               'uid'          => $u[0]['uid'],
-               'item'         => $item,
-               'link'         => $a->get_baseurl() . '/display/'.urlencode(get_item_guid($item['id'])),
-               'source_name'  => $item['author-name'],
-               'source_link'  => $item['author-link'],
-               'source_photo' => $photo,
-               'verb'         => ACTIVITY_TAG,
-               'otype'        => 'item',
-               'parent'       => $item['parent']
-       ));
-
-
-       $arr = array('item' => $item, 'user' => $u[0], 'contact' => $r[0]);
-
-       call_hooks('tagged', $arr);
-
-       if((! $community_page) && (! $prvgroup))
-               return;
-
-
-       // tgroup delivery - setup a second delivery chain
-       // prevent delivery looping - only proceed
-       // if the message originated elsewhere and is a top-level post
-
-       if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
-               return;
-
-       // now change this copy of the post to a forum head message and deliver to all the tgroup members
-
-
-       $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
-               intval($u[0]['uid'])
-       );
-       if(! count($c))
-               return;
-
-       // also reset all the privacy bits to the forum default permissions
-
-       $private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
-
-       $forum_mode = (($prvgroup) ? 2 : 1);
-
-       q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
-               `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  where id = %d",
-               intval($forum_mode),
-               dbesc($c[0]['name']),
-               dbesc($c[0]['url']),
-               dbesc($c[0]['thumb']),
-               intval($private),
-               dbesc($u[0]['allow_cid']),
-               dbesc($u[0]['allow_gid']),
-               dbesc($u[0]['deny_cid']),
-               dbesc($u[0]['deny_gid']),
-               intval($item_id)
-       );
-       update_thread($item_id);
-
-       proc_run('php','include/notifier.php','tgroup',$item_id);
-
-}
-
-
-
-function tgroup_check($uid,$item) {
-
-       $a = get_app();
-
-       $mention = false;
-
-       // check that the message originated elsewhere and is a top-level post
-
-       if(($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri']))
-               return false;
-
-
-       $u = q("select * from user where uid = %d limit 1",
-               intval($uid)
-       );
-       if(! count($u))
-               return false;
-
-       $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
-       $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
-
-
-       $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
-
-       // Diaspora uses their own hardwired link URL in @-tags
-       // instead of the one we supply with webfinger
-
-       $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
-
-       $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
-       if($cnt) {
-               foreach($matches as $mtch) {
-                       if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
-                               $mention = true;
-                               logger('tgroup_check: mention found: ' . $mtch[2]);
-                       }
-               }
-       }
-
-       if(! $mention)
-               return false;
-
-       if((! $community_page) && (! $prvgroup))
-               return false;
-
-       return true;
-}
-
-/*
-  This function returns true if $update has an edited timestamp newer
-  than $existing, i.e. $update contains new data which should override
-  what's already there.  If there is no timestamp yet, the update is
-  assumed to be newer.  If the update has no timestamp, the existing
-  item is assumed to be up-to-date.  If the timestamps are equal it
-  assumes the update has been seen before and should be ignored.
-  */
-function edited_timestamp_is_newer($existing, $update) {
-    if (!x($existing,'edited') || !$existing['edited']) {
-       return true;
-    }
-    if (!x($update,'edited') || !$update['edited']) {
-       return false;
-    }
-    $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']);
-    $update_edited = datetime_convert('UTC', 'UTC', $update['edited']);
-    return (strcmp($existing_edited, $update_edited) < 0);
-}
-
-/**
- *
- * consume_feed - process atom feed and update anything/everything we might need to update
- *
- * $xml = the (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
- *
- * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
- *             It is this person's stuff that is going to be updated.
- * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
- *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST
- *             have a contact record.
- * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
- *        might not) try and subscribe to it.
- * $datedir sorts in reverse order
- * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been
- *      imported prior to its children being seen in the stream unless we are certain
- *      of how the feed is arranged/ordered.
- * With $pass = 1, we only pull parent items out of the stream.
- * With $pass = 2, we only pull children (comments/likes).
- *
- * So running this twice, first with pass 1 and then with pass 2 will do the right
- * thing regardless of feed ordering. This won't be adequate in a fully-threaded
- * model where comments can have sub-threads. That would require some massive sorting
- * to get all the feed items into a mostly linear ordering, and might still require
- * recursion.
- */
-
-function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
-       if ($contact['network'] === NETWORK_OSTATUS) {
-               if ($pass < 2) {
-                       // Test - remove before flight
-                       //$tempfile = tempnam(get_temppath(), "ostatus2");
-                       //file_put_contents($tempfile, $xml);
-                       logger("Consume OStatus messages ", LOGGER_DEBUG);
-                       ostatus_import($xml,$importer,$contact, $hub);
-               }
-               return;
-       }
-
-       if ($contact['network'] === NETWORK_FEED) {
-               if ($pass < 2) {
-                       logger("Consume feeds", LOGGER_DEBUG);
-                       feed_import($xml,$importer,$contact, $hub);
-               }
-               return;
-       }
-
-       require_once('library/simplepie/simplepie.inc');
-       require_once('include/contact_selectors.php');
-
-       if(! strlen($xml)) {
-               logger('consume_feed: empty input');
-               return;
-       }
-
-       $feed = new SimplePie();
-       $feed->set_raw_data($xml);
-       if($datedir)
-               $feed->enable_order_by_date(true);
-       else
-               $feed->enable_order_by_date(false);
-       $feed->init();
-
-       if($feed->error())
-               logger('consume_feed: Error parsing XML: ' . $feed->error());
-
-       $permalink = $feed->get_permalink();
-
-       // Check at the feed level for updated contact name and/or photo
-
-       $name_updated  = '';
-       $new_name = '';
-       $photo_timestamp = '';
-       $photo_url = '';
-       $birthday = '';
-       $contact_updated = '';
-
-       $hubs = $feed->get_links('hub');
-       logger('consume_feed: hubs: ' . print_r($hubs,true), LOGGER_DATA);
-
-       if(count($hubs))
-               $hub = implode(',', $hubs);
-
-       $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
-       if(! $rawtags)
-               $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
-       if($rawtags) {
-               $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
-               if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
-                       $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
-                       $new_name = $elems['name'][0]['data'];
-
-                       // Manually checking for changed contact names
-                       if (($new_name != $contact['name']) AND ($new_name != "") AND ($name_updated <= $contact['name-date'])) {
-                               $name_updated = date("c");
-                               $photo_timestamp = date("c");
-                       }
-               }
-               if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
-                       if ($photo_timestamp == "")
-                               $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
-                       $photo_url = $elems['link'][0]['attribs']['']['href'];
-               }
-
-               if((x($rawtags[0]['child'], NAMESPACE_DFRN)) && (x($rawtags[0]['child'][NAMESPACE_DFRN],'birthday'))) {
-                       $birthday = datetime_convert('UTC','UTC', $rawtags[0]['child'][NAMESPACE_DFRN]['birthday'][0]['data']);
-               }
-       }
-
-       if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
-               logger('consume_feed: Updating photo for '.$contact['name'].' from '.$photo_url.' uid: '.$contact['uid']);
-
-               $contact_updated = $photo_timestamp;
-
-               require_once("include/Photo.php");
-               $photos = import_profile_photo($photo_url,$contact['uid'],$contact['id']);
-
-               q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
-                       WHERE `uid` = %d AND `id` = %d AND NOT `self`",
-                       dbesc(datetime_convert()),
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       intval($contact['uid']),
-                       intval($contact['id'])
-               );
-       }
-
-       if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
-               if ($name_updated > $contact_updated)
-                       $contact_updated = $name_updated;
-
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                       intval($contact['uid']),
-                       intval($contact['id'])
-               );
-
-               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s' AND NOT `self`",
-                       dbesc(notags(trim($new_name))),
-                       dbesc(datetime_convert()),
-                       intval($contact['uid']),
-                       intval($contact['id']),
-                       dbesc(notags(trim($new_name)))
-               );
-
-               // do our best to update the name on content items
-
-               if(count($r) AND (notags(trim($new_name)) != $r[0]['name'])) {
-                       q("UPDATE `item` SET `author-name` = '%s' WHERE `author-name` = '%s' AND `author-link` = '%s' AND `uid` = %d AND `author-name` != '%s'",
-                               dbesc(notags(trim($new_name))),
-                               dbesc($r[0]['name']),
-                               dbesc($r[0]['url']),
-                               intval($contact['uid']),
-                               dbesc(notags(trim($new_name)))
-                       );
-               }
-       }
-
-       if ($contact_updated AND $new_name AND $photo_url)
-               poco_check($contact['url'], $new_name, NETWORK_DFRN, $photo_url, "", "", "", "", "", $contact_updated, 2, $contact['id'], $contact['uid']);
-
-       if(strlen($birthday)) {
-               if(substr($birthday,0,4) != $contact['bdyear']) {
-                       logger('consume_feed: updating birthday: ' . $birthday);
-
-                       /**
-                        *
-                        * Add new birthday event for this person
-                        *
-                        * $bdtext is just a readable placeholder in case the event is shared
-                        * with others. We will replace it during presentation to our $importer
-                        * to contain a sparkle link and perhaps a photo.
-                        *
-                        */
-
-                       $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']),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert('UTC','UTC', $birthday)),
-                               dbesc(datetime_convert('UTC','UTC', $birthday . ' + 1 day ')),
-                               dbesc($bdtext),
-                               dbesc($bdtext2),
-                               dbesc('birthday')
-                       );
-
-
-                       // update bdyear
-
-                       q("UPDATE `contact` SET `bdyear` = '%s' WHERE `uid` = %d AND `id` = %d",
-                               dbesc(substr($birthday,0,4)),
-                               intval($contact['uid']),
-                               intval($contact['id'])
-                       );
-
-                       // This function is called twice without reloading the contact
-                       // Make sure we only create one event. This is why &$contact
-                       // is a reference var in this function
-
-                       $contact['bdyear'] = substr($birthday,0,4);
-               }
-       }
-
-       $community_page = 0;
-       $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
-       if($rawtags) {
-               $community_page = intval($rawtags[0]['data']);
-       }
-       if(is_array($contact) && intval($contact['forum']) != $community_page) {
-               q("update contact set forum = %d where id = %d",
-                       intval($community_page),
-                       intval($contact['id'])
-               );
-               $contact['forum'] = (string) $community_page;
-       }
-
-
-       // process any deleted entries
-
-       $del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
-       if(is_array($del_entries) && count($del_entries) && $pass != 2) {
-               foreach($del_entries as $dentry) {
-                       $deleted = false;
-                       if(isset($dentry['attribs']['']['ref'])) {
-                               $uri = $dentry['attribs']['']['ref'];
-                               $deleted = true;
-                               if(isset($dentry['attribs']['']['when'])) {
-                                       $when = $dentry['attribs']['']['when'];
-                                       $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');
-                       }
-                       if($deleted && is_array($contact)) {
-                               $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)) {
-                                       $item = $r[0];
-
-                                       if(! $item['deleted'])
-                                               logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
-
-                                       if($item['object-type'] === ACTIVITY_OBJ_EVENT) {
-                                               logger("Deleting event ".$item['event-id'], LOGGER_DEBUG);
-                                               event_delete($item['event-id']);
-                                       }
-
-                                       if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-                                               $xo = parse_xml_string($item['object'],false);
-                                               $xt = parse_xml_string($item['target'],false);
-                                               if($xt->type === ACTIVITY_OBJ_NOTE) {
-                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
-                                                               dbesc($xt->id),
-                                                               intval($importer['importer_uid'])
-                                                       );
-                                                       if(count($i)) {
-
-                                                               // 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);
-
-                                                               if($owner_remove && $author_copy)
-                                                                       continue;
-                                                               if($author_remove || $owner_remove) {
-                                                                       $tags = explode(',',$i[0]['tag']);
-                                                                       $newtags = array();
-                                                                       if(count($tags)) {
-                                                                               foreach($tags as $tag)
-                                                                                       if(trim($tag) !== trim($xo->body))
-                                                                                               $newtags[] = trim($tag);
-                                                                       }
-                                                                       q("update item set tag = '%s' where id = %d",
-                                                                               dbesc(implode(',',$newtags)),
-                                                                               intval($i[0]['id'])
-                                                                       );
-                                                                       create_tags_from_item($i[0]['id']);
-                                                               }
-                                                       }
-                                               }
-                                       }
-
-                                       if($item['uri'] == $item['parent-uri']) {
-                                               $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'])
-                                               );
-                                               create_tags_from_itemuri($item['uri'], $importer['uid']);
-                                               create_files_from_itemuri($item['uri'], $importer['uid']);
-                                               update_thread_uri($item['uri'], $importer['uid']);
-                                       }
-                                       else {
-                                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-                                                       `body` = '', `title` = ''
-                                                       WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($when),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($uri),
-                                                       intval($importer['uid'])
-                                               );
-                                               create_tags_from_itemuri($uri, $importer['uid']);
-                                               create_files_from_itemuri($uri, $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'])
-                                                       );
-                                                       // 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'])
-                                                       );
-                                                       if(count($r)) {
-                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
-                                                                       intval($r[0]['id'])
-                                                               );
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       }
-
-       // Now process the feed
-
-       if($feed->get_item_quantity()) {
-
-               logger('consume_feed: feed item count = ' . $feed->get_item_quantity());
-
-               // in inverse date order
-               if ($datedir)
-                       $items = array_reverse($feed->get_items());
-               else
-                       $items = $feed->get_items();
-
-
-               foreach($items as $item) {
-
-                       $is_reply = false;
-                       $item_id = $item->get_id();
-                       $rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
-                       if(isset($rawthread[0]['attribs']['']['ref'])) {
-                               $is_reply = true;
-                               $parent_uri = $rawthread[0]['attribs']['']['ref'];
-                       }
-
-                       if(($is_reply) && is_array($contact)) {
-
-                               if($pass == 1)
-                                       continue;
-
-                               // not allowed to post
-
-                               if($contact['rel'] == CONTACT_IS_FOLLOWER)
-                                       continue;
-
-
-                               // Have we seen it? If not, import it.
-
-                               $item_id  = $item->get_id();
-                               $datarray = get_atom_elements($feed, $item, $contact);
-
-                               if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN))
-                                       $datarray['author-name'] = $contact['name'];
-                               if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN))
-                                       $datarray['author-link'] = $contact['url'];
-                               if((! x($datarray,'author-avatar')) && ($contact['network'] != NETWORK_DFRN))
-                                       $datarray['author-avatar'] = $contact['thumb'];
-
-                               if((! x($datarray,'author-name')) || (! x($datarray,'author-link'))) {
-                                       logger('consume_feed: no author information! ' . print_r($datarray,true));
-                                       continue;
-                               }
-
-                               $force_parent = false;
-                               if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
-                                       if($contact['network'] === NETWORK_OSTATUS)
-                                               $force_parent = true;
-                                       if(strlen($datarray['title']))
-                                               unset($datarray['title']);
-                                       $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                               dbesc(datetime_convert()),
-                                               dbesc($parent_uri),
-                                               intval($importer['uid'])
-                                       );
-                                       $datarray['last-child'] = 1;
-                                       update_thread_uri($parent_uri, $importer['uid']);
-                               }
-
-
-                               $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($item_id),
-                                       intval($importer['uid'])
-                               );
-
-                               // Update content if 'updated' changes
-
-                               if(count($r)) {
-                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                               // do not accept (ignore) an earlier edit than one we currently have.
-                                               if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                                       continue;
-
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($datarray['title']),
-                                                       dbesc($datarray['body']),
-                                                       dbesc($datarray['tag']),
-                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['uid'])
-                                               );
-                                               create_tags_from_itemuri($item_id, $importer['uid']);
-                                               update_thread_uri($item_id, $importer['uid']);
-                                       }
-
-                                       // update last-child if it changes
-
-                                       $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                                       if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) {
-                                               $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($parent_uri),
-                                                       intval($importer['uid'])
-                                               );
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d",
-                                                       intval($allow[0]['data']),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['uid'])
-                                               );
-                                               update_thread_uri($item_id, $importer['uid']);
-                                       }
-                                       continue;
-                               }
-
-
-                               if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
-                                       // one way feed - no remote comment ability
-                                       $datarray['last-child'] = 0;
-                               }
-                               $datarray['parent-uri'] = $parent_uri;
-                               $datarray['uid'] = $importer['uid'];
-                               $datarray['contact-id'] = $contact['id'];
-                               if(($datarray['verb'] === ACTIVITY_LIKE)
-                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
-                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
-                                       $datarray['type'] = 'activity';
-                                       $datarray['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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-                                       );
-                                       if($r && count($r))
-                                               continue;
-
-                                       $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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-                                       );
-                                       if($r && count($r))
-                                               continue;
-                               }
-
-                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-                                       $xo = parse_xml_string($datarray['object'],false);
-                                       $xt = parse_xml_string($datarray['target'],false);
-
-                                       if($xt->type == ACTIVITY_OBJ_NOTE) {
-                                               $r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
-                                                       dbesc($xt->id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               if(! count($r))
-                                                       continue;
-
-                                               // extract tag, if not duplicate, add to parent item
-                                               if($xo->id && $xo->content) {
-                                                       $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
-                                                       if(! (stristr($r[0]['tag'],$newtag))) {
-                                                               q("UPDATE item SET tag = '%s' WHERE id = %d",
-                                                                       dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
-                                                                       intval($r[0]['id'])
-                                                               );
-                                                               create_tags_from_item($r[0]['id']);
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               $r = item_store($datarray,$force_parent);
-                               continue;
-                       }
-
-                       else {
-
-                               // Head post of a conversation. Have we seen it? If not, import it.
-
-                               $item_id  = $item->get_id();
-
-                               $datarray = get_atom_elements($feed, $item, $contact);
-
-                               if(is_array($contact)) {
-                                       if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN))
-                                               $datarray['author-name'] = $contact['name'];
-                                       if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN))
-                                               $datarray['author-link'] = $contact['url'];
-                                       if((! x($datarray,'author-avatar')) && ($contact['network'] != NETWORK_DFRN))
-                                               $datarray['author-avatar'] = $contact['thumb'];
-                               }
-
-                               if((! x($datarray,'author-name')) || (! x($datarray,'author-link'))) {
-                                       logger('consume_feed: no author information! ' . print_r($datarray,true));
-                                       continue;
-                               }
-
-                               // special handling for events
-
-                               if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
-                                       $ev = bbtoevent($datarray['body']);
-                                       if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) {
-                                               $ev['uid'] = $importer['uid'];
-                                               $ev['uri'] = $item_id;
-                                               $ev['edited'] = $datarray['edited'];
-                                               $ev['private'] = $datarray['private'];
-                                               $ev['guid'] = $datarray['guid'];
-
-                                               if(is_array($contact))
-                                                       $ev['cid'] = $contact['id'];
-                                               $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                                       dbesc($item_id),
-                                                       intval($importer['uid'])
-                                               );
-                                               if(count($r))
-                                                       $ev['id'] = $r[0]['id'];
-                                               $xyz = event_store($ev);
-                                               continue;
-                                       }
-                               }
-
-                               if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
-                                       if(strlen($datarray['title']))
-                                               unset($datarray['title']);
-                                       $datarray['last-child'] = 1;
-                               }
-
-
-                               $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($item_id),
-                                       intval($importer['uid'])
-                               );
-
-                               // Update content if 'updated' changes
-
-                               if(count($r)) {
-                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                               // do not accept (ignore) an earlier edit than one we currently have.
-                                               if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                                       continue;
-
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($datarray['title']),
-                                                       dbesc($datarray['body']),
-                                                       dbesc($datarray['tag']),
-                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['uid'])
-                                               );
-                                               create_tags_from_itemuri($item_id, $importer['uid']);
-                                               update_thread_uri($item_id, $importer['uid']);
-                                       }
-
-                                       // update last-child if it changes
-
-                                       $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                                       if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                                       intval($allow[0]['data']),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['uid'])
-                                               );
-                                               update_thread_uri($item_id, $importer['uid']);
-                                       }
-                                       continue;
-                               }
-
-                               if(activity_match($datarray['verb'],ACTIVITY_FOLLOW)) {
-                                       logger('consume-feed: New follower');
-                                       new_follower($importer,$contact,$datarray,$item);
-                                       return;
-                               }
-                               if(activity_match($datarray['verb'],ACTIVITY_UNFOLLOW))  {
-                                       lose_follower($importer,$contact,$datarray,$item);
-                                       return;
-                               }
-
-                               if(activity_match($datarray['verb'],ACTIVITY_REQ_FRIEND)) {
-                                       logger('consume-feed: New friend request');
-                                       new_follower($importer,$contact,$datarray,$item,true);
-                                       return;
-                               }
-                               if(activity_match($datarray['verb'],ACTIVITY_UNFRIEND))  {
-                                       lose_sharer($importer,$contact,$datarray,$item);
-                                       return;
-                               }
-
-
-                               if(! is_array($contact))
-                                       return;
-
-
-                               if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
-                                               // one way feed - no remote comment ability
-                                               $datarray['last-child'] = 0;
-                               }
-                               if($contact['network'] === NETWORK_FEED)
-                                       $datarray['private'] = 2;
-
-                               $datarray['parent-uri'] = $item_id;
-                               $datarray['uid'] = $importer['uid'];
-                               $datarray['contact-id'] = $contact['id'];
-
-                               if(! link_compare($datarray['owner-link'],$contact['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('consume_feed: Correcting item owner.', LOGGER_DEBUG);
-                                       $datarray['owner-name']   = $contact['name'];
-                                       $datarray['owner-link']   = $contact['url'];
-                                       $datarray['owner-avatar'] = $contact['thumb'];
-                               }
-
-                               // We've allowed "followers" to reach this point so we can decide if they are
-                               // posting an @-tag delivery, which followers are allowed to do for certain
-                               // page types. Now that we've parsed the post, let's check if it is legit. Otherwise ignore it.
-
-                               if(($contact['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['uid'],$datarray)))
-                                       continue;
-
-                               // This is my contact on another system, but it's really me.
-                               // Turn this into a wall post.
-                               $notify = item_is_remote_self($contact, $datarray);
-
-                               $r = item_store($datarray, false, $notify);
-                               logger('Stored - Contact '.$contact['url'].' Notify '.$notify.' return '.$r.' Item '.print_r($datarray, true), LOGGER_DEBUG);
-                               continue;
-
-                       }
-               }
-       }
-}
-
-function item_is_remote_self($contact, &$datarray) {
-       $a = get_app();
-
-       if (!$contact['remote_self'])
-               return false;
-
-       // Prevent the forwarding of posts that are forwarded
-       if ($datarray["extid"] == NETWORK_DFRN)
-               return false;
-
-       // Prevent to forward already forwarded posts
-       if ($datarray["app"] == $a->get_hostname())
-               return false;
-
-       // Only forward posts
-       if ($datarray["verb"] != ACTIVITY_POST)
-               return false;
-
-       if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
-               return false;
-
-       $datarray2 = $datarray;
-       logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
-       if ($contact['remote_self'] == 2) {
-               $r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
-                       intval($contact['uid']));
-               if (count($r)) {
-                       $datarray['contact-id'] = $r[0]["id"];
-
-                       $datarray['owner-name'] = $r[0]["name"];
-                       $datarray['owner-link'] = $r[0]["url"];
-                       $datarray['owner-avatar'] = $r[0]["thumb"];
-
-                       $datarray['author-name']   = $datarray['owner-name'];
-                       $datarray['author-link']   = $datarray['owner-link'];
-                       $datarray['author-avatar'] = $datarray['owner-avatar'];
-               }
-
-               if ($contact['network'] != NETWORK_FEED) {
-                       $datarray["guid"] = get_guid(32);
-                       unset($datarray["plink"]);
-                       $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]);
-                       $datarray["parent-uri"] = $datarray["uri"];
-                       $datarray["extid"] = $contact['network'];
-                       $urlpart = parse_url($datarray2['author-link']);
-                       $datarray["app"] = $urlpart["host"];
-               } else
-                       $datarray['private'] = 0;
-       }
-
-       if ($contact['network'] != NETWORK_FEED) {
-               // Store the original post
-               $r = item_store($datarray2, false, false);
-               logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
-       } else
-               $datarray["app"] = "Feed";
-
-       return true;
-}
-
-function local_delivery($importer,$data) {
-
-       require_once('library/simplepie/simplepie.inc');
-
-       $a = get_app();
-
-       logger(__function__, LOGGER_TRACE);
-
-       if($importer['readonly']) {
-               // We aren't receiving stuff from this person. But we will quietly ignore them
-               // rather than a blatant "go away" message.
-               logger('local_delivery: ignoring');
-               return 0;
-               //NOTREACHED
-       }
-
-       // Consume notification feed. This may differ from consuming a public feed in several ways
-       // - might contain email or friend suggestions
-       // - might contain remote followup to our message
-       //              - in which case we need to accept it and then notify other conversants
-       // - we may need to send various email notifications
-
-       $feed = new SimplePie();
-       $feed->set_raw_data($data);
-       $feed->enable_order_by_date(false);
-       $feed->init();
-
-
-       if($feed->error())
-               logger('local_delivery: Error parsing XML: ' . $feed->error());
-
-
-       // Check at the feed level for updated contact name and/or photo
-
-       $name_updated  = '';
-       $new_name = '';
-       $photo_timestamp = '';
-       $photo_url = '';
-       $contact_updated = '';
-
-
-       $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
-
-// Fallback should not be needed here. If it isn't DFRN it won't have DFRN updated tags
-//     if(! $rawtags)
-//             $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
-
-       if($rawtags) {
-               $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
-               if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
-                       $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
-                       $new_name = $elems['name'][0]['data'];
-
-                       // Manually checking for changed contact names
-                       if (($new_name != $importer['name']) AND ($new_name != "") AND ($name_updated <= $importer['name-date'])) {
-                               $name_updated = date("c");
-                               $photo_timestamp = date("c");
-                       }
-               }
-               if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
-                       if ($photo_timestamp == "")
-                               $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
-                       $photo_url = $elems['link'][0]['attribs']['']['href'];
-               }
-       }
-
-       if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
-
-               $contact_updated = $photo_timestamp;
-
-               logger('local_delivery: Updating photo for ' . $importer['name']);
-               require_once("include/Photo.php");
-
-               $photos = import_profile_photo($photo_url,$importer['importer_uid'],$importer['id']);
-
-               q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
-                       WHERE `uid` = %d AND `id` = %d AND NOT `self`",
-                       dbesc(datetime_convert()),
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       intval($importer['importer_uid']),
-                       intval($importer['id'])
-               );
-       }
-
-       if(($name_updated) && (strlen($new_name)) && ($name_updated > $importer['name-date'])) {
-               if ($name_updated > $contact_updated)
-                       $contact_updated = $name_updated;
-
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                       intval($importer['importer_uid']),
-                       intval($importer['id'])
-               );
-
-               $x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d AND `name` != '%s' AND NOT `self`",
-                       dbesc(notags(trim($new_name))),
-                       dbesc(datetime_convert()),
-                       intval($importer['importer_uid']),
-                       intval($importer['id']),
-                       dbesc(notags(trim($new_name)))
-               );
-
-               // do our best to update the name on content items
-
-               if(count($r) AND (notags(trim($new_name)) != $r[0]['name'])) {
-                       q("UPDATE `item` SET `author-name` = '%s' WHERE `author-name` = '%s' AND `author-link` = '%s' AND `uid` = %d AND `author-name` != '%s'",
-                               dbesc(notags(trim($new_name))),
-                               dbesc($r[0]['name']),
-                               dbesc($r[0]['url']),
-                               intval($importer['importer_uid']),
-                               dbesc(notags(trim($new_name)))
-                       );
-               }
-       }
-
-       if ($contact_updated AND $new_name AND $photo_url)
-               poco_check($importer['url'], $new_name, NETWORK_DFRN, $photo_url, "", "", "", "", "", $contact_updated, 2, $importer['id'], $importer['importer_uid']);
-
-       // Currently unsupported - needs a lot of work
-       $reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
-       if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
-               $base = $reloc[0]['child'][NAMESPACE_DFRN];
-               $newloc = array();
-               $newloc['uid'] = $importer['importer_uid'];
-               $newloc['cid'] = $importer['id'];
-               $newloc['name'] = notags(unxmlify($base['name'][0]['data']));
-               $newloc['photo'] = notags(unxmlify($base['photo'][0]['data']));
-               $newloc['thumb'] = notags(unxmlify($base['thumb'][0]['data']));
-               $newloc['micro'] = notags(unxmlify($base['micro'][0]['data']));
-               $newloc['url'] = notags(unxmlify($base['url'][0]['data']));
-               $newloc['request'] = notags(unxmlify($base['request'][0]['data']));
-               $newloc['confirm'] = notags(unxmlify($base['confirm'][0]['data']));
-               $newloc['notify'] = notags(unxmlify($base['notify'][0]['data']));
-               $newloc['poll'] = notags(unxmlify($base['poll'][0]['data']));
-               $newloc['sitepubkey'] = notags(unxmlify($base['sitepubkey'][0]['data']));
-               /** relocated user must have original key pair */
-               /*$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
-               $newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));*/
-
-               logger("items:relocate contact ".print_r($newloc, true).print_r($importer, true), LOGGER_DEBUG);
-
-               // update contact
-               $r = q("SELECT photo, url FROM contact WHERE id=%d AND uid=%d;",
-                       intval($importer['id']),
-                       intval($importer['importer_uid']));
-               if ($r === false)
-                       return 1;
-               $old = $r[0];
-
-               $x = q("UPDATE contact SET
-                                       name = '%s',
-                                       photo = '%s',
-                                       thumb = '%s',
-                                       micro = '%s',
-                                       url = '%s',
-                                       nurl = '%s',
-                                       request = '%s',
-                                       confirm = '%s',
-                                       notify = '%s',
-                                       poll = '%s',
-                                       `site-pubkey` = '%s'
-                       WHERE id=%d AND uid=%d;",
-                                       dbesc($newloc['name']),
-                                       dbesc($newloc['photo']),
-                                       dbesc($newloc['thumb']),
-                                       dbesc($newloc['micro']),
-                                       dbesc($newloc['url']),
-                                       dbesc(normalise_link($newloc['url'])),
-                                       dbesc($newloc['request']),
-                                       dbesc($newloc['confirm']),
-                                       dbesc($newloc['notify']),
-                                       dbesc($newloc['poll']),
-                                       dbesc($newloc['sitepubkey']),
-                                       intval($importer['id']),
-                                       intval($importer['importer_uid']));
-
-               if ($x === false)
-                       return 1;
-               // update items
-               $fields = array(
-                       'owner-link' => array($old['url'], $newloc['url']),
-                       'author-link' => array($old['url'], $newloc['url']),
-                       'owner-avatar' => array($old['photo'], $newloc['photo']),
-                       'author-avatar' => array($old['photo'], $newloc['photo']),
-                       );
-               foreach ($fields as $n=>$f){
-                       $x = q("UPDATE `item` SET `%s`='%s' WHERE `%s`='%s' AND uid=%d",
-                                       $n, dbesc($f[1]),
-                                       $n, dbesc($f[0]),
-                                       intval($importer['importer_uid']));
-                               if ($x === false)
-                                       return 1;
-                       }
-
-               /// @TODO
-               /// merge with current record, current contents have priority
-               /// update record, set url-updated
-               /// update profile photos
-               /// schedule a scan?
-               return 0;
-       }
-
-
-       // handle friend suggestion notification
-
-       $sugg = $feed->get_feed_tags( NAMESPACE_DFRN, 'suggest' );
-       if(isset($sugg[0]['child'][NAMESPACE_DFRN])) {
-               $base = $sugg[0]['child'][NAMESPACE_DFRN];
-               $fsugg = array();
-               $fsugg['uid'] = $importer['importer_uid'];
-               $fsugg['cid'] = $importer['id'];
-               $fsugg['name'] = notags(unxmlify($base['name'][0]['data']));
-               $fsugg['photo'] = notags(unxmlify($base['photo'][0]['data']));
-               $fsugg['url'] = notags(unxmlify($base['url'][0]['data']));
-               $fsugg['request'] = notags(unxmlify($base['request'][0]['data']));
-               $fsugg['body'] = escape_tags(unxmlify($base['note'][0]['data']));
-
-               // Does our member already have a friend matching this description?
-
-               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc($fsugg['name']),
-                       dbesc(normalise_link($fsugg['url'])),
-                       intval($fsugg['uid'])
-               );
-               if(count($r))
-                       return 0;
-
-               // Do we already have an fcontact record for this person?
-
-               $fid = 0;
-               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
-                       dbesc($fsugg['url']),
-                       dbesc($fsugg['name']),
-                       dbesc($fsugg['request'])
-               );
-               if(count($r)) {
-                       $fid = $r[0]['id'];
-
-                       // OK, we do. Do we already have an introduction for this person ?
-                       $r = q("select id from intro where uid = %d and fid = %d limit 1",
-                               intval($fsugg['uid']),
-                               intval($fid)
-                       );
-                       if(count($r))
-                               return 0;
-               }
-               if(! $fid)
-                       $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
-                       dbesc($fsugg['name']),
-                       dbesc($fsugg['url']),
-                       dbesc($fsugg['photo']),
-                       dbesc($fsugg['request'])
-               );
-               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
-                       dbesc($fsugg['url']),
-                       dbesc($fsugg['name']),
-                       dbesc($fsugg['request'])
-               );
-               if(count($r)) {
-                       $fid = $r[0]['id'];
-               }
-               // database record did not get created. Quietly give up.
-               else
-                       return 0;
-
-
-               $hash = random_string();
-
-               $r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
-                       VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
-                       intval($fsugg['uid']),
-                       intval($fid),
-                       intval($fsugg['cid']),
-                       dbesc($fsugg['body']),
-                       dbesc($hash),
-                       dbesc(datetime_convert()),
-                       intval(0)
-               );
-
-               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'         => $fsugg,
-                       'link'         => $a->get_baseurl() . '/notifications/intros',
-                       'source_name'  => $importer['name'],
-                       'source_link'  => $importer['url'],
-                       'source_photo' => $importer['photo'],
-                       'verb'         => ACTIVITY_REQ_FRIEND,
-                       'otype'        => 'intro'
-               ));
-
-               return 0;
-       }
-
-       $ismail = false;
-
-       $rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
-       if(isset($rawmail[0]['child'][NAMESPACE_DFRN])) {
-
-               logger('local_delivery: private message received');
-
-               $ismail = true;
-               $base = $rawmail[0]['child'][NAMESPACE_DFRN];
-
-               $msg = array();
-               $msg['uid'] = $importer['importer_uid'];
-               $msg['from-name'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['name'][0]['data']));
-               $msg['from-photo'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']));
-               $msg['from-url'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['uri'][0]['data']));
-               $msg['contact-id'] = $importer['id'];
-               $msg['title'] = notags(unxmlify($base['subject'][0]['data']));
-               $msg['body'] = escape_tags(unxmlify($base['content'][0]['data']));
-               $msg['seen'] = 0;
-               $msg['replied'] = 0;
-               $msg['uri'] = notags(unxmlify($base['id'][0]['data']));
-               $msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
-               $msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
-
-               dbesc_array($msg);
-
-               $r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
-                       . "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
-
-               // send notifications.
-
-               require_once('include/enotify.php');
-
-               $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'
-               );
-
-               notification($notif_params);
-               return 0;
-
-               // NOTREACHED
-       }
-
-       $community_page = 0;
-       $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
-       if($rawtags) {
-               $community_page = intval($rawtags[0]['data']);
-       }
-       if(intval($importer['forum']) != $community_page) {
-               q("update contact set forum = %d where id = %d",
-                       intval($community_page),
-                       intval($importer['id'])
-               );
-               $importer['forum'] = (string) $community_page;
-       }
-
-       logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
-
-       // process any deleted entries
-
-       $del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
-       if(is_array($del_entries) && count($del_entries)) {
-               foreach($del_entries as $dentry) {
-                       $deleted = false;
-                       if(isset($dentry['attribs']['']['ref'])) {
-                               $uri = $dentry['attribs']['']['ref'];
-                               $deleted = true;
-                               if(isset($dentry['attribs']['']['when'])) {
-                                       $when = $dentry['attribs']['']['when'];
-                                       $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');
-                       }
-                       if($deleted) {
-
-                               // check for relayed deletes to our conversation
-
-                               $is_reply = false;
-                               $r = q("select * 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('local_delivery: possible community delete');
-                                       }
-                                       else
-                                               $sql_extra = " and contact.self = 1 and item.wall = 1 ";
-
-                                       // was the top-level post for this reply written by somebody on this site?
-                                       // Specifically, the recipient?
-
-                                       $is_a_remote_delete = false;
-
-                                       // POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
-                                       $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
-                                               `contact`.`name`, `contact`.`url`, `contact`.`thumb` 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('local_delivery: not a community delete');
-                                               }
-                                       }
-
-                                       if($is_a_remote_delete) {
-                                               logger('local_delivery: received remote delete');
-                                       }
-                               }
-
-                               $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['importer_uid']),
-                                       intval($importer['id'])
-                               );
-
-                               if(count($r)) {
-                                       $item = $r[0];
-
-                                       if($item['deleted'])
-                                               continue;
-
-                                       logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
-
-                                       if($item['object-type'] === ACTIVITY_OBJ_EVENT) {
-                                               logger("Deleting event ".$item['event-id'], LOGGER_DEBUG);
-                                               event_delete($item['event-id']);
-                                       }
-
-                                       if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-                                               $xo = parse_xml_string($item['object'],false);
-                                               $xt = parse_xml_string($item['target'],false);
-
-                                               if($xt->type === ACTIVITY_OBJ_NOTE) {
-                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
-                                                               dbesc($xt->id),
-                                                               intval($importer['importer_uid'])
-                                                       );
-                                                       if(count($i)) {
-
-                                                               // 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);
-
-                                                               if($owner_remove && $author_copy)
-                                                                       continue;
-                                                               if($author_remove || $owner_remove) {
-                                                                       $tags = explode(',',$i[0]['tag']);
-                                                                       $newtags = array();
-                                                                       if(count($tags)) {
-                                                                               foreach($tags as $tag)
-                                                                                       if(trim($tag) !== trim($xo->body))
-                                                                                               $newtags[] = trim($tag);
-                                                                       }
-                                                                       q("update item set tag = '%s' where id = %d",
-                                                                               dbesc(implode(',',$newtags)),
-                                                                               intval($i[0]['id'])
-                                                                       );
-                                                                       create_tags_from_item($i[0]['id']);
-                                                               }
-                                                       }
-                                               }
-                                       }
-
-                                       if($item['uri'] == $item['parent-uri']) {
-                                               $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['importer_uid'])
-                                               );
-                                               create_tags_from_itemuri($item['uri'], $importer['importer_uid']);
-                                               create_files_from_itemuri($item['uri'], $importer['importer_uid']);
-                                               update_thread_uri($item['uri'], $importer['importer_uid']);
-                                       }
-                                       else {
-                                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-                                                       `body` = '', `title` = ''
-                                                       WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($when),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($uri),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               create_tags_from_itemuri($uri, $importer['importer_uid']);
-                                               create_files_from_itemuri($uri, $importer['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'])
-                                                       );
-                                                       // who is the last child now?
-                                                       $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
-                                                               ORDER BY `created` DESC LIMIT 1",
-                                                                       dbesc($item['parent-uri']),
-                                                                       intval($importer['importer_uid'])
-                                                       );
-                                                       if(count($r)) {
-                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
-                                                                       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']);
-                                       }
-                               }
-                       }
-               }
-       }
-
-
-       foreach($feed->get_items() as $item) {
-
-               $is_reply = false;
-               $item_id = $item->get_id();
-               $rawthread = $item->get_item_tags( NAMESPACE_THREAD, 'in-reply-to');
-               if(isset($rawthread[0]['attribs']['']['ref'])) {
-                       $is_reply = true;
-                       $parent_uri = $rawthread[0]['attribs']['']['ref'];
-               }
-
-               if($is_reply) {
-                       $community = false;
-
-                       if($importer['page-flags'] == PAGE_COMMUNITY || $importer['page-flags'] == PAGE_PRVGROUP ) {
-                               $sql_extra = '';
-                               $community = true;
-                               logger('local_delivery: possible community reply');
-                       }
-                       else
-                               $sql_extra = " and contact.self = 1 and item.wall = 1 ";
-
-                       // was the top-level post for this reply written by somebody on this site?
-                       // Specifically, the recipient?
-
-                       $is_a_remote_comment = false;
-                       $top_uri = $parent_uri;
-
-                       $r = q("select `item`.`parent-uri` from `item`
-                               WHERE `item`.`uri` = '%s'
-                               LIMIT 1",
-                               dbesc($parent_uri)
-                       );
-                       if($r && count($r)) {
-                               $top_uri = $r[0]['parent-uri'];
-
-                               // POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
-                               $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
-                                       `contact`.`name`, `contact`.`url`, `contact`.`thumb` 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($top_uri),
-                                       dbesc($top_uri),
-                                       dbesc($top_uri),
-                                       intval($importer['importer_uid'])
-                               );
-                               if($r && count($r))
-                                       $is_a_remote_comment = 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_comment && $community) {
-                               if((! $r[0]['forum_mode']) && (! $r[0]['wall'])) {
-                                       $is_a_remote_comment = false;
-                                       logger('local_delivery: not a community reply');
-                               }
-                       }
-
-                       if($is_a_remote_comment) {
-                               logger('local_delivery: received remote comment');
-                               $is_like = false;
-                               // remote reply to our post. Import and then notify everybody else.
-
-                               $datarray = get_atom_elements($feed, $item);
-
-                               $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body`  FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($item_id),
-                                       intval($importer['importer_uid'])
-                               );
-
-                               // Update content if 'updated' changes
-
-                               if(count($r)) {
-                                       $iid = $r[0]['id'];
-                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                               // do not accept (ignore) an earlier edit than one we currently have.
-                                               if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                                       continue;
-
-                                               logger('received updated comment' , LOGGER_DEBUG);
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($datarray['title']),
-                                                       dbesc($datarray['body']),
-                                                       dbesc($datarray['tag']),
-                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               create_tags_from_itemuri($item_id, $importer['importer_uid']);
-
-                                               proc_run('php',"include/notifier.php","comment-import",$iid);
-
-                                       }
-
-                                       continue;
-                               }
-
-
-
-                               $own = q("select name,url,thumb from contact where uid = %d and self = 1 limit 1",
-                                       intval($importer['importer_uid'])
-                               );
-
-
-                               $datarray['type'] = 'remote-comment';
-                               $datarray['wall'] = 1;
-                               $datarray['parent-uri'] = $parent_uri;
-                               $datarray['uid'] = $importer['importer_uid'];
-                               $datarray['owner-name'] = $own[0]['name'];
-                               $datarray['owner-link'] = $own[0]['url'];
-                               $datarray['owner-avatar'] = $own[0]['thumb'];
-                               $datarray['contact-id'] = $importer['id'];
-
-                               if(($datarray['verb'] === ACTIVITY_LIKE)
-                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
-                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
-                                       $is_like = true;
-                                       $datarray['type'] = 'activity';
-                                       $datarray['gravity'] = GRAVITY_LIKE;
-                                       $datarray['last-child'] = 0;
-                                       // 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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-                                       );
-                                       if($r && count($r))
-                                               continue;
-
-                                       $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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-
-                                       );
-                                       if($r && count($r))
-                                               continue;
-                               }
-
-                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-
-                                       $xo = parse_xml_string($datarray['object'],false);
-                                       $xt = parse_xml_string($datarray['target'],false);
-
-                                       if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id)) {
-
-                                               // fetch the parent item
-
-                                               $tagp = q("select * from item where uri = '%s' and uid = %d limit 1",
-                                                       dbesc($xt->id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               if(! count($tagp))
-                                                       continue;
-
-                                               // extract tag, if not duplicate, and this user allows tags, add to parent item
-
-                                               if($xo->id && $xo->content) {
-                                                       $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
-                                                       if(! (stristr($tagp[0]['tag'],$newtag))) {
-                                                               $i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
-                                                                       intval($importer['importer_uid'])
-                                                               );
-                                                               if(count($i) && ! intval($i[0]['blocktags'])) {
-                                                                       q("UPDATE item SET tag = '%s', `edited` = '%s', `changed` = '%s' WHERE id = %d",
-                                                                               dbesc($tagp[0]['tag'] . (strlen($tagp[0]['tag']) ? ',' : '') . $newtag),
-                                                                               intval($tagp[0]['id']),
-                                                                               dbesc(datetime_convert()),
-                                                                               dbesc(datetime_convert())
-                                                                       );
-                                                                       create_tags_from_item($tagp[0]['id']);
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-
-
-                               $posted_id = item_store($datarray);
-                               $parent = 0;
+       }
 
-                               if($posted_id) {
+       if (! $mention){
+               if ( ($community_page || $prvgroup) &&
+                         (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
+                       // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
+                       // delete it!
+                       logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
+                       q("DELETE FROM item WHERE id = %d and uid = %d",
+                               intval($item_id),
+                               intval($uid)
+                       );
+                       return true;
+               }
+               return;
+       }
 
-                                       $datarray["id"] = $posted_id;
+       $arr = array('item' => $item, 'user' => $u[0], 'contact' => $r[0]);
 
-                                       $r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                                               intval($posted_id),
-                                               intval($importer['importer_uid'])
-                                       );
-                                       if(count($r)) {
-                                               $parent = $r[0]['parent'];
-                                               $parent_uri = $r[0]['parent-uri'];
-                                       }
+       call_hooks('tagged', $arr);
 
-                                       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'])
-                                               );
-
-                                               $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
-                                                       dbesc(datetime_convert()),
-                                                       intval($importer['importer_uid']),
-                                                       intval($posted_id)
-                                               );
-                                       }
+       if ((! $community_page) && (! $prvgroup))
+               return;
 
-                                       if($posted_id && $parent) {
-
-                                               proc_run('php',"include/notifier.php","comment-import","$posted_id");
-
-                                               if((! $is_like) && (! $importer['self'])) {
-
-                                                       require_once('include/enotify.php');
-
-                                                       notification(array(
-                                                               'type'         => NOTIFY_COMMENT,
-                                                               'notify_flags' => $importer['notify-flags'],
-                                                               'language'     => $importer['language'],
-                                                               'to_name'      => $importer['username'],
-                                                               'to_email'     => $importer['email'],
-                                                               'uid'          => $importer['importer_uid'],
-                                                               'item'         => $datarray,
-                                                               'link'             => $a->get_baseurl().'/display/'.urlencode(get_item_guid($posted_id)),
-                                                               'source_name'  => stripslashes($datarray['author-name']),
-                                                               'source_link'  => $datarray['author-link'],
-                                                               'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
-                                                                       ? $importer['thumb'] : $datarray['author-avatar']),
-                                                               'verb'         => ACTIVITY_POST,
-                                                               'otype'        => 'item',
-                                                               'parent'       => $parent,
-                                                               'parent_uri'   => $parent_uri,
-                                                       ));
 
-                                               }
-                                       }
+       // tgroup delivery - setup a second delivery chain
+       // prevent delivery looping - only proceed
+       // if the message originated elsewhere and is a top-level post
 
-                                       return 0;
-                                       // NOTREACHED
-                               }
-                       }
-                       else {
+       if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
+               return;
 
-                               // regular comment that is part of this total conversation. Have we seen it? If not, import it.
+       // now change this copy of the post to a forum head message and deliver to all the tgroup members
 
-                               $item_id  = $item->get_id();
-                               $datarray = get_atom_elements($feed,$item);
 
-                               if($importer['rel'] == CONTACT_IS_FOLLOWER)
-                                       continue;
+       $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
+               intval($u[0]['uid'])
+       );
+       if (! count($c))
+               return;
 
-                               $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                       dbesc($item_id),
-                                       intval($importer['importer_uid'])
-                               );
+       // also reset all the privacy bits to the forum default permissions
 
-                               // Update content if 'updated' changes
-
-                               if(count($r)) {
-                                       if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                               // do not accept (ignore) an earlier edit than one we currently have.
-                                               if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                                       continue;
-
-                                               $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                                       dbesc($datarray['title']),
-                                                       dbesc($datarray['body']),
-                                                       dbesc($datarray['tag']),
-                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               create_tags_from_itemuri($item_id, $importer['importer_uid']);
-                                       }
+       $private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
 
-                                       // update last-child if it changes
-
-                                       $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                                       if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) {
-                                               $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($parent_uri),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d",
-                                                       intval($allow[0]['data']),
-                                                       dbesc(datetime_convert()),
-                                                       dbesc($item_id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                       }
-                                       continue;
-                               }
+       $forum_mode = (($prvgroup) ? 2 : 1);
 
-                               $datarray['parent-uri'] = $parent_uri;
-                               $datarray['uid'] = $importer['importer_uid'];
-                               $datarray['contact-id'] = $importer['id'];
-                               if(($datarray['verb'] === ACTIVITY_LIKE)
-                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
-                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
-                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
-                                       $datarray['type'] = 'activity';
-                                       $datarray['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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-                                       );
-                                       if($r && count($r))
-                                               continue;
-
-                                       $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($datarray['uid']),
-                                               dbesc($datarray['author-link']),
-                                               dbesc($datarray['verb']),
-                                               dbesc($datarray['parent-uri'])
-                                       );
-                                       if($r && count($r))
-                                               continue;
+       q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
+               `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  where id = %d",
+               intval($forum_mode),
+               dbesc($c[0]['name']),
+               dbesc($c[0]['url']),
+               dbesc($c[0]['thumb']),
+               intval($private),
+               dbesc($u[0]['allow_cid']),
+               dbesc($u[0]['allow_gid']),
+               dbesc($u[0]['deny_cid']),
+               dbesc($u[0]['deny_gid']),
+               intval($item_id)
+       );
+       update_thread($item_id);
 
-                               }
+       proc_run(PRIORITY_HIGH,'include/notifier.php', 'tgroup', $item_id);
 
-                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-
-                                       $xo = parse_xml_string($datarray['object'],false);
-                                       $xt = parse_xml_string($datarray['target'],false);
-
-                                       if($xt->type == ACTIVITY_OBJ_NOTE) {
-                                               $r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
-                                                       dbesc($xt->id),
-                                                       intval($importer['importer_uid'])
-                                               );
-                                               if(! count($r))
-                                                       continue;
-
-                                               // 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($datarray);
 
-                               // find out if our user is involved in this conversation and wants to be notified.
 
-                               if(!x($datarray['type']) || $datarray['type'] != 'activity') {
+function tgroup_check($uid,$item) {
 
-                                       $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
-                                               dbesc($top_uri),
-                                               intval($importer['importer_uid'])
-                                       );
+       $a = get_app();
 
-                                       if(count($myconv)) {
-                                               $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+       $mention = false;
 
-                                               // first make sure this isn't our own post coming back to us from a wall-to-wall event
-                                               if(! link_compare($datarray['author-link'],$importer_url)) {
+       // check that the message originated elsewhere and is a top-level post
 
+       if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri']))
+               return false;
 
-                                                       foreach($myconv as $conv) {
 
-                                                               // now if we find a match, it means we're in this conversation
+       $u = q("select * from user where uid = %d limit 1",
+               intval($uid)
+       );
+       if (! count($u))
+               return false;
 
-                                                               if(! link_compare($conv['author-link'],$importer_url))
-                                                                       continue;
+       $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+       $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
-                                                               require_once('include/enotify.php');
 
-                                                               $conv_parent = $conv['parent'];
+       $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
-                                                               notification(array(
-                                                                       'type'         => NOTIFY_COMMENT,
-                                                                       'notify_flags' => $importer['notify-flags'],
-                                                                       'language'     => $importer['language'],
-                                                                       'to_name'      => $importer['username'],
-                                                                       'to_email'     => $importer['email'],
-                                                                       'uid'          => $importer['importer_uid'],
-                                                                       'item'         => $datarray,
-                                                                       'link'             => $a->get_baseurl().'/display/'.urlencode(get_item_guid($posted_id)),
-                                                                       'source_name'  => stripslashes($datarray['author-name']),
-                                                                       'source_link'  => $datarray['author-link'],
-                                                                       'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
-                                                                               ? $importer['thumb'] : $datarray['author-avatar']),
-                                                                       'verb'         => ACTIVITY_POST,
-                                                                       'otype'        => 'item',
-                                                                       'parent'       => $conv_parent,
-                                                                       'parent_uri'   => $parent_uri
+       // Diaspora uses their own hardwired link URL in @-tags
+       // instead of the one we supply with webfinger
 
-                                                               ));
+       $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
 
-                                                               // only send one notification
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                               }
-                               continue;
+       $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+       if ($cnt) {
+               foreach($matches as $mtch) {
+                       if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
+                               $mention = true;
+                               logger('tgroup_check: mention found: ' . $mtch[2]);
                        }
                }
+       }
 
-               else {
-
-                       // Head post of a conversation. Have we seen it? If not, import it.
-
-
-                       $item_id  = $item->get_id();
-                       $datarray = get_atom_elements($feed,$item);
-
-                       if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
-                               $ev = bbtoevent($datarray['body']);
-                               if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) {
-                                       $ev['cid'] = $importer['id'];
-                                       $ev['uid'] = $importer['uid'];
-                                       $ev['uri'] = $item_id;
-                                       $ev['edited'] = $datarray['edited'];
-                                       $ev['private'] = $datarray['private'];
-                                       $ev['guid'] = $datarray['guid'];
-
-                                       $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($item_id),
-                                               intval($importer['uid'])
-                                       );
-                                       if(count($r))
-                                               $ev['id'] = $r[0]['id'];
-                                       $xyz = event_store($ev);
-                                       continue;
-                               }
-                       }
+       if (! $mention)
+               return false;
 
-                       $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                               dbesc($item_id),
-                               intval($importer['importer_uid'])
-                       );
+       if ((! $community_page) && (! $prvgroup))
+               return false;
 
-                       // Update content if 'updated' changes
-
-                       if(count($r)) {
-                               if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                       // do not accept (ignore) an earlier edit than one we currently have.
-                                       if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                               continue;
-
-                                       $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                               dbesc($datarray['title']),
-                                               dbesc($datarray['body']),
-                                               dbesc($datarray['tag']),
-                                               dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                               dbesc(datetime_convert()),
-                                               dbesc($item_id),
-                                               intval($importer['importer_uid'])
-                                       );
-                                       create_tags_from_itemuri($item_id, $importer['importer_uid']);
-                                       update_thread_uri($item_id, $importer['importer_uid']);
-                               }
+       return true;
+}
 
-                               // update last-child if it changes
+/*
+  This function returns true if $update has an edited timestamp newer
+  than $existing, i.e. $update contains new data which should override
+  what's already there.  If there is no timestamp yet, the update is
+  assumed to be newer.  If the update has no timestamp, the existing
+  item is assumed to be up-to-date.  If the timestamps are equal it
+  assumes the update has been seen before and should be ignored.
+  */
+function edited_timestamp_is_newer($existing, $update) {
+    if (!x($existing,'edited') || !$existing['edited']) {
+       return true;
+    }
+    if (!x($update,'edited') || !$update['edited']) {
+       return false;
+    }
+    $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']);
+    $update_edited = datetime_convert('UTC', 'UTC', $update['edited']);
+    return (strcmp($existing_edited, $update_edited) < 0);
+}
 
-                               $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                               if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-                                       $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                               intval($allow[0]['data']),
-                                               dbesc(datetime_convert()),
-                                               dbesc($item_id),
-                                               intval($importer['importer_uid'])
-                                       );
-                               }
-                               continue;
-                       }
+/**
+ *
+ * consume_feed - process atom feed and update anything/everything we might need to update
+ *
+ * $xml = the (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
+ *
+ * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
+ *             It is this person's stuff that is going to be updated.
+ * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
+ *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST
+ *             have a contact record.
+ * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
+ *        might not) try and subscribe to it.
+ * $datedir sorts in reverse order
+ * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been
+ *      imported prior to its children being seen in the stream unless we are certain
+ *      of how the feed is arranged/ordered.
+ * With $pass = 1, we only pull parent items out of the stream.
+ * With $pass = 2, we only pull children (comments/likes).
+ *
+ * So running this twice, first with pass 1 and then with pass 2 will do the right
+ * thing regardless of feed ordering. This won't be adequate in a fully-threaded
+ * model where comments can have sub-threads. That would require some massive sorting
+ * to get all the feed items into a mostly linear ordering, and might still require
+ * recursion.
+ */
 
-                       $datarray['parent-uri'] = $item_id;
-                       $datarray['uid'] = $importer['importer_uid'];
-                       $datarray['contact-id'] = $importer['id'];
+function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
+       if ($contact['network'] === NETWORK_OSTATUS) {
+               if ($pass < 2) {
+                       // Test - remove before flight
+                       //$tempfile = tempnam(get_temppath(), "ostatus2");
+                       //file_put_contents($tempfile, $xml);
+                       logger("Consume OStatus messages ", LOGGER_DEBUG);
+                       ostatus::import($xml,$importer,$contact, $hub);
+               }
+               return;
+       }
 
+       if ($contact['network'] === NETWORK_FEED) {
+               if ($pass < 2) {
+                       logger("Consume feeds", LOGGER_DEBUG);
+                       feed_import($xml,$importer,$contact, $hub);
+               }
+               return;
+       }
 
-                       if(! link_compare($datarray['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('local_delivery: Correcting item owner.', LOGGER_DEBUG);
-                               $datarray['owner-name']   = $importer['senderName'];
-                               $datarray['owner-link']   = $importer['url'];
-                               $datarray['owner-avatar'] = $importer['thumb'];
-                       }
+       if ($contact['network'] === NETWORK_DFRN) {
+               logger("Consume DFRN messages", LOGGER_DEBUG);
+
+               $r = q("SELECT  `contact`.*, `contact`.`uid` AS `importer_uid`,
+                                       `contact`.`pubkey` AS `cpubkey`,
+                                       `contact`.`prvkey` AS `cprvkey`,
+                                       `contact`.`thumb` AS `thumb`,
+                                       `contact`.`url` as `url`,
+                                       `contact`.`name` as `senderName`,
+                                       `user`.*
+                       FROM `contact`
+                       LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+                       WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
+                       dbesc($contact["id"]), dbesc($importer["uid"])
+               );
+               if ($r) {
+                       logger("Now import the DFRN feed");
+                       dfrn::import($xml,$r[0], true);
+                       return;
+               }
+       }
+}
 
-                       if(($importer['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['importer_uid'],$datarray)))
-                               continue;
+function item_is_remote_self($contact, &$datarray) {
+       $a = get_app();
 
-                       // This is my contact on another system, but it's really me.
-                       // Turn this into a wall post.
-                       $notify = item_is_remote_self($importer, $datarray);
+       if (!$contact['remote_self'])
+               return false;
 
-                       $posted_id = item_store($datarray, false, $notify);
+       // Prevent the forwarding of posts that are forwarded
+       if ($datarray["extid"] == NETWORK_DFRN)
+               return false;
 
-                       if(stristr($datarray['verb'],ACTIVITY_POKE)) {
-                               $verb = urldecode(substr($datarray['verb'],strpos($datarray['verb'],'#')+1));
-                               if(! $verb)
-                                       continue;
-                               $xo = parse_xml_string($datarray['object'],false);
+       // Prevent to forward already forwarded posts
+       if ($datarray["app"] == $a->get_hostname())
+               return false;
 
-                               if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+       // Only forward posts
+       if ($datarray["verb"] != ACTIVITY_POST)
+               return false;
 
-                                       // somebody was poked/prodded. Was it me?
+       if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
+               return false;
 
-                                       $links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false);
+       $datarray2 = $datarray;
+       logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
+       if ($contact['remote_self'] == 2) {
+               $r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
+                       intval($contact['uid']));
+               if (dbm::is_result($r)) {
+                       $datarray['contact-id'] = $r[0]["id"];
 
-                               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'         => $datarray,
-                                                       'link'             => $a->get_baseurl().'/display/'.urlencode(get_item_guid($posted_id)),
-                                                       'source_name'  => stripslashes($datarray['author-name']),
-                                                       'source_link'  => $datarray['author-link'],
-                                                       'source_photo' => ((link_compare($datarray['author-link'],$importer['url']))
-                                                               ? $importer['thumb'] : $datarray['author-avatar']),
-                                                       'verb'         => $datarray['verb'],
-                                                       'otype'        => 'person',
-                                                       'activity'     => $verb,
-                                                       'parent'       => $datarray['parent']
-                                               ));
-                                       }
-                               }
-                       }
+                       $datarray['owner-name'] = $r[0]["name"];
+                       $datarray['owner-link'] = $r[0]["url"];
+                       $datarray['owner-avatar'] = $r[0]["thumb"];
 
-                       continue;
+                       $datarray['author-name']   = $datarray['owner-name'];
+                       $datarray['author-link']   = $datarray['owner-link'];
+                       $datarray['author-avatar'] = $datarray['owner-avatar'];
                }
+
+               if ($contact['network'] != NETWORK_FEED) {
+                       $datarray["guid"] = get_guid(32);
+                       unset($datarray["plink"]);
+                       $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]);
+                       $datarray["parent-uri"] = $datarray["uri"];
+                       $datarray["extid"] = $contact['network'];
+                       $urlpart = parse_url($datarray2['author-link']);
+                       $datarray["app"] = $urlpart["host"];
+               } else
+                       $datarray['private'] = 0;
        }
 
-       return 0;
-       // NOTREACHED
+       if ($contact['network'] != NETWORK_FEED) {
+               // Store the original post
+               $r = item_store($datarray2, false, false);
+               logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
+       } else
+               $datarray["app"] = "Feed";
 
+       return true;
 }
 
-
 function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
        $url = notags(trim($datarray['author-link']));
        $name = notags(trim($datarray['author-name']));
@@ -3611,13 +1495,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 
        if (is_object($item)) {
                $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
-               if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
+               if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
                        $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
        } else
                $nick = $item;
 
-       if(is_array($contact)) {
-               if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+       if (is_array($contact)) {
+               if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
                        || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
                        $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
                                intval(CONTACT_IS_FRIEND),
@@ -3643,21 +1527,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                        dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS),
                        intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER)
                );
-               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
+               $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
                                intval($importer['uid']),
                                dbesc($url)
                );
-               if(count($r)) {
-                               $contact_record = $r[0];
-
-                               $photos = import_profile_photo($photo,$importer["uid"],$contact_record["id"]);
-
-                               q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
-                                       dbesc($photos[0]),
-                                       dbesc($photos[1]),
-                                       dbesc($photos[2]),
-                                       intval($contact_record["id"])
-                               );
+               if (dbm::is_result($r)) {
+                       $contact_record = $r[0];
+                       update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
                }
 
 
@@ -3665,12 +1541,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                        intval($importer['uid'])
                );
                $a = get_app();
-               if(count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+
+               if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
 
                        // create notification
                        $hash = random_string();
 
-                       if(is_array($contact_record)) {
+                       if (is_array($contact_record)) {
                                $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`)
                                        VALUES ( %d, %d, 0, 0, '%s', '%s' )",
                                        intval($importer['uid']),
@@ -3680,12 +1557,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                );
                        }
 
-                       if(intval($r[0]['def_gid'])) {
-                               require_once('include/group.php');
-                               group_add_member($r[0]['uid'],'',$contact_record['id'],$r[0]['def_gid']);
-                       }
+                       $def_gid = get_default_group($importer['uid'], $contact_record["network"]);
+
+                       if (intval($def_gid))
+                               group_add_member($importer['uid'],'',$contact_record['id'],$def_gid);
 
-                       if(($r[0]['notify-flags'] & NOTIFY_INTRO) &&
+                       if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
                                in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
 
                                notification(array(
@@ -3704,7 +1581,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                                ));
 
                        }
-               } elseif (count($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+               } elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
                        $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
                                        intval($importer['uid']),
                                        dbesc($url)
@@ -3714,28 +1591,26 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
        }
 }
 
-function lose_follower($importer,$contact,$datarray,$item) {
+function lose_follower($importer,$contact,$datarray = array(),$item = "") {
 
-       if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
+       if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
                q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
                        intval(CONTACT_IS_SHARING),
                        intval($contact['id'])
                );
-       }
-       else {
+       } else {
                contact_remove($contact['id']);
        }
 }
 
-function lose_sharer($importer,$contact,$datarray,$item) {
+function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
 
-       if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+       if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
                q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
                        intval(CONTACT_IS_FOLLOWER),
                        intval($contact['id'])
                );
-       }
-       else {
+       } else {
                contact_remove($contact['id']);
        }
 }
@@ -3744,7 +1619,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
        $a = get_app();
 
-       if(is_array($importer)) {
+       if (is_array($importer)) {
                $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($importer['uid'])
                );
@@ -3754,7 +1629,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
        // through the direct Diaspora protocol. If we try and use
        // the feed, we'll get duplicates. So don't.
 
-       if((! count($r)) || $contact['network'] === NETWORK_DIASPORA)
+       if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA)
                return;
 
        $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
@@ -3767,7 +1642,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
        logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
-       if(!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) {
+       if (!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) {
                $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d",
                        dbesc($verify_token),
                        intval($contact['id'])
@@ -3784,7 +1659,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
 function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 
-       if(get_config('system','disable_embedded'))
+       if (get_config('system','disable_embedded'))
                return $s;
 
        $a = get_app();
@@ -3806,14 +1681,14 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
 
 
-               if(stristr($image , $site . '/photo/')) {
+               if (stristr($image , $site . '/photo/')) {
                        // Only embed locally hosted photos
                        $replace = false;
                        $i = basename($image);
                        $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i);
                        $x = strpos($i,'-');
 
-                       if($x) {
+                       if ($x) {
                                $res = substr($i,$x+1);
                                $i = substr($i,0,$x);
                                $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
@@ -3821,7 +1696,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                        intval($res),
                                        intval($uid)
                                );
-                               if($r) {
+                               if ($r) {
 
                                        // Check to see if we should replace this photo link with an embedded image
                                        // 1. No need to do so if the photo is public
@@ -3831,31 +1706,30 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                        //    permissions, regardless of order but first check to see if they're an exact
                                        //    match to save some processing overhead.
 
-                                       if(has_permissions($r[0])) {
-                                               if($cid) {
+                                       if (has_permissions($r[0])) {
+                                               if ($cid) {
                                                        $recips = enumerate_permissions($r[0]);
-                                                       if(in_array($cid, $recips)) {
+                                                       if (in_array($cid, $recips)) {
                                                                $replace = true;
                                                        }
-                                               }
-                                               elseif($item) {
-                                                       if(compare_permissions($item,$r[0]))
+                                               } elseif ($item) {
+                                                       if (compare_permissions($item,$r[0]))
                                                                $replace = true;
                                                }
                                        }
-                                       if($replace) {
+                                       if ($replace) {
                                                $data = $r[0]['data'];
                                                $type = $r[0]['type'];
 
                                                // If a custom width and height were specified, apply before embedding
-                                               if(preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
+                                               if (preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
                                                        logger('fix_private_photos: scaling photo', LOGGER_DEBUG);
 
                                                        $width = intval($match[1]);
                                                        $height = intval($match[2]);
 
                                                        $ph = new Photo($data, $type);
-                                                       if($ph->is_valid()) {
+                                                       if ($ph->is_valid()) {
                                                                $ph->scaleImage(max($width, $height));
                                                                $data = $ph->imageString();
                                                                $type = $ph->getType();
@@ -3872,7 +1746,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 
                $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]';
                $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]'));
-               if($orig_body === false)
+               if ($orig_body === false)
                        $orig_body = '';
 
                $img_start = strpos($orig_body, '[img');
@@ -3886,14 +1760,14 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 }
 
 function has_permissions($obj) {
-       if(($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
+       if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
                return true;
        return false;
 }
 
 function compare_permissions($obj1,$obj2) {
        // first part is easy. Check that these are exactly the same.
-       if(($obj1['allow_cid'] == $obj2['allow_cid'])
+       if (($obj1['allow_cid'] == $obj2['allow_cid'])
                && ($obj1['allow_gid'] == $obj2['allow_gid'])
                && ($obj1['deny_cid'] == $obj2['deny_cid'])
                && ($obj1['deny_gid'] == $obj2['deny_gid']))
@@ -3905,7 +1779,7 @@ function compare_permissions($obj1,$obj2) {
        $recipients2 = enumerate_permissions($obj2);
        sort($recipients1);
        sort($recipients2);
-       if($recipients1 == $recipients2)
+       if ($recipients1 == $recipients2)
                return true;
        return false;
 }
@@ -3913,7 +1787,6 @@ function compare_permissions($obj1,$obj2) {
 // returns an array of contact-ids that are allowed to see this object
 
 function enumerate_permissions($obj) {
-       require_once('include/group.php');
        $allow_people = expand_acl($obj['allow_cid']);
        $allow_groups = expand_groups(expand_acl($obj['allow_gid']));
        $deny_people  = expand_acl($obj['deny_cid']);
@@ -3928,17 +1801,17 @@ function item_getfeedtags($item) {
        $ret = array();
        $matches = false;
        $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
-       if($cnt) {
+       if ($cnt) {
                for($x = 0; $x < $cnt; $x ++) {
-                       if($matches[1][$x])
+                       if ($matches[1][$x])
                                $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]);
                }
        }
        $matches = false;
        $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
-       if($cnt) {
+       if ($cnt) {
                for($x = 0; $x < $cnt; $x ++) {
-                       if($matches[1][$x])
+                       if ($matches[1][$x])
                                $ret[] = array('@',$matches[1][$x], $matches[2][$x]);
                }
        }
@@ -3947,7 +1820,7 @@ function item_getfeedtags($item) {
 
 function item_expire($uid, $days, $network = "", $force = false) {
 
-       if((! $uid) || ($days < 1))
+       if ((! $uid) || ($days < 1))
                return;
 
        // $expire_network_only = save your own wall posts
@@ -3965,7 +1838,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
        } else
                $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
 
-       $r = q("SELECT * FROM `item`
+       $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
                WHERE `uid` = %d $range
                AND `id` = `parent`
                $sql_extra
@@ -3974,7 +1847,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
                intval($days)
        );
 
-       if(! count($r))
+       if (! dbm::is_result($r))
                return;
 
        $expire_items = get_pconfig($uid, 'expire','items');
@@ -3999,24 +1872,24 @@ function item_expire($uid, $days, $network = "", $force = false) {
 
                // don't expire filed items
 
-               if(strpos($item['file'],'[') !== false)
+               if (strpos($item['file'],'[') !== false)
                        continue;
 
                // Only expire posts, not photos and photo comments
 
-               if($expire_photos==0 && strlen($item['resource-id']))
+               if ($expire_photos==0 && strlen($item['resource-id']))
                        continue;
-               if($expire_starred==0 && intval($item['starred']))
+               if ($expire_starred==0 && intval($item['starred']))
                        continue;
-               if($expire_notes==0 && $item['type']=='note')
+               if ($expire_notes==0 && $item['type']=='note')
                        continue;
-               if($expire_items==0 && $item['type']!='note')
+               if ($expire_items==0 && $item['type']!='note')
                        continue;
 
                drop_item($item['id'],false);
        }
 
-       proc_run('php',"include/notifier.php","expire","$uid");
+       proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid);
 
 }
 
@@ -4024,21 +1897,21 @@ function item_expire($uid, $days, $network = "", $force = false) {
 function drop_items($items) {
        $uid = 0;
 
-       if(! local_user() && ! remote_user())
+       if (! local_user() && ! remote_user())
                return;
 
-       if(count($items)) {
+       if (count($items)) {
                foreach($items as $item) {
                        $owner = drop_item($item,false);
-                       if($owner && ! $uid)
+                       if ($owner && ! $uid)
                                $uid = $owner;
                }
        }
 
        // multiple threads may have been deleted, send an expire notification
 
-       if($uid)
-               proc_run('php',"include/notifier.php","expire","$uid");
+       if ($uid)
+               proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid);
 }
 
 
@@ -4052,8 +1925,8 @@ function drop_item($id,$interactive = true) {
                intval($id)
        );
 
-       if(! count($r)) {
-               if(! $interactive)
+       if (! dbm::is_result($r)) {
+               if (! $interactive)
                        return 0;
                notice( t('Item not found.') . EOL);
                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@@ -4063,30 +1936,30 @@ function drop_item($id,$interactive = true) {
 
        $owner = $item['uid'];
 
-       $cid = 0;
+       $contact_id = 0;
 
        // check if logged in user is either the author or owner of this item
 
-       if(is_array($_SESSION['remote'])) {
+       if (is_array($_SESSION['remote'])) {
                foreach($_SESSION['remote'] as $visitor) {
-                       if($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
-                               $cid = $visitor['cid'];
+                       if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
+                               $contact_id = $visitor['cid'];
                                break;
                        }
                }
        }
 
 
-       if((local_user() == $item['uid']) || ($cid) || (! $interactive)) {
+       if ((local_user() == $item['uid']) || ($contact_id) || (! $interactive)) {
 
                // Check if we should do HTML-based delete confirmation
-               if($_REQUEST['confirm']) {
+               if ($_REQUEST['confirm']) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
                        $query = explode_querystring($a->query_string);
                        $inputs = array();
                        foreach($query['args'] as $arg) {
-                               if(strpos($arg, 'confirm=') === false) {
+                               if (strpos($arg, 'confirm=') === false) {
                                        $arg_parts = explode('=', $arg);
                                        $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
                                }
@@ -4103,7 +1976,7 @@ function drop_item($id,$interactive = true) {
                        ));
                }
                // Now check how the user responded to the confirmation query
-               if($_REQUEST['canceled']) {
+               if ($_REQUEST['canceled']) {
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                }
 
@@ -4123,7 +1996,7 @@ function drop_item($id,$interactive = true) {
 
                $matches = false;
                $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
-               if($cnt) {
+               if ($cnt) {
                        foreach($matches as $mtch) {
                                file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true);
                        }
@@ -4132,7 +2005,7 @@ function drop_item($id,$interactive = true) {
                $matches = false;
 
                $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
-               if($cnt) {
+               if ($cnt) {
                        foreach($matches as $mtch) {
                                file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false);
                        }
@@ -4143,7 +2016,7 @@ function drop_item($id,$interactive = true) {
                // This only applies to photos uploaded from the photos page. Photos inserted into a post do not
                // generate a resource-id and therefore aren't intimately linked to the item.
 
-               if(strlen($item['resource-id'])) {
+               if (strlen($item['resource-id'])) {
                        q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
                                dbesc($item['resource-id']),
                                intval($item['uid'])
@@ -4153,7 +2026,7 @@ function drop_item($id,$interactive = true) {
 
                // If item is a link to an event, nuke the event record.
 
-               if(intval($item['event-id'])) {
+               if (intval($item['event-id'])) {
                        q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d",
                                intval($item['event-id']),
                                intval($item['uid'])
@@ -4215,7 +2088,7 @@ function drop_item($id,$interactive = true) {
 
                // If it's the parent of a comment thread, kill all the kids
 
-               if($item['uri'] == $item['parent-uri']) {
+               if ($item['uri'] == $item['parent-uri']) {
                        $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = ''
                                WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                dbesc(datetime_convert()),
@@ -4227,8 +2100,7 @@ function drop_item($id,$interactive = true) {
                        create_files_from_itemuri($item['parent-uri'], $item['uid']);
                        delete_thread_uri($item['parent-uri'], $item['uid']);
                        // ignore the result
-               }
-               else {
+               } else {
                        // 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()),
@@ -4240,29 +2112,25 @@ function drop_item($id,$interactive = true) {
                                dbesc($item['parent-uri']),
                                intval($item['uid'])
                        );
-                       if(count($r)) {
+                       if (dbm::is_result($r)) {
                                q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
                                        intval($r[0]['id'])
                                );
                        }
-
-                       // Add a relayable_retraction signature for Diaspora.
-                       store_diaspora_retract_sig($item, $a->user, $a->get_baseurl());
                }
 
                $drop_id = intval($item['id']);
 
                // send the notification upstream/downstream as the case may be
 
-               proc_run('php',"include/notifier.php","drop","$drop_id");
+               proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id);
 
-               if(! $interactive)
+               if (! $interactive)
                        return $owner;
                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                //NOTREACHED
-       }
-       else {
-               if(! $interactive)
+       } else {
+               if (! $interactive)
                        return 0;
                notice( t('Permission denied.') . EOL);
                goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@@ -4280,7 +2148,7 @@ function first_post_date($uid,$wall = false) {
                intval($uid),
                intval($wall ? 1 : 0)
        );
-       if(count($r)) {
+       if (dbm::is_result($r)) {
 //             logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
                return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10);
        }
@@ -4292,7 +2160,7 @@ function list_post_dates($uid, $wall) {
        $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
 
        $dthen = first_post_date($uid, $wall);
-       if(! $dthen)
+       if (! $dthen)
                return array();
 
        // Set the start and end date to the beginning of the month
@@ -4310,7 +2178,7 @@ function list_post_dates($uid, $wall) {
                $start_month = datetime_convert('','',$dstart,'Y-m-d');
                $end_month = datetime_convert('','',$dend,'Y-m-d');
                $str = day_translate(datetime_convert('','',$dnow,'F'));
-               if(! $ret[$dyear])
+               if (! $ret[$dyear])
                        $ret[$dyear] = array();
                $ret[$dyear][] = array($str,$end_month,$start_month);
                $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
@@ -4322,7 +2190,7 @@ function posted_dates($uid,$wall) {
        $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
 
        $dthen = first_post_date($uid,$wall);
-       if(! $dthen)
+       if (! $dthen)
                return array();
 
        // Set the start and end date to the beginning of the month
@@ -4348,21 +2216,21 @@ function posted_dates($uid,$wall) {
 function posted_date_widget($url,$uid,$wall) {
        $o = '';
 
-       if(! feature_enabled($uid,'archives'))
+       if (! feature_enabled($uid,'archives'))
                return $o;
 
        // For former Facebook folks that left because of "timeline"
 
-/*     if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
+/*     if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
                return $o;*/
 
        $visible_years = get_pconfig($uid,'system','archive_visible_years');
-       if(! $visible_years)
+       if (! $visible_years)
                $visible_years = 5;
 
        $ret = list_post_dates($uid,$wall);
 
-       if(! count($ret))
+       if (! count($ret))
                return $o;
 
        $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
@@ -4380,51 +2248,3 @@ function posted_date_widget($url,$uid,$wall) {
        ));
        return $o;
 }
-
-function store_diaspora_retract_sig($item, $user, $baseurl) {
-       // Note that we can't add a target_author_signature
-       // if the comment was deleted by a remote user. That should be ok, because if a remote user is deleting
-       // the comment, that means we're the home of the post, and Diaspora will only
-       // check the parent_author_signature of retractions that it doesn't have to relay further
-       //
-       // I don't think this function gets called for an "unlike," but I'll check anyway
-
-       $enabled = intval(get_config('system','diaspora_enabled'));
-       if(! $enabled) {
-               logger('drop_item: diaspora support disabled, not storing retraction signature', LOGGER_DEBUG);
-               return;
-       }
-
-       logger('drop_item: storing diaspora retraction signature');
-
-       $signed_text = $item['guid'] . ';' . ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
-
-       if(local_user() == $item['uid']) {
-
-               $handle = $user['nickname'] . '@' . substr($baseurl, strpos($baseurl,'://') + 3);
-               $authorsig = base64_encode(rsa_sign($signed_text,$user['prvkey'],'sha256'));
-       }
-       else {
-               $r = q("SELECT `nick`, `url` FROM `contact` WHERE `id` = '%d' LIMIT 1",
-                       $item['contact-id'] // If this function gets called, drop_item() has already checked remote_user() == $item['contact-id']
-               );
-               if(count($r)) {
-                       // The below handle only works for NETWORK_DFRN. I think that's ok, because this function
-                       // only handles DFRN deletes
-                       $handle_baseurl_start = strpos($r['url'],'://') + 3;
-                       $handle_baseurl_length = strpos($r['url'],'/profile') - $handle_baseurl_start;
-                       $handle = $r['nick'] . '@' . substr($r['url'], $handle_baseurl_start, $handle_baseurl_length);
-                       $authorsig = '';
-               }
-       }
-
-       if(isset($handle))
-               q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
-                       intval($item['id']),
-                       dbesc($signed_text),
-                       dbesc($authorsig),
-                       dbesc($handle)
-               );
-
-       return;
-}