X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=848c21df366d405d16a00b24eaadbd0b36c58847;hb=5b96c7b3e39a4dd6516115e0fb187cc0ecc0e07d;hp=44eb18ccd1326dcba63dc5bc4303366c2efe1c01;hpb=e66489d67ffd10c2c47a82308b2f34da2d362684;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 44eb18ccd1..848c21df36 100644
--- a/include/items.php
+++ b/include/items.php
@@ -9,11 +9,15 @@ require_once('include/tags.php');
 require_once('include/files.php');
 require_once('include/text.php');
 require_once('include/email.php');
-require_once('include/ostatus_conversation.php');
 require_once('include/threads.php');
 require_once('include/socgraph.php');
+require_once('include/plaintext.php');
+require_once('include/ostatus.php');
 require_once('mod/share.php');
 
+require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
+
+
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0, $forpubsub = false) {
 
 
@@ -37,7 +41,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
 
 	// default permissions - anonymous user
 
-	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid`  = '' AND `deny_gid`  = '' ";
+	$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ";
 
 	$r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
 		FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -115,10 +119,12 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
 	else
 		$sort = 'ASC';
 
-	// Include answers to status.net posts in public feeds
+	// Include answers to status.net posts in pubsub feeds
 	if($forpubsub) {
-		$sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` ";
-		$visibility = "OR (`item`.`network` = 'dfrn' AND `thread`.`network`='stat')";
+		$sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+				LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`";
+		$visibility = sprintf("AND (`item`.`parent` = `item`.`id`) OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s')))",
+					dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS));
 		$date_field = "`received`";
 		$sql_order = "`item`.`received` DESC";
 	} else {
@@ -478,7 +484,6 @@ function get_atom_elements($feed, $item, $contact = array()) {
 	// 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.
 
-	// Search for ostatus conversation url
 	$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) {
@@ -883,23 +888,6 @@ function get_atom_elements($feed, $item, $contact = array()) {
 		}
 	}
 
-	// Search for ostatus conversation url
-	$links = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
-
-	if (is_array($links)) {
-		foreach ($links as $link) {
-			$conversation = array_shift($link["attribs"]);
-
-			if ($conversation["rel"] == "ostatus:conversation") {
-				$res["ostatus_conversation"] = ostatus_convert_href($conversation["href"]);
-				logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
-			} elseif ($conversation["rel"] == "alternate") {
-				$res["plink"] = $conversation["href"];
-				logger('get_atom_elements: found plink '.$res["plink"]);
-			}
-		};
-	}
-
 	if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND $contact['fetch_further_information']) {
 		$preview = "";
 
@@ -1098,7 +1086,15 @@ function encode_rel_links($links) {
 	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"]));
+}
 
 function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
 
@@ -1128,15 +1124,6 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 			$arr['plink'] = ostatus_convert_href($arr['uri']);
 	}
 
-	// if an OStatus conversation url was passed in, it is stored and then
-	// removed from the array.
-	$ostatus_conversation = null;
-
-	if (isset($arr["ostatus_conversation"])) {
-		$ostatus_conversation = $arr["ostatus_conversation"];
-		unset($arr["ostatus_conversation"]);
-	}
-
 	if(x($arr, 'gravity'))
 		$arr['gravity'] = intval($arr['gravity']);
 	elseif($arr['parent-uri'] === $arr['uri'])
@@ -1167,11 +1154,10 @@ 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']) != "")) {
+	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 `item` WHERE `uri` = '%s' AND `guid` != '' LIMIT 1",
-			dbesc(trim($arr['uri']))
-		);
+		$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"];
@@ -1180,15 +1166,17 @@ 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 plink
-	if ((trim($arr['guid']) == "") AND (trim($arr['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` FROM `item` WHERE `plink` = '%s' AND `guid` != '' LIMIT 1",
-			dbesc(trim($arr['plink']))
-		);
+		$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);
 		}
 	}
 
@@ -1390,7 +1378,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 				$arr['gravity'] = 0;
 			}
 			else {
-				logger('item_store: item parent was not found - ignoring item');
+				logger('item_store: item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item');
 				return 0;
 			}
 
@@ -1408,16 +1396,6 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		return 0;
 	}
 
-	$r = q("SELECT `id` FROM `item` WHERE `plink` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
-		dbesc($arr['plink']),
-		dbesc($arr['network']),
-		intval($arr['uid'])
-	);
-	if($r && count($r)) {
-		logger('duplicated item with the same plink found. ' . print_r($arr,true));
-		return 0;
-	}
-
 	// Check for an existing post with the same content. There seems to be a problem with OStatus.
 	$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
 		dbesc($arr['body']),
