]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
Automatically refresh after two minutes when system is overloaded
[friendica.git] / include / items.php
index 6ed53ffcd833dba151128578f90be25186cc000c..1d2a775c49d27c822ef474bec1fa0093ea808393 100644 (file)
@@ -17,7 +17,8 @@ require_once('include/feed.php');
 require_once('include/Contact.php');
 require_once('mod/share.php');
 require_once('include/enotify.php');
-//require_once('include/import-dfrn.php');
+require_once('include/dfrn.php');
+require_once('include/group.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
@@ -145,413 +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($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";
-       }
-
-       $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);
 
@@ -567,24 +161,31 @@ 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 (($data["type"] != "video") AND ($photo != ""))
-               $text .= '[img]'.$photo.'[/img]';
-       elseif (($data["type"] != "video") AND (sizeof($data["images"]) > 0)) {
-               $imagedata = $data["images"][0];
-               $text .= '[img]'.$imagedata["src"].'[/img]';
+       if (sizeof($data["images"]) > 0)
+               $preview = $data["images"][0];
+       else
+               $preview = "";
+
+       // 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"])) {
@@ -598,7 +199,7 @@ function add_page_info_data($data) {
                }
        }
 
-       return("\n[class=type-".$data["type"]."]".$text."[/class]".$hashtags);
+       return "\n".$text.$hashtags;
 }
 
 function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
@@ -698,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.
@@ -774,6 +344,30 @@ function item_add_language_opt(&$arr) {
        }
 }
 
+/**
+ * @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) {
+
+       // 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
@@ -797,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'))
@@ -849,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))
@@ -885,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"]);
@@ -936,6 +507,17 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        $arr['inform']        = ((x($arr,'inform'))        ? trim($arr['inform'])                : '');
        $arr['file']          = ((x($arr,'file'))          ? trim($arr['file'])                  : '');
 
+       // Items cannot be stored before they happen ...
+       if ($arr['created'] > datetime_convert())
+               $arr['created'] = datetime_convert();
+
+       // We haven't invented time travel by now.
+       if ($arr['edited'] > datetime_convert())
+               $arr['edited'] = datetime_convert();
+
+       if (($arr['author-link'] == "") AND ($arr['owner-link'] == ""))
+               logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG);
+
        if ($arr['plink'] == "") {
                $a = get_app();
                $arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']);
@@ -1002,6 +584,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                                                                 "photo" => $arr['author-avatar'], "name" => $arr['author-name']));
        }
 
+       if ($arr["author-id"] == 0)
+               $arr["author-id"] = get_contact($arr["author-link"], 0);
+
+       if ($arr["owner-id"] == 0)
+               $arr["owner-id"] = get_contact($arr["owner-link"], 0);
+
        if ($arr['guid'] != "") {
                // Checking if there is already an item with the same guid
                logger('checking for an item for user '.$arr['uid'].' on network '.$arr['network'].' with the guid '.$arr['guid'], LOGGER_DEBUG);
@@ -1140,9 +728,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);
        }
@@ -1195,9 +783,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);
 
@@ -1318,9 +903,6 @@ 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);
 
@@ -1682,7 +1264,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                        //$tempfile = tempnam(get_temppath(), "ostatus2");
                        //file_put_contents($tempfile, $xml);
                        logger("Consume OStatus messages ", LOGGER_DEBUG);
-                       ostatus_import($xml,$importer,$contact, $hub);
+                       ostatus::import($xml,$importer,$contact, $hub);
                }
                return;
        }
@@ -1694,1803 +1276,109 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                }
                return;
        }
-       // dfrn-test
-//     if ($contact['network'] === NETWORK_DFRN) {
-//             logger("Consume DFRN messages", LOGGER_DEBUG);
-//             logger("dfrn-test");
-//             dfrn2::import($xml,$importer, $contact);
-//             return;
-//     }
-
-       // Test - remove before flight
-       //if ($pass < 2) {
-       //      $tempfile = tempnam(get_temppath(), "dfrn-consume-");
-       //      file_put_contents($tempfile, $xml);
-       //}
-
-       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 ($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((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']);
+function item_is_remote_self($contact, &$datarray) {
+       $a = get_app();
 
-               $contact_updated = $photo_timestamp;
+       if (!$contact['remote_self'])
+               return false;
 
-               require_once("include/Photo.php");
-               $photos = import_profile_photo($photo_url,$contact['uid'],$contact['id']);
+       // Prevent the forwarding of posts that are forwarded
+       if ($datarray["extid"] == NETWORK_DFRN)
+               return false;
 
-               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'])
-               );
-       }
+       // Prevent to forward already forwarded posts
+       if ($datarray["app"] == $a->get_hostname())
+               return false;
 
-       if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
-               if ($name_updated > $contact_updated)
-                       $contact_updated = $name_updated;
+       // Only forward posts
+       if ($datarray["verb"] != ACTIVITY_POST)
+               return false;
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                       intval($contact['uid']),
-                       intval($contact['id'])
-               );
+       if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
+               return false;
 
-               $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)))
-               );
+       $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"];
 
-               // do our best to update the name on content items
+                       $datarray['owner-name'] = $r[0]["name"];
+                       $datarray['owner-link'] = $r[0]["url"];
+                       $datarray['owner-avatar'] = $r[0]["thumb"];
 
-               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)))
-                       );
+                       $datarray['author-name']   = $datarray['owner-name'];
+                       $datarray['author-link']   = $datarray['owner-link'];
+                       $datarray['author-avatar'] = $datarray['owner-avatar'];
                }
-       }
 
-       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 ($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(strlen($birthday)) {
-               if(substr($birthday,0,4) != $contact['bdyear']) {
-                       logger('consume_feed: updating birthday: ' . $birthday);
+       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";
 
-                       /**
-                        *
-                        * 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.
-                        *
-                        */
+       return true;
+}
 
