]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
Merge pull request #2479 from annando/1604-vier-login
[friendica.git] / include / items.php
index 549027671d5e11c827c81ca43454a23acd0ee95f..5c0bb047ae63cf60d1d09b44d3ff6a4ec5798a9f 100644 (file)
@@ -14,314 +14,20 @@ require_once('include/socgraph.php');
 require_once('include/plaintext.php');
 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 get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0, $forpubsub = false) {
-
-
-       $sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
-       $public_feed = (($dfrn_id) ? false : true);
-       $starred     = false;   // not yet implemented, possible security issues
-       $converse    = false;
-
-       if($public_feed && $a->argc > 2) {
-               for($x = 2; $x < $a->argc; $x++) {
-                       if($a->argv[$x] == 'converse')
-                               $converse = true;
-                       if($a->argv[$x] == 'starred')
-                               $starred = true;
-                       if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
-                               $category = $a->argv[$x+1];
-               }
-       }
-
-
-
-       // default permissions - anonymous user
-
-       $sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ";
-
-       $r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
-               FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-               WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1",
-               dbesc($owner_nick)
-       );
-
-       if(! count($r))
-               killme();
-
-       $owner = $r[0];
-       $owner_id = $owner['user_uid'];
-       $owner_nick = $owner['nickname'];
-
-       $birthday = feed_birthday($owner_id,$owner['timezone']);
-
-       $sql_post_table = "";
-       $visibility = "";
-
-       if(! $public_feed) {
-
-               $sql_extra = '';
-               switch($direction) {
-                       case (-1):
-                               $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
-                               $my_id = $dfrn_id;
-                               break;
-                       case 0:
-                               $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-                               $my_id = '1:' . $dfrn_id;
-                               break;
-                       case 1:
-                               $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
-                               $my_id = '0:' . $dfrn_id;
-                               break;
-                       default:
-                               return false;
-                               break; // NOTREACHED
-               }
-
-               $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1",
-                       intval($owner_id)
-               );
-
-               if(! count($r))
-                       killme();
-
-               $contact = $r[0];
-               require_once('include/security.php');
-               $groups = init_groups_visitor($contact['id']);
-
-               if(count($groups)) {
-                       for($x = 0; $x < count($groups); $x ++)
-                               $groups[$x] = '<' . intval($groups[$x]) . '>' ;
-                       $gs = implode('|', $groups);
-               }
-               else
-                       $gs = '<<>>' ; // Impossible to match
-
-               $sql_extra = sprintf("
-                       AND ( `allow_cid` = '' OR     `allow_cid` REGEXP '<%d>' )
-                       AND ( `deny_cid`  = '' OR NOT `deny_cid`  REGEXP '<%d>' )
-                       AND ( `allow_gid` = '' OR     `allow_gid` REGEXP '%s' )
-                       AND ( `deny_gid`  = '' OR NOT `deny_gid`  REGEXP '%s')
-               ",
-                       intval($contact['id']),
-                       intval($contact['id']),
-                       dbesc($gs),
-                       dbesc($gs)
-               );
-       }
-
-       if($public_feed)
-               $sort = 'DESC';
-       else
-               $sort = 'ASC';
-
-       // Include answers to status.net posts in pubsub feeds
-       if($forpubsub) {
-               $sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-                               LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`";
-               $visibility = sprintf("AND (`item`.`parent` = `item`.`id`) OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s')))",
-                                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS));
-               $date_field = "`received`";
-               $sql_order = "`item`.`received` DESC";
-       } else {
-               $date_field = "`changed`";
-               $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
-       }
-
-       if(! strlen($last_update))
-               $last_update = 'now -30 days';
-
-       if(isset($category)) {
-               $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-                               dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
-               //$sql_extra .= file_tag_file_query('item',$category,'category');
-       }
-
-       if($public_feed) {
-               if(! $converse)
-                       $sql_extra .= " AND `contact`.`self` = 1 ";
-       }
-
-       $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
-
-       //      AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
-       //      dbesc($check_date),
-
-       $r = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id`,
-               `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
-               `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
-               `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-               `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,
-               `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
-               FROM `item` $sql_post_table
-               INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`parent` != 0
-               AND ((`item`.`wall` = 1) $visibility) AND `item`.$date_field > '%s'
-               $sql_extra
-               ORDER BY $sql_order LIMIT 0, 300",
-               intval($owner_id),
-               dbesc($check_date),
-               dbesc($sort)
-       );
-
-       // Will check further below if this actually returned results.
-       // We will provide an empty feed if that is the case.
-
-       $items = $r;
-
-       $feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl');
-
-       $atom = '';
-
-       $hubxml = feed_hublinks();
-
-       $salmon = feed_salmonlinks($owner_nick);
-
-       $alternatelink = $owner['url'];
-
-       if(isset($category))
-               $alternatelink .= "/category/".$category;
-
-       $atom .= replace_macros($feed_template, array(
-               '$version'      => xmlify(FRIENDICA_VERSION),
-               '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
-               '$feed_title'   => xmlify($owner['name']),
-               '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
-               '$hub'          => $hubxml,
-               '$salmon'       => $salmon,
-               '$alternatelink' => xmlify($alternatelink),
-               '$name'         => xmlify($owner['name']),
-               '$profile_page' => xmlify($owner['url']),
-               '$photo'        => xmlify($owner['photo']),
-               '$thumb'        => xmlify($owner['thumb']),
-               '$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
-               '$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
-               '$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-               '$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : ''),
-               '$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
-       ));
-
-       call_hooks('atom_feed', $atom);
-
-       if(! count($items)) {
-
-               call_hooks('atom_feed_end', $atom);
-
-               $atom .= '</feed>' . "\r\n";
-               return $atom;
-       }
-
-       foreach($items as $item) {
-
-               // prevent private email from leaking.
-               if($item['network'] === NETWORK_MAIL)
-                       continue;
-
-               // public feeds get html, our own nodes use bbcode
-
-               if($public_feed) {
-                       $type = 'html';
-                       // catch any email that's in a public conversation and make sure it doesn't leak
-                       if($item['private'])
-                               continue;
-               }
-               else {
-                       $type = 'text';
-               }
-
-               $atom .= atom_entry($item,$type,null,$owner,true);
-       }
-
-       call_hooks('atom_feed_end', $atom);
-
-       $atom .= '</feed>' . "\r\n";
-
-       return $atom;
-}
-
-
 function construct_verb($item) {
        if($item['verb'])
                return $item['verb'];
        return ACTIVITY_POST;
 }
 
-function construct_activity_object($item) {
-
-       if($item['object']) {
-               $o = '<as:object>' . "\r\n";
-               $r = parse_xml_string($item['object'],false);
-
-
-               if(! $r)
-                       return '';
-               if($r->type)
-                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
-               if($r->id)
-                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
-               if($r->title)
-                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
-               if($r->link) {
-                       if(substr($r->link,0,1) === '<') {
-                               // patch up some facebook "like" activity objects that got stored incorrectly
-                               // for a couple of months prior to 9-Jun-2011 and generated bad XML.
-                               // we can probably remove this hack here and in the following function in a few months time.
-                               if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
-                                       $r->link = str_replace('&','&amp;', $r->link);
-                               $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
-                               $o .= $r->link;
-                       }
-                       else
-                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
-               }
-               if($r->content)
-                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-               $o .= '</as:object>' . "\r\n";
-               return $o;
-       }
-
-       return '';
-}
-
-function construct_activity_target($item) {
-
-       if($item['target']) {
-               $o = '<as:target>' . "\r\n";
-               $r = parse_xml_string($item['target'],false);
-               if(! $r)
-                       return '';
-               if($r->type)
-                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
-               if($r->id)
-                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
-               if($r->title)
-                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
-               if($r->link) {
-                       if(substr($r->link,0,1) === '<') {
-                               if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
-                                       $r->link = str_replace('&','&amp;', $r->link);
-                               $r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
-                               $o .= $r->link;
-                       }
-                       else
-                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
-               }
-               if($r->content)
-                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-               $o .= '</as:target>' . "\r\n";
-               return $o;
-       }
-
-       return '';
-}
-
 /* limit_body_size()
  *
  *             The purpose of this function is to apply system message length limits to
@@ -440,482 +146,6 @@ 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 (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND strstr($res['plink'], ".app.net/")) {
-               logger("get_atom_elements: detected app.net posting: ".print_r($res, true), LOGGER_DEBUG);
-               $res['title'] = "";
-               $res['body'] = nl2br($res['body']);
-       }
-
-       // removing the content of the title if its identically to the body
-       // This helps with auto generated titles e.g. from tumblr
-       if (title_is_body($res["title"], $res["body"]))
-               $res['title'] = "";
-
-       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']);
-
-
-       }
-       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']);
-       }
-
-
-       // 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']);
-                       }
-               }
-       }
-
-       $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;
-       }
-
-       $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
-
-       // select between supported verbs
-
-       if($rawverb) {
-               $res['verb'] = unxmlify($rawverb[0]['data']);
-       }
-
-       // 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);
-       }
-
-       $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);
-       }
-
-       $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";
-       }
-
-       $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";
-               }
-
-               $res['target'] .= '</target>' . "\n";
-       }
-
-       // This is some experimental stuff. By now retweets are shown with "RT:"
-       // But: There is data so that the message could be shown similar to native retweets
-       // There is some better way to parse this array - but it didn't worked for me.
-       $child = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://activitystrea.ms/spec/1.0/"][object][0]["child"];
-       if (is_array($child)) {
-               logger('get_atom_elements: Looking for status.net repeated message');
-
-               $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"];
-               $orig_id = ostatus_convert_href($child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"]);
-               $author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10];
-               $uri = $author["uri"][0]["data"];
-               $name = $author["name"][0]["data"];
-               $avatar = @array_shift($author["link"][2]["attribs"]);
-               $avatar = $avatar["href"];
-
-               if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-                       logger('get_atom_elements: fixing sender of repeated message. '.$orig_id, LOGGER_DEBUG);
-
-                       if (!intval(get_config('system','wall-to-wall_share'))) {
-                               $prefix = share_header($name, $uri, $avatar, "", "", $orig_link);
-
-                               $res["body"] = $prefix.html2bbcode($message)."[/share]";
-                       } else {
-                               $res["owner-name"] = $res["author-name"];
-                               $res["owner-link"] = $res["author-link"];
-                               $res["owner-avatar"] = $res["author-avatar"];
-
-                               $res["author-name"] = $name;
-                               $res["author-link"] = $uri;
-                               $res["author-avatar"] = $avatar;
-
-                               $res["body"] = html2bbcode($message);
-                       }
-               }
-       }
-
-       if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND $contact['fetch_further_information']) {
-               $preview = "";
-
-               // Handle enclosures and treat them as preview picture
-               if (isset($attach))
-                       foreach ($attach AS $attachment)
-                               if ($attachment->type == "image/jpeg")
-                                       $preview = $attachment->link;
-
-               $res["body"] = $res["title"].add_page_info($res['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
-               $res["tag"] = add_page_keywords($res['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
-               $res["title"] = "";
-               $res["object-type"] = ACTIVITY_OBJ_BOOKMARK;
-               unset($res["attach"]);
-       } elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_OSTATUS))
-               $res["body"] = add_page_info_to_body($res["body"]);
-       elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND strstr($res['plink'], ".app.net/")) {
-               $res["body"] = add_page_info_to_body($res["body"]);
-       }
-
-       $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);
 
@@ -931,48 +161,51 @@ function add_page_info_data($data) {
        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 (sizeof($data["images"]) > 0)
+               $preview = $data["images"][0];
+       else
+               $preview = "";
 
-       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]';
+       // 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));
+
+       $text = "[attachment type='".$data["type"]."'";
+
+       if ($data["url"] != "")
+               $text .= " url='".$data["url"]."'";
+       if ($data["title"] != "")
+               $text .= " title='".$data["title"]."'";
+       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."'";
        }
-
-       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"])) {
                $a = get_app();
                $hashtags = "\n";
                foreach ($data["keywords"] AS $keyword) {
-                       $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
-                                               array("","", "", "", "", ""), $keyword);
+                       /// @todo make a positive list of allowed characters
+                       $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
+                                               array("","", "", "", "", "", "", "", "", "", "", ""), $keyword);
                        $hashtags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
                }
        }
 
-       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 = Cache::get("parse_url:".$url);
-       if (is_null($data)){
-               $data = parseurl_getsiteinfo($url, true);
-               Cache::set("parse_url:".$url,serialize($data), CACHE_DAY);
-       } else
-               $data = unserialize($data);
+       $data = parseurl_getsiteinfo_cached($url, true);
 
        if ($photo != "")
                $data["images"][0]["src"] = $photo;
@@ -1066,37 +299,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.
@@ -1142,12 +344,36 @@ function item_add_language_opt(&$arr) {
        }
 }
 
-function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
+/**
+ * @brief Creates an unique guid out of a given uri
+ *
+ * @param string $uri uri of an item entry
+ * @return string unique guid
+ */
+function uri_to_guid($uri) {
 
-       // If it is a posting where users should get notifications, then define it as wall posting
-       if ($notify) {
-               $arr['wall'] = 1;
-               $arr['type'] = 'wall';
+       // 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);
+       $guid_prefix = hash("crc32", $parsed["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) {
+
+       // If it is a posting where users should get notifications, then define it as wall posting
+       if ($notify) {
+               $arr['wall'] = 1;
+               $arr['type'] = 'wall';
                $arr['origin'] = 1;
                $arr['last-child'] = 1;
                $arr['network'] = NETWORK_DFRN;
@@ -1165,9 +391,9 @@ 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'))
@@ -1217,33 +443,6 @@ 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))
@@ -1253,6 +452,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
        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"]);
@@ -1304,6 +507,10 @@ 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'])                  : '');
 
+
+       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']);
@@ -1338,9 +545,37 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG);
        }
 
-       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']));
+       // 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
+               // 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)
+                       $arr["contact-id"] = get_contact($arr['owner-link'], $uid);
+
+               // Still missing? Then use the "self" contact of the current user
+               if ($arr["contact-id"] == 0) {
+                       $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid));
+                       if ($r)
+                               $arr["contact-id"] = $r[0]["id"];
+               }
+               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['guid'] != "") {
                // Checking if there is already an item with the same guid
@@ -1480,9 +715,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        if ($arr["uid"] == 0) {
                $arr["global"] = true;
 
-               q("UPDATE `item` SET `global` = 1 WHERE `guid` = '%s'", dbesc($arr["guid"]));
+               q("UPDATE `item` SET `global` = 1 WHERE `uri` = '%s'", dbesc($arr["uri"]));
        }  else {
-               $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `guid` = '%s'", dbesc($arr["guid"]));
+               $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
 
                $arr["global"] = (count($isglobal) > 0);
        }
@@ -1535,9 +770,6 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                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);
 
@@ -1613,6 +845,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                );
 
        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.
+               if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) {
+                       $dsprsig->signature = base64_decode($dsprsig->signature);
+                       logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
+               }
+
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                        intval($current_post),
                        dbesc($dsprsig->signed_text),
@@ -1650,74 +890,19 @@ 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);
-
        create_tags_from_item($current_post);
        create_files_from_item($current_post);
 
        // Only check for notifications on start posts
-       if ($arr['parent-uri'] === $arr['uri']) {
+       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);
-
-               // 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;
-                               }
-                       }
-               }
-
-               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']));
-
-                       $item = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d",
-                               intval($current_post),
-                               intval($arr['uid'])
-                       );
-
-                       $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);
-               }
-       } else {
+       else {
                update_thread($parent_id);
                add_shadow_entry($arr);
        }
 
+       check_item_notification($current_post, $uid);
+
        if ($notify)
                proc_run('php', "include/notifier.php", $notify_type, $current_post);
 
@@ -1913,37 +1098,6 @@ function tag_deliver($uid,$item_id) {
                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);
@@ -1999,2188 +1153,200 @@ 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;
-
-}
-
-
-
-
-
-
-function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
-
-       $a = get_app();
-
-       $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
-
-       if($contact['duplex'] && $contact['dfrn-id'])
-               $idtosend = '0:' . $orig_id;
-       if($contact['duplex'] && $contact['issued-id'])
-               $idtosend = '1:' . $orig_id;
-
-
-       $rino = get_config('system','rino_encrypt');
-       $rino = intval($rino);
-       // use RINO1 if mcrypt isn't installed and RINO2 was selected
-       if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
-
-       logger("Local rino version: ". $rino, LOGGER_DEBUG);
-
-       $ssl_val = intval(get_config('system','ssl_policy'));
-       $ssl_policy = '';
-
-       switch($ssl_val){
-               case SSL_POLICY_FULL:
-                       $ssl_policy = 'full';
-                       break;
-               case SSL_POLICY_SELFSIGN:
-                       $ssl_policy = 'self';
-                       break;
-               case SSL_POLICY_NONE:
-               default:
-                       $ssl_policy = 'none';
-                       break;
-       }
-
-       $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino='.$rino : '');
-
-       logger('dfrn_deliver: ' . $url);
-
-       $xml = fetch_url($url);
-
-       $curl_stat = $a->get_curl_code();
-       if(! $curl_stat)
-               return(-1); // timed out
-
-       logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
-
-       if(! $xml)
-               return 3;
-
-       if(strpos($xml,'<?xml') === false) {
-               logger('dfrn_deliver: no valid XML returned');
-               logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
-               return 3;
-       }
-
-       $res = parse_xml_string($xml);
-
-       if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-               return (($res->status) ? $res->status : 3);
-
-       $postvars     = array();
-       $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
-       $challenge    = hex2bin((string) $res->challenge);
-       $perm         = (($res->perm) ? $res->perm : null);
-       $dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
-       $rino_remote_version = intval($res->rino);
-       $page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
-
-       logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
-
-       if($owner['page-flags'] == PAGE_PRVGROUP)
-               $page = 2;
-
-       $final_dfrn_id = '';
-
-       if($perm) {
-               if((($perm == 'rw') && (! intval($contact['writable'])))
-               || (($perm == 'r') && (intval($contact['writable'])))) {
-                       q("update contact set writable = %d where id = %d",
-                               intval(($perm == 'rw') ? 1 : 0),
-                               intval($contact['id'])
-                       );
-                       $contact['writable'] = (string) 1 - intval($contact['writable']);
-               }
-       }
-
-       if(($contact['duplex'] && strlen($contact['pubkey']))
-               || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-               || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
-               openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-               openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-       }
-       else {
-               openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-               openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
-       }
-
-       $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
-       if(strpos($final_dfrn_id,':') == 1)
-               $final_dfrn_id = substr($final_dfrn_id,2);
-
-       if($final_dfrn_id != $orig_id) {
-               logger('dfrn_deliver: wrong dfrn_id.');
-               // did not decode properly - cannot trust this site
-               return 3;
-       }
-
-       $postvars['dfrn_id']      = $idtosend;
-       $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
-       if($dissolve)
-               $postvars['dissolve'] = '1';
-
-
-       if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-               $postvars['data'] = $atom;
-               $postvars['perm'] = 'rw';
-       }
-       else {
-               $postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
-               $postvars['perm'] = 'r';
-       }
-
-       $postvars['ssl_policy'] = $ssl_policy;
-
-       if($page)
-               $postvars['page'] = $page;
-
-
-       if($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
-               logger('rino version: '. $rino_remote_version);
-
-               switch($rino_remote_version) {
-                       case 1:
-                               // Deprecated rino version!
-                               $key = substr(random_string(),0,16);
-                               $data = aes_encrypt($postvars['data'],$key);
-                               break;
-                       case 2:
-                               // RINO 2 based on php-encryption
-                               try {
-                                       $key = Crypto::createNewRandomKey();
-                               } catch (CryptoTestFailed $ex) {
-                                       logger('Cannot safely create a key');
-                                       return -1;
-                               } catch (CannotPerformOperation $ex) {
-                                       logger('Cannot safely create a key');
-                                       return -1;
-                               }
-                               try {
-                                       $data = Crypto::encrypt($postvars['data'], $key);
-                               } catch (CryptoTestFailed $ex) {
-                                       logger('Cannot safely perform encryption');
-                                       return -1;
-                               } catch (CannotPerformOperation $ex) {
-                                       logger('Cannot safely perform encryption');
-                                       return -1;
-                               }
-                               break;
-                       default:
-                               logger("rino: invalid requested verision '$rino_remote_version'");
-                               return -1;
-               }
-
-               $postvars['rino'] = $rino_remote_version;
-               $postvars['data'] = bin2hex($data);
-
-               #logger('rino: sent key = ' . $key, LOGGER_DEBUG);
-
-
-               if($dfrn_version >= 2.1) {
-                       if(($contact['duplex'] && strlen($contact['pubkey']))
-                               || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-                               || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
-
-                               openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
-                       }
-                       else {
-                               openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
-                       }
-               }
-               else {
-                       if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-                               openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
-                       }
-                       else {
-                               openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
-                       }
-               }
-
-               logger('md5 rawkey ' . md5($postvars['key']));
-
-               $postvars['key'] = bin2hex($postvars['key']);
-       }
-
-
-       logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
-
-       $xml = post_url($contact['notify'],$postvars);
-
-       logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
-
-       $curl_stat = $a->get_curl_code();
-       if((! $curl_stat) || (! strlen($xml)))
-               return(-1); // timed out
-
-       if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
-               return(-1);
-
-       if(strpos($xml,'<?xml') === false) {
-               logger('dfrn_deliver: phase 2: no valid XML returned');
-               logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
-               return 3;
-       }
-
-       if($contact['term-date'] != '0000-00-00 00:00:00') {
-               logger("dfrn_deliver: $url back from the dead - removing mark for death");
-               require_once('include/Contact.php');
-               unmark_for_death($contact);
-       }
-
-       $res = parse_xml_string($xml);
-
-       return $res->status;
-}
-
-
-/*
-  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) {
-       $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) {
-
-                                       $datarray["id"] = $posted_id;
-
-                                       $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'];
-                                       }
-
-                                       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($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,
-                                                       ));
-
-                                               }
-                                       }
-
-                                       return 0;
-                                       // NOTREACHED
-                               }
-                       }
-                       else {
-
-                               // regular comment that is part of this total conversation. Have we seen it? If not, import it.
-
-                               $item_id  = $item->get_id();
-                               $datarray = get_atom_elements($feed,$item);
-
-                               if($importer['rel'] == CONTACT_IS_FOLLOWER)
-                                       continue;
-
-                               $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'])
-                               );
-
-                               // 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 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;
-                               }
-
-                               $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;
-
-                               }
-
-                               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') {
-
-                                       $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'])
-                                       );
-
-                                       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;
-                               }
-                       }
-
-                       $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(! $mention)
+               return false;
 
-                       // Update content if 'updated' changes
+       if((! $community_page) && (! $prvgroup))
+               return false;
 
-                       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 (count($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']));
@@ -4220,7 +1386,7 @@ 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)
                );
@@ -4257,10 +1423,10 @@ 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) &&
                                in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
@@ -4291,7 +1457,7 @@ 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)) {
                q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -4304,7 +1470,7 @@ function lose_follower($importer,$contact,$datarray,$item) {
        }
 }
 
-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)) {
                q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -4317,7 +1483,6 @@ function lose_sharer($importer,$contact,$datarray,$item) {
        }
 }
 
-
 function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
        $a = get_app();
@@ -4360,189 +1525,6 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
 }
 
-
-function atom_author($tag,$name,$uri,$h,$w,$photo,$geo) {
-       $o = '';
-       if(! $tag)
-               return $o;
-       $name = xmlify($name);
-       $uri = xmlify($uri);
-       $h = intval($h);
-       $w = intval($w);
-       $photo = xmlify($photo);
-
-
-       $o .= "<$tag>\r\n";
-       $o .= "\t<name>$name</name>\r\n";
-       $o .= "\t<uri>$uri</uri>\r\n";
-       $o .= "\t".'<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-       $o .= "\t".'<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-
-       if ($tag == "author") {
-
-               if($geo)
-                       $o .= '<georss:point>'.xmlify($geo).'</georss:point>'."\r\n";
-
-               $r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
-                               `profile`.`name`, `profile`.`pub_keywords`, `profile`.`about`,
-                               `profile`.`homepage`,`contact`.`nick` FROM `profile`
-                               INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid`
-                               INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE `profile`.`is-default` AND `contact`.`self` AND
-                                       NOT `user`.`hidewall` AND `contact`.`nurl`='%s'",
-                       dbesc(normalise_link($uri)));
-               if ($r) {
-                       $location = '';
-                       if($r[0]['locality'])
-                               $location .= $r[0]['locality'];
-                       if($r[0]['region']) {
-                               if($location)
-                                       $location .= ', ';
-                               $location .= $r[0]['region'];
-                       }
-                       if($r[0]['country-name']) {
-                               if($location)
-                                       $location .= ', ';
-                               $location .= $r[0]['country-name'];
-                       }
-
-                       $o .= "\t<poco:preferredUsername>".xmlify($r[0]["nick"])."</poco:preferredUsername>\r\n";
-                       $o .= "\t<poco:displayName>".xmlify($r[0]["name"])."</poco:displayName>\r\n";
-                       $o .= "\t<poco:note>".xmlify(bbcode($r[0]["about"]))."</poco:note>\r\n";
-                       $o .= "\t<poco:address>\r\n";
-                       $o .= "\t\t<poco:formatted>".xmlify($location)."</poco:formatted>\r\n";
-                       $o .= "\t</poco:address>\r\n";
-                       $o .= "\t<poco:urls>\r\n";
-                       $o .= "\t<poco:type>homepage</poco:type>\r\n";
-                       $o .= "\t\t<poco:value>".xmlify($r[0]["homepage"])."</poco:value>\r\n";
-                       $o .= "\t\t<poco:primary>true</poco:primary>\r\n";
-                       $o .= "\t</poco:urls>\r\n";
-               }
-       }
-
-       call_hooks('atom_author', $o);
-
-       $o .= "</$tag>\r\n";
-       return $o;
-}
-
-function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
-
-       $a = get_app();
-
-       if(! $item['parent'])
-               return;
-
-       if($item['deleted'])
-               return '<at:deleted-entry ref="' . xmlify($item['uri']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
-
-
-       if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
-               $body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
-       else
-               $body = $item['body'];
-
-
-       $o = "\r\n\r\n<entry>\r\n";
-
-       if(is_array($author))
-               $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb'], $item['coord']);
-       else
-               $o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb']), $item['coord']);
-       if(strlen($item['owner-name']))
-               $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar'], $item['coord']);
-
-       if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
-               $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
-               $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-               $o .= '<thr:in-reply-to ref="'.xmlify($parent_item).'" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$parent[0]['guid']).'" />'."\r\n";
-       }
-
-       $htmlbody = $body;
-
-       if ($item['title'] != "")
-               $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
-
-       $htmlbody = bbcode($htmlbody, false, false, 7);
-
-       $o .= '<id>' . xmlify($item['uri']) . '</id>' . "\r\n";
-       $o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
-       $o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
-       $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
-       $o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
-       $o .= '<content type="' . $type . '" >' . xmlify((($type === 'html') ? $htmlbody : $body)) . '</content>' . "\r\n";
-       $o .= '<link rel="alternate" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$item['guid']).'" />'."\r\n";
-
-       $o .= '<status_net notice_id="'.$item['id'].'"></status_net>'."\r\n";
-
-       if($comment)
-               $o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
-
-       if($item['location']) {
-               $o .= '<dfrn:location>' . xmlify($item['location']) . '</dfrn:location>' . "\r\n";
-               $o .= '<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>' . "\r\n";
-       }
-
-       if($item['coord'])
-               $o .= '<georss:point>' . xmlify($item['coord']) . '</georss:point>' . "\r\n";
-
-       if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
-               $o .= '<dfrn:private>' . (($item['private']) ? $item['private'] : 1) . '</dfrn:private>' . "\r\n";
-
-       if($item['extid'])
-               $o .= '<dfrn:extid>' . xmlify($item['extid']) . '</dfrn:extid>' . "\r\n";
-       if($item['bookmark'])
-               $o .= '<dfrn:bookmark>true</dfrn:bookmark>' . "\r\n";
-
-       if($item['app'])
-               $o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . xmlify($item['app']) . '" ></statusnet:notice_info>' . "\r\n";
-
-       if($item['guid'])
-               $o .= '<dfrn:diaspora_guid>' . $item['guid'] . '</dfrn:diaspora_guid>' . "\r\n";
-
-       if($item['signed_text']) {
-               $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
-               $o .= '<dfrn:diaspora_signature>' . xmlify($sign) . '</dfrn:diaspora_signature>' . "\r\n";
-       }
-
-       $verb = construct_verb($item);
-       $o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
-       $actobj = construct_activity_object($item);
-       if(strlen($actobj))
-               $o .= $actobj;
-       $actarg = construct_activity_target($item);
-       if(strlen($actarg))
-               $o .= $actarg;
-
-       $tags = item_getfeedtags($item);
-       if(count($tags)) {
-               foreach($tags as $t)
-                       if (($type != 'html') OR ($t[0] != "@"))
-                               $o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
-       }
-
-       /// @TODO
-       /// To support these elements, the API needs to be enhanced
-       /// $o .= '<link rel="ostatus:conversation" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
-       /// $o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
-       /// $o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
-
-       // Deactivated since it was meant only for OStatus
-       //$o .= item_get_attachment($item);
-
-       $o .= item_getfeedattach($item);
-
-       $mentioned = get_mentions($item);
-       if($mentioned)
-               $o .= $mentioned;
-
-       call_hooks('atom_entry', $o);
-
-       $o .= '</entry>' . "\r\n";
-
-       return $o;
-}
-
 function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 
        if(get_config('system','disable_embedded'))