@@ -1475,6 +1453,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	);
 
 	if(count($r)) {
+
+		// Store the guid and other relevant data
+		add_guid($arr);
+
 		$current_post = $r[0]['id'];
 		logger('item_store: created item ' . $current_post);
 
@@ -1534,10 +1516,6 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		intval($current_post)
 	);
 
-	// Complete ostatus threads
-	if ($ostatus_conversation)
-		complete_conversation($current_post, $ostatus_conversation);
-
 	$arr['id'] = $current_post;
 	$arr['parent'] = $parent_id;
 	$arr['allow_cid'] = $allow_cid;
@@ -1696,12 +1674,12 @@ function item_body_set_hashtags(&$item) {
 	// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
 	$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 		function ($match){
-			return("[url=".$match[1]."]".str_replace("#", "#", $match[2])."[/url]");
+			return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]");
 		},$item["body"]);
 
 	$item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",
 		function ($match){
-			return("[bookmark=".$match[1]."]".str_replace("#", "#", $match[2])."[/bookmark]");
+			return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]");
 		},$item["body"]);
 
 	$item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
@@ -1713,6 +1691,7 @@ function item_body_set_hashtags(&$item) {
 	$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			"#$2", $item["body"]);
 
+
 	foreach($tags as $tag) {
 		if(strpos($tag,'#') !== 0)
 			continue;
@@ -2007,13 +1986,13 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if($contact['duplex'] && $contact['issued-id'])
 		$idtosend = '1:' . $orig_id;
 
-	$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
-
-	$rino_enable = get_config('system','rino_encrypt');
+    
+	$rino = get_config('system','rino_encrypt');
+	$rino = intval($rino);
 
-	if(! $rino_enable)
-		$rino = 0;
+   
 
+	
 	$ssl_val = intval(get_config('system','ssl_policy'));
 	$ssl_policy = '';
 
@@ -2030,7 +2009,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 			break;
 	}
 
-	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino='.$rino : '');
 
 	logger('dfrn_deliver: ' . $url);
 
@@ -2061,7 +2040,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$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);
+	$rino_remote_version = intval($res->rino);
 	$page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
 
 	if($owner['page-flags'] == PAGE_PRVGROUP)
@@ -2122,11 +2101,46 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if($page)
 		$postvars['page'] = $page;
 