-                       $bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
-                       $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
+function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
+       $url = notags(trim($datarray['author-link']));
+       $name = notags(trim($datarray['author-name']));
+       $photo = notags(trim($datarray['author-avatar']));
 
+       if (is_object($item)) {
+               $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
+               if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
+                       $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+       } else
+               $nick = $item;
 
-                       $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']),
+       if(is_array($contact)) {
+               if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+                       || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
+                       $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
+                               intval(CONTACT_IS_FRIEND),
                                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) {
-       // dfrn-Test
-       //return dfrn2::import($data, $importer, $contact);
-
-       require_once('library/simplepie/simplepie.inc');
-
-       $a = get_app();
-
-       logger(__function__, LOGGER_TRACE);
-
-       //$tempfile = tempnam(get_temppath(), "dfrn-local-");
-       //file_put_contents($tempfile, $data);
-
-       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");
-                                       }
-
-                                       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);
-
-                               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);
-
-                       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'])
-                       );
-
-                       // Update content if 'updated' changes
-
-                       if(count($r)) {
-                               if (edited_timestamp_is_newer($r[0], $datarray)) {
-
-                                       // do not accept (ignore) an earlier edit than one we currently have.
-                                       if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
-                                               continue;
-
-                                       $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
-                                               dbesc($datarray['title']),
-                                               dbesc($datarray['body']),
-                                               dbesc($datarray['tag']),
-                                               dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
-                                               dbesc(datetime_convert()),
-                                               dbesc($item_id),
-                                               intval($importer['importer_uid'])
-                                       );
-                                       create_tags_from_itemuri($item_id, $importer['importer_uid']);
-                                       update_thread_uri($item_id, $importer['importer_uid']);
-                               }
-
-                               // 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['importer_uid'])
-                                       );
-                               }
-                               continue;
-                       }
-
-                       $datarray['parent-uri'] = $item_id;
-                       $datarray['uid'] = $importer['importer_uid'];
-                       $datarray['contact-id'] = $importer['id'];
-
-
-                       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(($importer['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['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($importer, $datarray);
-
-                       $posted_id = item_store($datarray, false, $notify);
-
-                       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);
-
-                               if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
-
-                                       // somebody was poked/prodded. Was it me?
-
-                                       $links = parse_xml_string("<links>".unxmlify($xo->link)."</links>",false);
-
-                               foreach($links->link as $l) {
-                               $atts = $l->attributes();
-                               switch($atts['rel']) {
-                                       case "alternate":
-                                                               $Blink = $atts['href'];
-                                                               break;
-                                                       default:
-                                                               break;
-                                   }
-                               }
-                                       if($Blink && link_compare($Blink,$a->get_baseurl() . '/profile/' . $importer['nickname'])) {
-
-                                               // send a notification
-                                               require_once('include/enotify.php');
-
-                                               notification(array(
-                                                       'type'         => NOTIFY_POKE,
-                                                       'notify_flags' => $importer['notify-flags'],
-                                                       'language'     => $importer['language'],
-                                                       'to_name'      => $importer['username'],
-                                                       'to_email'     => $importer['email'],
-                                                       'uid'          => $importer['importer_uid'],
-                                                       'item'         => $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']
-                                               ));
-                                       }
-                               }
-                       }
-
-                       continue;
-               }
-       }
-
-       return 0;
-       // NOTREACHED
-
-}
-
-
-function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
-       $url = notags(trim($datarray['author-link']));
-       $name = notags(trim($datarray['author-name']));
-       $photo = notags(trim($datarray['author-avatar']));
-
-       if (is_object($item)) {
-               $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
-               if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
-                       $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
-       } else
-               $nick = $item;
-
-       if(is_array($contact)) {
-               if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
-                       || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-                       $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
-                               intval(CONTACT_IS_FRIEND),
-                               intval($contact['id']),
-                               intval($importer['uid'])
+                               intval($importer['uid'])
                        );
                }
                // send email notification to owner?
@@ -3511,21 +1399,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
                        dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS),
                        intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER)
                );
-               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
+               $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
                                intval($importer['uid']),
                                dbesc($url)
                );
                if(count($r)) {
-                               $contact_record = $r[0];
-
-                               $photos = import_profile_photo($photo,$importer["uid"],$contact_record["id"]);
-
-                               q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
-                                       dbesc($photos[0]),
-                                       dbesc($photos[1]),
-                                       dbesc($photos[2]),
-                                       intval($contact_record["id"])
-                               );
+                       $contact_record = $r[0];
+                       update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
                }
 
 
@@ -3548,10 +1428,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))) {
@@ -3582,7 +1462,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",
@@ -3595,7 +1475,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",
@@ -3781,7 +1661,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']);
@@ -4113,9 +1992,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']);
@@ -4248,51 +2124,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;
-}