X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=0a8bc12c0893911e9e414acfb1d993949f8861b3;hb=91d1ef36d8e2bd117160418cb82a39c7b2353c91;hp=2af2b5f55c8ec41b149b8e1d119dc2164638070f;hpb=3d9a9614e232a3ff207803be1092b1d42bcadde6;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 2af2b5f55c..0a8bc12c08 100644
--- a/include/items.php
+++ b/include/items.php
@@ -7,14 +7,11 @@ require_once('include/crypto.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
-	// default permissions - anonymous user
-
-	if(! strlen($owner_nick))
-		killme();
 
+	$sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
 	$public_feed = (($dfrn_id) ? false : true);
-	$starred = false;
-	$converse = false;
+	$starred     = false;   // not yet implemented, possible security issues
+	$converse    = false;
 
 	if($public_feed && $a->argc > 2) {
 		for($x = 2; $x < $a->argc; $x++) {
@@ -22,13 +19,20 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 				$converse = true;
 			if($a->argv[$x] == 'starred')
 				$starred = true;
+			if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+				$category = $a->argv[$x+1];
 		}
+
+
 	}
 
+	
+
+	// default permissions - anonymous user
 
 	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid`  = '' AND `deny_gid`  = '' ";
 
-	$r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`
+	$r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
 		FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
 		WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1",
 		dbesc($owner_nick)
@@ -103,6 +107,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	if(! strlen($last_update))
 		$last_update = 'now -30 days';
 
+	if(isset($category)) {
+		$sql_extra .= file_tag_file_query('item',$category,'category');
+	}
+
 	if($public_feed) {
 		if(! $converse)
 			$sql_extra .= " AND `contact`.`self` = 1 ";
@@ -118,7 +126,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0 
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`parent` != 0 
 		AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
 		$sql_extra
@@ -143,7 +151,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	$salmon = feed_salmonlinks($owner_nick);
 
 	$atom .= replace_macros($feed_template, array(
-		'$version'      => xmlify(FRIENDIKA_VERSION),
+		'$version'      => xmlify(FRIENDICA_VERSION),
 		'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
 		'$feed_title'   => xmlify($owner['name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
@@ -156,7 +164,8 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
 		'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
 		'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) , 
-		'$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : '')
+		'$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : ''),
+		'$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
 	));
 
 	call_hooks('atom_feed', $atom);
@@ -295,6 +304,11 @@ function get_atom_elements($feed,$item) {
 	$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
 
@@ -303,7 +317,7 @@ function get_atom_elements($feed,$item) {
 	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 		foreach($base as $link) {
-			if(! $res['author-avatar']) {
+			if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
 			}
@@ -318,7 +332,7 @@ function get_atom_elements($feed,$item) {
 			foreach($base as $link) {
 				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
 					$res['author-link'] = unxmlify($link['attribs']['']['href']);
-				if(! $res['author-avatar']) {
+				if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
 						$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
 				}
@@ -412,7 +426,9 @@ function get_atom_elements($feed,$item) {
 	// 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)) {
+	if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
+
+		$res['body'] = reltoabs($res['body'],$base_url);
 
 		$res['body'] = html2bb_video($res['body']);
 
@@ -423,14 +439,22 @@ function get_atom_elements($feed,$item) {
 
 		// we shouldn't need a whitelist, because the bbcode converter
 		// will strip out any unsupported tags.
-		// $config->set('HTML.Allowed', 'p,b,a[href],i'); 
 
 		$purifier = new HTMLPurifier($config);
 		$res['body'] = $purifier->purify($res['body']);
 
-		$res['body'] = html2bbcode($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;
@@ -496,7 +520,7 @@ function get_atom_elements($feed,$item) {
 		$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 
 		foreach($base as $link) {
-			if(! $res['owner-avatar']) {
+			if(!x($res, 'owner-avatar') || !$res['owner-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')			
 					$res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
 			}
@@ -564,20 +588,21 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['object'] = '<object>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\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($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		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 = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$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)) {
@@ -602,20 +627,20 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['target'] = '<target>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\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($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		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 = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$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)) {
@@ -675,7 +700,7 @@ function item_store($arr,$force_parent = false) {
 		unset($arr['dsprsig']);
 	}
 
-	if($arr['gravity'])
+	if(x($arr, 'gravity'))
 		$arr['gravity'] = intval($arr['gravity']);
 	elseif($arr['parent-uri'] === $arr['uri'])
 		$arr['gravity'] = 0;
@@ -735,6 +760,7 @@ function item_store($arr,$force_parent = false) {
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
+		$parent_deleted = 0;
 		$allow_cid = $arr['allow_cid'];
 		$allow_gid = $arr['allow_gid'];
 		$deny_cid  = $arr['deny_cid'];
@@ -793,6 +819,8 @@ function item_store($arr,$force_parent = false) {
 				logger('item_store: item parent was not found - ignoring item');
 				return 0;
 			}
+			
+			$parent_deleted = 0;
 		}
 	}
 
@@ -807,6 +835,11 @@ function item_store($arr,$force_parent = false) {
 
 	call_hooks('post_remote',$arr);
 
+	if(x($arr,'cancel')) {
+		logger('item_store: post cancelled by plugin.');
+		return 0;
+	}
+
 	dbesc_array($arr);
 
 	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
@@ -893,6 +926,8 @@ function item_store($arr,$force_parent = false) {
 		);
 	}
 
+	tag_deliver($arr['uid'],$current_post);
+
 	return $current_post;
 }
 
@@ -909,12 +944,111 @@ function get_item_contact($item,$contacts) {
 }
 
 
+function tag_deliver($uid,$item_id) {
+
+	// look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+
+	$a = get_app();
+
+	$mention = false;
+
+	$u = q("select uid, nickname, language, username, email, `page-flags`, `notify-flags` from user where uid = %d limit 1",
+		intval($uid)
+	);
+	if(! count($u))
+		return;
+
+	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
+	$i = q("select * from item where id = %d and uid = %d limit 1",
+		intval($item_id),
+		intval($uid)
+	);
+	if(! count($i))
+		return;
+
+	$item = $i[0];
+
+	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+
+	// Diaspora uses their own hardwired link URL in @-tags
+	// instead of the one we supply with webfinger
+
+	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+
+	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
+				$mention = true;
+				logger('tag_deliver: mention found: ' . $mtch[2]);
+			}
+		}
+	}
+
+	if(! $mention)
+		return;
+
+	// send a notification
+
+	require_once('include/enotify.php');
+	notification(array(
+		'type'         => NOTIFY_TAGSELF,
+		'notify_flags' => $u[0]['notify-flags'],
+		'language'     => $u[0]['language'],
+		'to_name'      => $u[0]['username'],
+		'to_email'     => $u[0]['email'],
+		'uid'          => $u[0]['uid'],
+		'item'         => $item,
+		'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'],
+		'source_name'  => $item['author-name'],
+		'source_link'  => $item['author-link'],
+		'source_photo' => $item['author-avatar'],
+		'verb'         => ACTIVITY_TAG,
+		'otype'        => 'item'
+	));
+
+	if(! $community_page)
+		return;
+
+	// tgroup delivery - setup a second delivery chain
+	// prevent delivery looping - only proceed
+	// if the message originated elsewhere and is a top-level post
+
+	if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
+		return;
+
+	// now change this copy of the post to a forum head message and deliver to all the tgroup members
+
+
+	$c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
+		intval($u[0]['uid'])
+	);
+	if(! count($c))
+		return;
+
+	q("update item set wall = 1, origin = 1, forum_mode = 1, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s'  where id = %d limit 1",
+		dbesc($c[0]['name']),
+		dbesc($c[0]['url']),
+		dbesc($c[0]['thumb']),
+		intval($item_id)
+	);
+
+	proc_run('php','include/notifier.php','tgroup',$item_id);			
+
+}
+
+
+
+
+
+
 function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$a = get_app();
 
-	if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
-		return 3;
+//	if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
+//		return 3;
 
 	$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
@@ -930,6 +1064,22 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
+	$ssl_val = intval(get_config('system','ssl_policy'));
+	$ssl_policy = '';
+
+	switch($ssl_val){
+		case SSL_POLICY_FULL:
+			$ssl_policy = 'full';
+			break;
+		case SSL_POLICY_SELFSIGN:
+			$ssl_policy = 'self';
+			break;			
+		case SSL_POLICY_NONE:
+		default:
+			$ssl_policy = 'none';
+			break;
+	}
+
 	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
@@ -959,13 +1109,27 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$postvars     = array();
 	$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
 	$challenge    = hex2bin((string) $res->challenge);
+	$perm         = (($res->perm) ? $res->perm : null);
 	$dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
 	$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
+	$page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
 
 	$final_dfrn_id = '';
 
+	if($perm) {
+		if((($perm == 'rw') && (! intval($contact['writable']))) 
+		|| (($perm == 'r') && (intval($contact['writable'])))) {
+			q("update contact set writable = %d where id = %d limit 1",
+				intval(($perm == 'rw') ? 1 : 0),
+				intval($contact['id'])
+			);
+			$contact['writable'] = (string) 1 - intval($contact['writable']);			
+		}
+	}
 
-	if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+	if(($contact['duplex'] && strlen($contact['pubkey'])) 
+		|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+		|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
 		openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
 		openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
 	}
@@ -1000,6 +1164,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		$postvars['perm'] = 'r';
 	}
 
+	$postvars['ssl_policy'] = $ssl_policy;
+
+	if($page)
+		$postvars['page'] = '1';
+	
 	if($rino && $rino_allowed && (! $dissolve)) {
 		$key = substr(random_string(),0,16);
 		$data = bin2hex(aes_encrypt($postvars['data'],$key));
@@ -1008,7 +1177,10 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 
 		if($dfrn_version >= 2.1) {	
-			if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+			if(($contact['duplex'] && strlen($contact['pubkey'])) 
+				|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+				|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
+
 				openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
 			}
 			else {
@@ -1190,12 +1362,28 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 	}
 
 	if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
-		q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+		$r = q("select * from contact where uid = %d and id = %d limit 1",
+			intval($contact['uid']),
+			intval($contact['id'])
+		);
+
+		$x = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			dbesc(notags(trim($new_name))),
 			dbesc(datetime_convert()),
 			intval($contact['uid']),
 			intval($contact['id'])
 		);
+
+		// do our best to update the name on content items
+
+		if(count($r)) {
+			q("update item set `author-name` = '%s' where `author-name` = '%s' and `author-link` = '%s' and uid = %d",
+				dbesc(notags(trim($new_name))),
+				dbesc($r[0]['name']),
+				dbesc($r[0]['url']),
+				intval($contact['uid'])
+			);
+		}
 	}
 
 	if(strlen($birthday)) {
@@ -1245,6 +1433,19 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 	}
 
+	$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 limit 1",
+			intval($community_page),
+			intval($contact['id'])
+		);
+		$contact['forum'] = (string) $community_page;
+	}
+
 
 	// process any deleted entries
 
@@ -1264,7 +1465,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 			}
 			if($deleted && is_array($contact)) {
 				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` 
-					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+					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'])
@@ -1275,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if(! $item['deleted'])
 						logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
 						if($xt->type === ACTIVITY_OBJ_NOTE) {
@@ -1337,7 +1538,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 								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 
+							$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'])
@@ -1387,13 +1588,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$item_id  = $item->get_id();
 				$datarray = get_atom_elements($feed,$item);
 
-				if(! x($datarray,'author-name'))
+
+				if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN))
 					$datarray['author-name'] = $contact['name'];
-				if(! x($datarray,'author-link'))
+				if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN))
 					$datarray['author-link'] = $contact['url'];
-				if(! x($datarray,'author-avatar'))
+				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;
+				}
 
 				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
@@ -1404,8 +1610,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
 							intval($importer['uid'])
@@ -1432,8 +1640,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				}
 
 				$force_parent = false;
-				if($contact['network'] === NETWORK_OSTATUS) {
-					$force_parent = true;
+				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",
@@ -1454,6 +1663,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -1469,10 +1686,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 							continue;
 
 						// extract tag, if not duplicate, add to parent item
-						if($xo->content) {
-							if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+						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 LIMIT 1",
-									dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+									dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
 									intval($r[0]['id'])
 								);
 							}
@@ -1493,14 +1711,19 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray = get_atom_elements($feed,$item);
 
 				if(is_array($contact)) {
-					if(! x($datarray,'author-name'))
+					if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN))
 						$datarray['author-name'] = $contact['name'];
-					if(! x($datarray,'author-link'))
+					if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN))
 						$datarray['author-link'] = $contact['url'];
-					if(! x($datarray,'author-avatar'))
+					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)) {
@@ -1533,8 +1756,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
 							intval($importer['uid'])
@@ -1579,7 +1804,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if(! is_array($contact))
 					return;
 
-				if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) {
+				if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
 					if(strlen($datarray['title']))
 						unset($datarray['title']);
 					$datarray['last-child'] = 1;
@@ -1599,6 +1824,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$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'];
+				}
+
 				$r = item_store($datarray);
 				continue;
 
@@ -1630,6 +1867,8 @@ function local_delivery($importer,$data) {
 	$feed->enable_order_by_date(false);
 	$feed->init();
 
+/*
+	// 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];
@@ -1654,6 +1893,7 @@ function local_delivery($importer,$data) {
 		// schedule a scan?
 
 	}
+*/
 
 	// handle friend suggestion notification
 
@@ -1671,9 +1911,9 @@ function local_delivery($importer,$data) {
 
 		// Does our member already have a friend matching this description?
 
-		$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($fsugg['name']),
-			dbesc($fsugg['url']),
+			dbesc(normalise_link($fsugg['url'])),
 			intval($fsugg['uid'])
 		);
 		if(count($r))
@@ -1689,6 +1929,14 @@ function local_delivery($importer,$data) {
 		);
 		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' ) ",
@@ -1709,6 +1957,7 @@ function local_delivery($importer,$data) {
 		else
 			return 0;
 
+
 		$hash = random_string();
  
 		$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
@@ -1722,7 +1971,21 @@ function local_delivery($importer,$data) {
 			intval(0)
 		);
 
-		// TODO - send email notify (which may require a new notification preference)
+		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;
 	}
@@ -1756,86 +2019,43 @@ function local_delivery($importer,$data) {
 		$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg)) 
 			. "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
 
-		// send email notification if requested.
-
-		require_once('bbcode.php');
-		if($importer['notify-flags'] & NOTIFY_MAIL) {
-
-			push_lang($importer['language']);
-
-			// name of the automated email sender
-			$msg['notificationfromname']	= t('Administrator');
-			// noreply address to send from
-			$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-
-			// text version
-			// process the message body to display properly in text mode
-			// 		1) substitute a \n character for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
-			//		2) remove escape slashes
-			//		3) decode any bbcode from the message editor
-			//		4) decode any encoded html tags
-			//		5) remove html tags
-			$msg['textversion']
-				= strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8'));
-				
-			// html version
-			// process the message body to display properly in text mode
-			// 		1) substitute a <br /> tag for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
-			//		2) remove escape slashes
-			//		3) decode any bbcode from the message editor
-			//		4) decode any encoded html tags
-			$msg['htmlversion']	
-				= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
-
-			// load the template for private message notifications
-			$tpl = get_intltext_template('mail_received_html_body_eml.tpl');
-			$email_html_body_tpl = replace_macros($tpl,array(
-				'$username'     => $importer['username'],
-				'$siteName'		=> $a->config['sitename'],			// name of this site
-				'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
-				'$thumb'		=> $importer['thumb'],				// thumbnail url for sender icon
-				'$email'		=> $importer['email'],				// email address to send to
-				'$url'			=> $importer['url'],				// full url for the site
-				'$from'			=> $msg['from-name'],				// name of the person sending the message
-				'$title'		=> stripslashes($msg['title']),			// subject of the message
-				'$htmlversion'	=> $msg['htmlversion'],					// html version of the message
-				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
-				'$hostname'		=> $a->get_hostname()				// name of this host
-			));
+		// 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'
+		);
 			
-			// load the template for private message notifications
-			$tpl = get_intltext_template('mail_received_text_body_eml.tpl');
-			$email_text_body_tpl = replace_macros($tpl,array(
-				'$username'     => $importer['username'],
-				'$siteName'		=> $a->config['sitename'],			// name of this site
-				'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
-				'$thumb'		=> $importer['thumb'],				// thumbnail url for sender icon
-				'$email'		=> $importer['email'],				// email address to send to
-				'$url'			=> $importer['url'],				// full url for the site
-				'$from'			=> $msg['from-name'],				// name of the person sending the message
-				'$title'		=> stripslashes($msg['title']),			// subject of the message
-				'$textversion'	=> $msg['textversion'],					// text version of the message
-				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
-				'$hostname'		=> $a->get_hostname()				// name of this host
-			));
-
-			// use the EmailNotification library to send the message
-			require_once("include/EmailNotification.php");
-			EmailNotification::sendTextHtmlEmail(
-				$msg['notificationfromname'],
-				$msg['notificationfromemail'],
-				$msg['notificationfromemail'],
-				$importer['email'],
-				t('New mail received at ') . $a->config['sitename'],
-				$email_html_body_tpl,
-				$email_text_body_tpl
-			);
-
-			pop_lang();
-		}
+		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 limit 1",
+			intval($community_page),
+			intval($importer['id'])
+		);
+		$importer['forum'] = (string) $community_page;
+	}
 	
 	logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
 
@@ -1858,7 +2078,7 @@ function local_delivery($importer,$data) {
 			if($deleted) {
 
 				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
-					WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+					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'])
@@ -1872,9 +2092,10 @@ function local_delivery($importer,$data) {
 
 					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
+
 						if($xt->type === ACTIVITY_OBJ_NOTE) {
 							$i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
 								dbesc($xt->id),
@@ -1961,31 +2182,89 @@ function local_delivery($importer,$data) {
 		}
 
 		if($is_reply) {
+			$community = false;
 
+			if($importer['page-flags'] == PAGE_COMMUNITY) {
+				$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? 
 
-			$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
+			$is_a_remote_comment = false;
+
+			$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
 				`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
 				LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
-				WHERE `contact`.`self` = 1 AND `item`.`wall` = 1 AND `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
-				AND `item`.`uid` = %d LIMIT 1",
+				WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
+				AND `item`.`uid` = %d 
+				$sql_extra
+				LIMIT 1",
 				dbesc($parent_uri),
 				dbesc($parent_uri),
 				intval($importer['importer_uid'])
 			);
-			if($r && count($r)) {	
+			if($r && count($r))
+				$is_a_remote_comment = true;			
+
+			// Does this have the characteristics of a community comment?
+			// If it's a reply to a wall post on a community 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);
 
-				if(! link_compare($datarray['author-link'],$importer['url'])) {
-					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
+
+				$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((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+						logger('received updated comment' , LOGGER_DEBUG);
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
+							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
+							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+							dbesc($item_id),
+							intval($importer['importer_uid'])
+						);
+
+						proc_run('php',"include/notifier.php","comment-import",$iid);
+
+					}
+
+					continue;
+				}
+
+
+				// TODO: make this next part work against both delivery threads of a community post
+
+//				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
+//					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
 					// they won't know what to do so don't report an error. Just quietly die.
-					return 0;
-				}					
+//					return 0;
+//				}					
 
 				$datarray['type'] = 'remote-comment';
 				$datarray['wall'] = 1;
@@ -2000,6 +2279,14 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2011,15 +2298,17 @@ function local_delivery($importer,$data) {
 					if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) {
 
 						// extract tag, if not duplicate, and this user allows tags, add to parent item						
-						if($xo->content) {
 
-							if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+						if($xo->id && $xo->content) {
+							$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+
+							if(! (stristr($r[0]['tag'],$newtag))) {
 								$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
 									intval($importer['importer_uid'])
 								);
 								if(count($i) && ! ($i[0]['blocktags'])) {
 									q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
-										dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+										dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
 										intval($r[0]['id'])
 									);
 								}
@@ -2028,6 +2317,16 @@ function local_delivery($importer,$data) {
 					}
 				}
 
+// 				if($community) {
+//					$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
+//					if(! stristr($datarray['tag'],$newtag)) {
+//						if(strlen($datarray['tag']))
+//							$datarray['tag'] .= ',';
+//						$datarray['tag'] .= $newtag;
+//					}
+//				}
+
+
 				$posted_id = item_store($datarray);
 				$parent = 0;
 
@@ -2057,70 +2356,32 @@ function local_delivery($importer,$data) {
 				
 						proc_run('php',"include/notifier.php","comment-import","$posted_id");
 					
-						if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
-							push_lang($importer['language']);
-							require_once('bbcode.php');
-							$from = stripslashes($datarray['author-name']);
-
-							// name of the automated email sender
-							$msg['notificationfromname']	= stripslashes($datarray['author-name']);;
-							// noreply address to send from
-							$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-
-							// text version
-							// process the message body to display properly in text mode
-							$msg['textversion']
-								= html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-				
-							// html version
-							// process the message body to display properly in text mode
-							$msg['htmlversion']	
-								= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-							$imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
-
-							// load the template for private message notifications
-							$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
-							$email_html_body_tpl = replace_macros($tpl,array(
-								'$username'     => $importer['username'],
-								'$sitename'		=> $a->config['sitename'],			// name of this site
-								'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
-								'$thumb'		=> $imgtouse,						// thumbnail url for sender icon
-								'$email'		=> $importer['email'],				// email address to send to
-								'$url'			=> $datarray['author-link'],		// full url for the site
-								'$from'			=> $from,							// name of the person sending the message
-								'$body'			=> $msg['htmlversion'],				// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
-							));
-			
-							// load the template for private message notifications
-							$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
-							$email_text_body_tpl = replace_macros($tpl,array(
-								'$username'     => $importer['username'],
-								'$sitename'		=> $a->config['sitename'],			// name of this site
-								'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
-								'$thumb'		=> $imgtouse,						// thumbnail url for sender icon
-								'$email'		=> $importer['email'],				// email address to send to
-								'$url'			=> $datarray['author-link'],		// full url for the site
-								'$from'			=> $from,							// name of the person sending the message
-								'$body'			=> $msg['textversion'],				// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+						if((! $is_like) && (! $importer['self'])) {
+
+							require_once('include/enotify.php');
+
+							notification(array(
+								'type'         => NOTIFY_COMMENT,
+								'notify_flags' => $importer['notify-flags'],
+								'language'     => $importer['language'],
+								'to_name'      => $importer['username'],
+								'to_email'     => $importer['email'],
+								'uid'          => $importer['importer_uid'],
+								'item'         => $datarray,
+								'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+								'source_name'  => stripslashes($datarray['author-name']),
+								'source_link'  => $datarray['author-link'],
+								'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+									? $importer['thumb'] : $datarray['author-avatar']),
+								'verb'         => ACTIVITY_POST,
+								'otype'        => 'item',
+								'parent'       => $parent,
+
 							));
 
-							// use the EmailNotification library to send the message
-							require_once("include/EmailNotification.php");
-							EmailNotification::sendTextHtmlEmail(
-								$msg['notificationfromname'],
-								t("Administrator") . '@' . $a->get_hostname(),
-								t("noreply") . '@' . $a->get_hostname(),
-								$importer['email'],
-								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
-								$email_html_body_tpl,
-								$email_text_body_tpl
-							);
-							pop_lang();
 						}
 					}
+
 					return 0;
 					// NOTREACHED
 				}
@@ -2141,8 +2402,10 @@ function local_delivery($importer,$data) {
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+							dbesc($datarray['title']),
 							dbesc($datarray['body']),
+							dbesc($datarray['tag']),
 							dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 							dbesc($item_id),
 							intval($importer['importer_uid'])
@@ -2174,6 +2437,15 @@ function local_delivery($importer,$data) {
 				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
+
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2205,79 +2477,53 @@ function local_delivery($importer,$data) {
 
 				// find out if our user is involved in this conversation and wants to be notified.
 			
-				if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) {
+				if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
-					$myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
 						dbesc($parent_uri),
 						intval($importer['importer_uid'])
 					);
+
 					if(count($myconv)) {
 						$importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
-						foreach($myconv as $conv) {
-							if(! link_compare($conv['author-link'],$importer_url))
-								continue;
 
-							push_lang($importer['language']);
-							require_once('bbcode.php');
-							$from = stripslashes($datarray['author-name']);
+						// first make sure this isn't our own post coming back to us from a wall-to-wall event
+						if(! link_compare($datarray['author-link'],$importer_url)) {
+
 							
-							// name of the automated email sender
-							$msg['notificationfromname']	= stripslashes($datarray['author-name']);;
-							// noreply address to send from
-							$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
-
-							// text version
-							// process the message body to display properly in text mode
-							$msg['textversion']
-								= html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
-				
-							// html version
-							// process the message body to display properly in text mode
-							$msg['htmlversion']	
-								= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
-
-							$imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
-
-
-							// load the template for private message notifications
-							$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
-							$email_html_body_tpl = replace_macros($tpl,array(
-								'$username'     => $importer['username'],
-								'$sitename'		=> $a->config['sitename'],				// name of this site
-								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $imgtouse,							// thumbnail url for sender icon
-								'$url'			=> $datarray['author-link'],			// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
-								'$body'			=> $msg['htmlversion'],					// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
-							));
-			
-							// load the template for private message notifications
-							$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
-							$email_text_body_tpl = replace_macros($tpl,array(
-								'$username'     => $importer['username'],
-								'$sitename'		=> $a->config['sitename'],				// name of this site
-								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $imgtouse,							// thumbnail url for sender icon
-								'$url'			=> $datarray['author-link'],			// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
-								'$body'			=> $msg['textversion'],					// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
-							));
+							foreach($myconv as $conv) {
 
-							// use the EmailNotification library to send the message
-							require_once("include/EmailNotification.php");
-							EmailNotification::sendTextHtmlEmail(
-								$msg['notificationfromname'],
-								t("Administrator@") . $a->get_hostname(),
-								t("noreply") . '@' . $a->get_hostname(),
-								$importer['email'],
-								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
-								$email_html_body_tpl,
-								$email_text_body_tpl
-							);
-							pop_lang();
-							break;
+								// now if we find a match, it means we're in this conversation
+	
+								if(! link_compare($conv['author-link'],$importer_url))
+									continue;
+
+								require_once('include/enotify.php');
+								
+								$conv_parent = $conv['parent'];
+
+								notification(array(
+									'type'         => NOTIFY_COMMENT,
+									'notify_flags' => $importer['notify-flags'],
+									'language'     => $importer['language'],
+									'to_name'      => $importer['username'],
+									'to_email'     => $importer['email'],
+									'uid'          => $importer['importer_uid'],
+									'item'         => $datarray,
+									'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+									'source_name'  => stripslashes($datarray['author-name']),
+									'source_link'  => $datarray['author-link'],
+									'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
+										? $importer['thumb'] : $datarray['author-avatar']),
+									'verb'         => ACTIVITY_POST,
+									'otype'        => 'item',
+									'parent'       => $conv_parent,
+
+								));
+
+								// only send one notification
+								break;
+							}
 						}
 					}
 				}
@@ -2322,8 +2568,10 @@ function local_delivery($importer,$data) {
 
 			if(count($r)) {
 				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-					$r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($datarray['title']),
 						dbesc($datarray['body']),
+						dbesc($datarray['tag']),
 						dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
 						dbesc($item_id),
 						intval($importer['importer_uid'])
@@ -2347,12 +2595,24 @@ function local_delivery($importer,$data) {
 			// This is my contact on another system, but it's really me.
 			// Turn this into a wall post.
 
-			if($contact['remote_self'])
+			if($importer['remote_self'])
 				$datarray['wall'] = 1;
 
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['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('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+				$datarray['owner-name']   = $importer['senderName'];
+				$datarray['owner-link']   = $importer['url'];
+				$datarray['owner-avatar'] = $importer['thumb'];
+			}
+
 			$r = item_store($datarray);
 			continue;
 		}
@@ -2666,7 +2926,7 @@ function item_getfeedtags($item) {
 	$matches = false;
 	$cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
 	if($cnt) {
-		for($x = 0; $x < count($matches); $x ++) {
+		for($x = 0; $x < $cnt; $x ++) {
 			if($matches[1][$x])
 				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
 		}
@@ -2674,7 +2934,7 @@ function item_getfeedtags($item) {
 	$matches = false; 
 	$cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
 	if($cnt) {
-		for($x = 0; $x < count($matches); $x ++) {
+		for($x = 0; $x < $cnt; $x ++) {
 			if($matches[1][$x])
 				$ret[] = array('@',$matches[1][$x], $matches[2][$x]);
 		}
@@ -2720,22 +2980,56 @@ function item_expire($uid,$days) {
 
 	if(! count($r))
 		return;
+
+	$expire_items = get_pconfig($uid, 'expire','items');
+	$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
+	
+	$expire_notes = get_pconfig($uid, 'expire','notes');
+	$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
+
+	$expire_starred = get_pconfig($uid, 'expire','starred');
+	$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
+	
+	$expire_photos = get_pconfig($uid, 'expire','photos');
+	$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
  
-	logger('expire: # items=' . count($r) );
+	logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
 	foreach($r as $item) {
 
+		// don't expire filed items
+
+		if(strpos($item['file'],'[') !== false)
+			continue;
+
 		// Only expire posts, not photos and photo comments
 
-		if(strlen($item['resource-id']))
+		if($expire_photos==0 && strlen($item['resource-id']))
+			continue;
+		if($expire_starred==0 && intval($item['starred']))
+			continue;
+		if($expire_notes==0 && $item['type']=='note')
+			continue;
+		if($expire_items==0 && $item['type']!='note')
 			continue;
 
+
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($item['id'])
 		);
 
+		$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d",
+			intval($item['id']),
+			intval($uid)
+		);
+
+		$r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d",
+			intval($item['id']),
+			intval($uid)
+		);
+
 		// kill the kids
 
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
@@ -2748,13 +3042,16 @@ function item_expire($uid,$days) {
 	}
 
 	proc_run('php',"include/notifier.php","expire","$uid");
-
+	
 }
 
 
 function drop_items($items) {
 	$uid = 0;
 
+	if(! local_user() && ! remote_user())
+		return;
+
 	if(count($items)) {
 		foreach($items as $item) {
 			$owner = drop_item($item,false);
@@ -2797,7 +3094,7 @@ function drop_item($id,$interactive = true) {
 
 		// delete the item
 
-		$r = q("UPDATE `item` SET `deleted` = 1, `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($item['id'])
@@ -2830,7 +3127,7 @@ function drop_item($id,$interactive = true) {
 		// If it's the parent of a comment thread, kill all the kids
 
 		if($item['uri'] == $item['parent-uri']) {
-			$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' 
+			$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = ''
 				WHERE `parent-uri` = '%s' AND `uid` = %d ",
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),