-	if($rino && $rino_allowed && (! $dissolve)) {
-		$key = substr(random_string(),0,16);
-		$data = bin2hex(aes_encrypt($postvars['data'],$key));
-		$postvars['data'] = $data;
-		logger('rino: sent key = ' . $key, LOGGER_DEBUG);
+
+	if($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+		logger('rino version: '. $rino_remote_version);
+
+		switch($rino_remote_version) {
+			case 1:
+				// Deprecated rino version!
+				$key = substr(random_string(),0,16);
+				$data = aes_encrypt($postvars['data'],$key);
+				break;
+			case 2:
+				// RINO 2 based on php-encryption
+				try {
+					$key = Crypto::createNewRandomKey();
+				} catch (CryptoTestFailed $ex) {
+					logger('Cannot safely create a key');
+					return -1;
+				} catch (CannotPerformOperation $ex) {
+					logger('Cannot safely create a key');
+					return -1; 
+				}
+				try {
+					$data = Crypto::encrypt($postvars['data'], $key);
+				} catch (CryptoTestFailed $ex) {
+					logger('Cannot safely perform encryption');
+					return -1; 
+				} catch (CannotPerformOperation $ex) {
+					logger('Cannot safely perform encryption');
+					return -1; 
+				}
+				break;
+			default:
+				logger("rino: invalid requested verision '$rino_remote_version'");
+				return -1;
+		}
+		
+		$postvars['rino'] = $rino_remote_version;
+		$postvars['data'] = bin2hex($data);
+		
+		#logger('rino: sent key = ' . $key, LOGGER_DEBUG);
 
 
 		if($dfrn_version >= 2.1) {
@@ -2153,6 +2167,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 		$postvars['key'] = bin2hex($postvars['key']);
 	}
+	
 
 	logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
 
@@ -2233,6 +2248,17 @@ function edited_timestamp_is_newer($existing, $update) {
  */
 
 function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
+	if ($contact['network'] === NETWORK_OSTATUS) {
+		if ($pass < 2) {
+			// Test - remove before flight
+			//$tempfile = tempnam(get_temppath(), "ostatus");
+			//file_put_contents($tempfile, $xml);
+
+			logger("Consume OStatus messages ", LOGGER_DEBUG);
+			ostatus_import($xml,$importer,$contact, $hub);
+		}
+		return;
+	}
 
 	require_once('library/simplepie/simplepie.inc');
 	require_once('include/contact_selectors.php');
@@ -2242,12 +2268,6 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 		return;
 	}
 
-	// Test - remove before flight
-//	if ($contact['network'] === NETWORK_OSTATUS) {
-//		$tempfile = tempnam(get_temppath(), "ostatus");
-//		file_put_contents($tempfile, $xml);
-//	}
-
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
@@ -2957,9 +2977,6 @@ function item_is_remote_self($contact, &$datarray) {
 			$datarray['private'] = 0;
 	}
 
-	//if (!isset($datarray["app"]) OR ($datarray["app"] == ""))
-	//	$datarray["app"] = network_to_name($contact['network']);
-
 	if ($contact['network'] != NETWORK_FEED) {
 		// Store the original post
 		$r = item_store($datarray2, false, false);
@@ -4139,9 +4156,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 	$name = notags(trim($datarray['author-name']));
 	$photo = notags(trim($datarray['author-avatar']));
 
-	$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'];
+	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)
@@ -4307,10 +4327,48 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
 
 
 	$o .= "<$tag>\r\n";
-	$o .= "<name>$name</name>\r\n";
-	$o .= "<uri>$uri</uri>\r\n";
-	$o .= '<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-	$o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= "\t<name>$name</name>\r\n";
+	$o .= "\t<uri>$uri</uri>\r\n";
+	$o .= "\t".'<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= "\t".'<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+
+	if ($tag == "author") {
+		$r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
+				`profile`.`name`, `profile`.`pub_keywords`, `profile`.`about`,
+				`profile`.`homepage`,`contact`.`nick` FROM `profile`
+				INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid`
+				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
+				WHERE `profile`.`is-default` AND `contact`.`self` AND
+					NOT `user`.`hidewall` AND `contact`.`nurl`='%s'",
+			dbesc(normalise_link($uri)));
+		if ($r) {
+			$location = '';
+			if($r[0]['locality'])
+				$location .= $r[0]['locality'];
+			if($r[0]['region']) {
+				if($location)
+					$location .= ', ';
+				$location .= $r[0]['region'];
+			}
+			if($r[0]['country-name']) {
+				if($location)
+					$location .= ', ';
+				$location .= $r[0]['country-name'];
+			}
+
+			$o .= "\t<poco:preferredUsername>".xmlify($r[0]["nick"])."</poco:preferredUsername>\r\n";
+			$o .= "\t<poco:displayName>".xmlify($r[0]["name"])."</poco:displayName>\r\n";
+			$o .= "\t<poco:note>".xmlify($r[0]["about"])."</poco:note>\r\n";
+			$o .= "\t<poco:address>\r\n";
+			$o .= "\t\t<poco:formatted>".xmlify($location)."</poco:formatted>\r\n";
+			$o .= "\t</poco:address>\r\n";
+			$o .= "\t<poco:urls>\r\n";
+			$o .= "\t<poco:type>homepage</poco:type>\r\n";
+			$o .= "\t\t<poco:value>".xmlify($r[0]["homepage"])."</poco:value>\r\n";
+			$o .= "\t\t<poco:primary>true</poco:primary>\r\n";
+			$o .= "\t</poco:urls>\r\n";
+		}
+	}
 
 	call_hooks('atom_author', $o);
 
@@ -4345,8 +4403,9 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 		$o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
 	if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+		$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-		$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\r\n";
+		$o .= '<thr:in-reply-to ref="'.xmlify($parent_item).'" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$parent[0]['guid']).'" />'."\r\n";
 	}
 
 	$htmlbody = $body;
@@ -4354,7 +4413,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	if ($item['title'] != "")
 		$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
 
-	$htmlbody = bbcode(bb_remove_share_information($htmlbody), false, false, 7);
+	$htmlbody = bbcode($htmlbody, false, false, 7);
 
 	$o .= '<id>' . xmlify($item['uri']) . '</id>' . "\r\n";
 	$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
@@ -4362,8 +4421,9 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
 	$o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
 	$o .= '<content type="' . $type . '" >' . xmlify((($type === 'html') ? $htmlbody : $body)) . '</content>' . "\r\n";
-	$o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
+	$o .= '<link rel="alternate" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$item['guid']).'" />'."\r\n";
 
+	$o .= '<status_net notice_id="'.$item['id'].'"></status_net>'."\r\n";
 
 	if($comment)
 		$o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
@@ -4406,11 +4466,19 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 
 	$tags = item_getfeedtags($item);
 	if(count($tags)) {
-		foreach($tags as $t) {
-			$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
-		}
+		foreach($tags as $t)
+			if (($type != 'html') OR ($t[0] != "@"))
+				$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
 	}
 
+	// To-Do:
+	// To support these elements, the API needs to be enhanced
+	//$o .= '<link rel="ostatus:conversation" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
+	//$o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+	//$o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+
+	$o .= item_get_attachment($item);
+
 	$o .= item_getfeedattach($item);
 
 	$mentioned = get_mentions($item);
@@ -4588,6 +4656,28 @@ function item_getfeedtags($item) {
 	return $ret;
 }
 
+function item_get_attachment($item) {
+	$o = "";
+	$siteinfo = get_attached_data($item["body"]);
+
+	switch($siteinfo["type"]) {
+		case 'link':
+			$o = '<link rel="enclosure" href="'.xmlify($siteinfo["url"]).'" type="text/html; charset=UTF-8" length="" title="'.xmlify($siteinfo["title"]).'"/>'."\r\n";
+			break;
+		case 'photo':
+			$imgdata = get_photo_info($siteinfo["image"]);
+			$o = '<link rel="enclosure" href="'.xmlify($siteinfo["image"]).'" type="'.$imgdata["mime"].'" length="'.$imgdata["size"].'"/>'."\r\n";
+			break;
+		case 'video':
+			$o = '<link rel="enclosure" href="'.xmlify($siteinfo["url"]).'" type="text/html; charset=UTF-8" length="" title="'.xmlify($siteinfo["title"]).'"/>'."\r\n";
+			break;
+		default:
+			break;
+	}
+
+	return $o;
+}
+
 function item_getfeedattach($item) {
 	$ret = '';
 	$arr = explode('[/attach],',$item['attach']);
@@ -4955,17 +5045,17 @@ function first_post_date($uid,$wall = false) {
 /* modified posted_dates() {below} to arrange the list in years */
 function list_post_dates($uid, $wall) {
 	$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
-	
-	$dthen = first_post_date($uid, $wall);        
+
+	$dthen = first_post_date($uid, $wall);
 	if(! $dthen)
 		return array();
-        
+
 	// Set the start and end date to the beginning of the month
-        $dnow = substr($dnow,0,8).'01';
+	$dnow = substr($dnow,0,8).'01';
 	$dthen = substr($dthen,0,8).'01';
-        
+
 	$ret = array();
-        
+
 	// Starting with the current month, get the first and last days of every
 	// month down to and including the month of the first post
 	while(substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
@@ -4977,7 +5067,7 @@ function list_post_dates($uid, $wall) {
 		$str = day_translate(datetime_convert('','',$dnow,'F'));
 		if(! $ret[$dyear])
 			$ret[$dyear] = array();
- 		$ret[$dyear][] = array($str,$end_month,$start_month);
+		$ret[$dyear][] = array($str,$end_month,$start_month);
 		$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
 	}
 	return $ret;
@@ -5020,19 +5110,19 @@ function posted_date_widget($url,$uid,$wall) {
 
 /*	if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
 		return $o;*/
-        
+
 	$visible_years = get_pconfig($uid,'system','archive_visible_years');
 	if(! $visible_years)
-		$visible_years = 5;	
-        
-        $ret = list_post_dates($uid,$wall);
-        
+		$visible_years = 5;
+
+	$ret = list_post_dates($uid,$wall);
+
 	if(! count($ret))
 		return $o;
 
-        $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
+	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
 	$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
-        
+
 	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
 		'$title' => t('Archives'),
 		'$size' => $visible_years,
@@ -5040,7 +5130,7 @@ function posted_date_widget($url,$uid,$wall) {
 		'$cutoff' => $cutoff,
 		'$url' => $url,
 		'$dates' => $ret,
-                '$showmore' => t('show more')
+		'$showmore' => t('show more')
 
 	));
 	return $o;