@@ -4646,7 +1628,6 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
        return($new_body);
 }
 
-
 function has_permissions($obj) {
        if(($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
                return true;
@@ -4675,7 +1656,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']);
@@ -4707,50 +1687,6 @@ function item_getfeedtags($item) {
        return $ret;
 }
 
-function item_get_attachment($item) {
-       $o = "";
-       $siteinfo = get_attached_data($item["body"]);
-
-       switch($siteinfo["type"]) {
-               case 'link':
-                       $o = '<link rel="enclosure" href="'.xmlify($siteinfo["url"]).'" type="text/html; charset=UTF-8" length="" title="'.xmlify($siteinfo["title"]).'"/>'."\r\n";
-                       break;
-               case 'photo':
-                       $imgdata = get_photo_info($siteinfo["image"]);
-                       $o = '<link rel="enclosure" href="'.xmlify($siteinfo["image"]).'" type="'.$imgdata["mime"].'" length="'.$imgdata["size"].'"/>'."\r\n";
-                       break;
-               case 'video':
-                       $o = '<link rel="enclosure" href="'.xmlify($siteinfo["url"]).'" type="text/html; charset=UTF-8" length="" title="'.xmlify($siteinfo["title"]).'"/>'."\r\n";
-                       break;
-               default:
-                       break;
-       }
-
-       return $o;
-}
-
-function item_getfeedattach($item) {
-       $ret = '';
-       $arr = explode('[/attach],',$item['attach']);
-       if(count($arr)) {
-               foreach($arr as $r) {
-                       $matches = false;
-                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
-                       if($cnt) {
-                               $ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
-                               if(intval($matches[2]))
-                                       $ret .= 'length="' . intval($matches[2]) . '" ';
-                               if($matches[4] !== ' ')
-                                       $ret .= 'title="' . xmlify(trim($matches[4])) . '" ';
-                               $ret .= ' />' . "\r\n";
-                       }
-               }
-       }
-       return $ret;
-}
-
-
-
 function item_expire($uid, $days, $network = "", $force = false) {
 
        if((! $uid) || ($days < 1))
@@ -5051,9 +1987,6 @@ function drop_item($id,$interactive = true) {
                                        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']);
@@ -5186,51 +2119,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;
-}