remove previous iterations of threading code because it's not being used and just confusing things

1 files changed, 0 insertions, 779 deletions

diff --git a/include/conversation.php b/include/conversation.php
index ab2d15b1e..2eabbcb0c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -344,358 +344,6 @@ function visible_activity($item) {
 	return true;
 }
 
-/**
- * Recursively prepare a thread for HTML
- */
-
-function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) {
-	$result = array();
-
-	$wall_template = 'wall_thread.tpl';
-	$wallwall_template = 'wallwall_thread.tpl';
-	$items_seen = 0;
-	$nb_items = count($items);
-
-	$total_children = $nb_items;
-
-	foreach($items as $item) {
-
- 		if(! visible_activity($item)) {
-			$nb_items --;
-			$total_children --;
-			continue;
-		}
-
-		$items_seen++;
-
-		$comment = '';
-		$template = $wall_template;
-		$commentww = '';
-		$sparkle = '';
-		$owner_url = $owner_photo = $owner_name = '';
-		$buttons = '';
-		$dropping = false;
-		$star = false;
-		$isstarred = "unstarred";
-		$photo = $item['photo'];
-		$thumb = $item['thumb'];
-		$indent = '';
-		$osparkle = '';
-		$visiting = false;
-		$lastcollapsed = false;
-		$firstcollapsed = false;
-		$total_children += count_descendants($item);
-
-		$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
-
-		if($item['uid'] == local_user())
-			$dropping = true;
-		elseif(is_array($_SESSION['remote'])) {
-			foreach($_SESSION['remote'] as $visitor) {
-				if($visitor['cid'] == $item['contact-id']) {
-					$dropping = true;
-					$visiting = true;
-					break;
-				}
-			}
-		}
-
-		$channel = $a->get_channel();
-
-// FIXME
-//		$item_writeable = (($item['writable'] || $item['self']) ? true : false);
-		$item_writeable = ((local_user() && $channel['channel_hash'] === $item['owner_xchan']) ? true : false);
-
-		if($visiting && $mode == 'channel')
-			$item_writeable = true;
-
-		$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-			? t('Private Message')
-			: false);
-		$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
-		$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
-		if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-			$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-		else
-			$edpost = false;
-
-		$drop = array(
-			'dropping' => $dropping,
-			'select' => t('Select'),
-			'delete' => t('Delete'),
-		);
-
-		$filer = (($profile_owner == local_user()) ? t("save to folder") : false);
-
-		$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-		$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-		if($item['author-link'] && (! $item['author-name']))
-			$profile_name = $item['author-link'];
-
-		$sp = false;
-		$profile_link = best_link_url($item,$sp);
-		if($sp)
-			$sparkle = ' sparkle';
-		else
-			$profile_link = zid($profile_link);
-
-		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-		if(x($a->contacts,$normalised))
-			$profile_avatar = $a->contacts[$normalised]['thumb'];
-		else
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-		$profile_avatar = $item['author']['xchan_photo_m'];
-		$profile_link = zid($item['author']['xchan_url']);
-		$profile_name = $item['author']['xchan_name'];
-
-		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-		call_hooks('render_location',$locate);
-		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
-
-		$tags=array();
-		$hashtags = array();
-		$mentions = array();
-		foreach(explode(',',$item['tag']) as $tag){
-			$tag = trim($tag);
-			if ($tag!="") {
-				$t = bbcode($tag);
-				$tags[] = $t;
-				if($t[0] == '#')
-					$hashtags[] = $t;
-				elseif($t[0] == '@')
-					$mentions[] = $t;
-			}
-
-		}
-
-		$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-		$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
-
-		if($toplevelpost) {
-			if((! $item['self']) && ($mode !== 'channel')) {
-				if($item['wall']) {
-
-					// On the network page, I am the owner. On the display page it will be the profile owner.
-					// This will have been stored in $a->page_contact by our calling page.
-					// Put this person as the wall owner of the wall-to-wall notice.
-
-					$owner_url = zid($a->page_contact['url']);
-					$owner_photo = $a->page_contact['thumb'];
-					$owner_name = $a->page_contact['name'];
-					$template = $wallwall_template;
-					$commentww = 'ww';
-				}
-				else if($item['owner-link']) {
-
-					$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-					$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-					$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
-
-						// The author url doesn't match the owner (typically the contact)
-						// and also doesn't match the contact alias.
-						// The name match is a hack to catch several weird cases where URLs are
-						// all over the park. It can be tricked, but this prevents you from
-						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-						// well that it's the same Bob Smith.
-
-						// But it could be somebody else with the same name. It just isn't highly likely.
-
-
-						$owner_url = $item['owner-link'];
-						$owner_photo = $item['owner-avatar'];
-						$owner_name = $item['owner-name'];
-						$template = $wallwall_template;
-						$commentww = 'ww';
-						// If it is our contact, use a friendly redirect link
-						if((link_compare($item['owner-link'],$item['url']))
-							&& ($item['network'] === NETWORK_DFRN)) {
-							$owner_url = $redirect_url;
-							$osparkle = ' sparkle';
-						}
-						else
-							$owner_url = zid($owner_url);
-					}
-				}
-			}
-			if($profile_owner == local_user()) {
-				$isstarred = (($item['item_flags'] & ITEM_STARRED) ? "starred" : "unstarred");
-
-				$star = array(
-					'do' => t("add star"),
-					'undo' => t("remove star"),
-					'toggle' => t("toggle star status"),
-					'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""),
-					'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"),
-					'starred' =>  t('starred'),
-					'tagger' => t("add tag"),
-					'classtagger' => "",
-				);
-			}
-		} else {
-			$indent = 'comment';
-			// Collapse comments
-			if(($nb_items > 2) || ($thread_level > 2)) {
-				if($items_seen == 1) {
-					$firstcollapsed = true;
-				}
-				if($thread_level > 2) {
-					if($items_seen == $nb_items)
-						$lastcollapsed = true;
-				}
-				else if($items_seen == ($nb_items - 2)) {
-					$lastcollapsed = true;
-				}
-			}
-		}
-
-		if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
-			$comments_threaded = true;
-		}
-		else {
-			$comments_threaded = false;
-		}
-
-		if($page_writeable) {
-			$buttons = array(
-				'like' => array( t("I like this \x28toggle\x29"), t("like")),
-				'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-			);
-			if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
-
-
-			if($show_comment_box) {
-				$qc = $qcomment =  null;
-
-				if(in_array('qcomment',$a->plugins)) {
-					$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-					$qcomment = (($qc) ? explode("\n",$qc) : null);
-				}
-				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '',
-					'$threaded' => $comments_threaded,
-					'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-					'$type' => (($mode === 'channel') ? 'wall-comment' : 'net-comment'),
-					'$id' => $item['item_id'],
-					'$parent' => $item['item_id'],
-					'$qcomment' => $qcomment,
-					'$profile_uid' =>  $profile_owner,
-					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('This is you'),
-					'$myphoto' => $a->contact['thumb'],
-					'$comment' => t('Comment'),
-					'$submit' => t('Submit'),
-					'$edbold' => t('Bold'),
-					'$editalic' => t('Italic'),
-					'$eduline' => t('Underline'),
-					'$edquote' => t('Quote'),
-					'$edcode' => t('Code'),
-					'$edimg' => t('Image'),
-					'$edurl' => t('Link'),
-					'$edvideo' => t('Video'),
-					'$preview' => t('Preview'),
-					'$indent' => $indent,
-					'$sourceapp' => t($a->sourcename),
-					'$ww' => (($mode === 'network') ? $commentww : '')
-				));
-			}
-		}
-
-		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-			$indent .= ' shiny';
-
-		localize_item($item);
-
-		$body = prepare_body($item,true);
-
-		$tmp_item = array(
-			// collapse comments in template. I don't like this much...
-			'comment_firstcollapsed' => $firstcollapsed,
-			'comment_lastcollapsed' => $lastcollapsed,
-			// template to use to render item (wall, walltowall, search)
-			'template' => $template,
-
-			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-			'tags' => template_escape($tags),
-			'hashtags' => template_escape($hashtags),
-			'mentions' => template_escape($mentions),
-			'body' => template_escape($body),
-			'text' => strip_tags(template_escape($body)),
-			'id' => $item['item_id'],
-			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_link),
-			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-			'to' => t('to'),
-			'wall' => t('Wall-to-Wall'),
-			'vwall' => t('via Wall-To-Wall:'),
-			'profile_url' => $profile_link,
-			'item_photo_menu' => item_photo_menu($item),
-			'name' => template_escape($profile_name),
-			'thumb' => $profile_avatar,
-			'osparkle' => $osparkle,
-			'sparkle' => $sparkle,
-			'title' => template_escape($item['title']),
-			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-			'lock' => $lock,
-			'location' => template_escape($location),
-			'indent' => $indent,
-			'owner_url' => $owner_url,
-			'owner_photo' => $owner_photo,
-			'owner_name' => template_escape($owner_name),
-			'plink' => get_plink($item),
-			'edpost' => $edpost,
-			'isstarred' => $isstarred,
-			'star' => $star,
-			'filer' => $filer,
-			'drop' => $drop,
-			'vote' => $buttons,
-			'like' => $like,
-			'dislike' => $dislike,
-			'comment' => $comment,
-			'previewing' => $previewing,
-			'wait' => t('Please wait'),
-			'thread_level' => $thread_level,
-		);
-
-		$arr = array('item' => $item, 'output' => $tmp_item);
-		call_hooks('display_item', $arr);
-
-		$item_result = $arr['output'];
-		if($firstcollapsed) {
-			$item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
-			$item_result['hide_text'] = t('show more');
-		}
-
-		$item_result['children'] = array();
-		if(count($item['children'])) {
-			$item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1));
-		}
-		$item_result['private'] = $item['private'];
-		$item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
-
-		/*
-		 * I don't like this very much...
-		 */
-		if(get_config('system','thread_allow') && $a->theme_thread_allow) {
-			$item_result['flatten'] = false;
-			$item_result['threaded'] = true;
-		}
-		else {
-			$item_result['flatten'] = true;
-			$item_result['threaded'] = false;
-			if(!$toplevelpost) {
-				$item_result['comment'] = false;
-			}
-		}
-
-		$result[] = $item_result;
-	}
-
-	return $result;
-}
 
 /**
  * "Render" a conversation or list of items for HTML display.
@@ -1074,433 +722,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
 }}
 
 
-/*
-old code
-
-
-			// Figure out how many comments each parent has
-			// (Comments all have gravity of 6)
-			// Store the result in the $comments array
-
-			$comments = array();
-			foreach($items as $item) {
-
-
-				if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
-					if(! x($comments,$item['parent']))
-						$comments[$item['parent']] = 1;
-					else
-						$comments[$item['parent']] += 1;
-				} elseif(! x($comments,$item['parent'])) 
-					$comments[$item['parent']] = 0; // avoid notices later on
-			}
-
-			// map all the like/dislike activities for each parent item 
-			// Store these in the $alike and $dlike arrays
-
-			foreach($items as $item) {
-				like_puller($a,$item,$alike,'like');
-				if(feature_enabled($profile_uid,'dislike'))
-	                like_puller($a,$item,$dlike,'dislike');
-
-  				if($item['id'] == $item['parent']) {
-  					$threads[] = $item;
-  				}
-
-			}
-
-			$comments_collapsed = false;
-			$comments_seen = 0;
-			$comment_lastcollapsed = false;
-			$comment_firstcollapsed = false;
-			$blowhard = 0;
-			$blowhard_count = 0;
-
-
-			foreach($items as $item) {
-
-				$tfirst = dba_timer();
-
-				$comment = '';
-				$template = $tpl;
-				$commentww = '';
-				$sparkle = '';
-				$owner_url = $owner_photo = $owner_name = '';
-
-				// We've already parsed out like/dislike for special treatment. We can ignore them now
-
-				if((! visible_activity($item)) && ($item['id'] != $item['parent']))
-					continue;
-
-				$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
-
-				// Take care of author collapsing and comment collapsing
-				// (author collapsing is currently disabled)
-				// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-				// If there are more than two comments, squash all but the last 2.
-			
-				if($toplevelpost) {
-// FIXME - base this on observer permissions
-					$item_writeable = ((local_user() && $channel['channel_hash'] === $item['owner_xchan']) ? true : false);
-
-					$comments_seen = 0;
-					$comments_collapsed = false;
-					$comment_lastcollapsed  = false;
-					$comment_firstcollapsed = false;
-					
-					$threadsid++;
-					$threads[$threadsid]['id'] = $item['item_id'];
-					$threads[$threadsid]['private'] = $item['private'];
-					$threads[$threadsid]['items'] = array();
-
-				}
-				else {
-
-					$comments_seen ++;
-					$comment_lastcollapsed  = false;
-					$comment_firstcollapsed = false;
-				}	
-
-				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-				$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
-
-
-				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-
-					if (!$comments_collapsed){
-						$threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
-						$threads[$threadsid]['hide_text'] = t('show more');
-						$comments_collapsed = true;
-						$comment_firstcollapsed = true;
-					}
-				}
-				if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-
-					$comment_lastcollapsed = true;
-				}
-
-				$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
-
-				$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-					|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-					? t('Private Message')
-					: false);
-
-
-				// Top-level wall post not written by the wall owner (wall-to-wall)
-				// First figure out who owns it. 
-
-				$osparkle = '';
-
-				if(($toplevelpost) && (! $item['self']) && ($mode !== 'channel')) {
-
-					if($item['wall']) {
-
-						// On the network page, I am the owner. On the display page it will be the profile owner.
-						// This will have been stored in $a->page_contact by our calling page.
-						// Put this person as the wall owner of the wall-to-wall notice.
-
-						$owner_url = zid($a->page_contact['url']);
-						$owner_photo = $a->page_contact['thumb'];
-						$owner_name = $a->page_contact['name'];
-						$template = $wallwall;
-						$commentww = 'ww';	
-					}
-
-					if((! $item['wall']) && $item['owner-link']) {
-
-						$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-						$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-						$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-						if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
-
-							// The author url doesn't match the owner (typically the contact)
-							// and also doesn't match the contact alias. 
-							// The name match is a hack to catch several weird cases where URLs are 
-							// all over the park. It can be tricked, but this prevents you from
-							// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-							// well that it's the same Bob Smith. 
-
-							// But it could be somebody else with the same name. It just isn't highly likely. 
-							
-
-							$owner_url = $item['owner-link'];
-							$owner_photo = $item['owner-avatar'];
-							$owner_name = $item['owner-name'];
-							$template = $wallwall;
-							$commentww = 'ww';
-							// If it is our contact, use a friendly redirect link
-							if((link_compare($item['owner-link'],$item['url'])) 
-								&& ($item['network'] === NETWORK_DFRN)) {
-								$owner_url = $redirect_url;
-								$osparkle = ' sparkle';
-							}
-							else
-								$owner_url = zid($owner_url);
-						}
-					}
-				}
-
-				$likebuttons = '';
-				$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
-
-				if($page_writeable) {
-					$likebuttons = array(
-						'like' => array( t("I like this \x28toggle\x29"), t("like")),
-						'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-					);
-					if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-
-
-					$qc = $qcomment =  null;
-
-					if(in_array('qcomment',$a->plugins)) {
-						$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-						$qcomment = (($qc) ? explode("\n",$qc) : null);
-					}
-
-					if($show_comment_box) {
-						$comment = replace_macros($cmnt_tpl,array(
-							'$return_path' => '', 
-							'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-							'$type' => (($mode === 'channel') ? 'wall-comment' : 'net-comment'),
-							'$id' => $item['item_id'],
-							'$parent' => $item['parent'],
-							'$qcomment' => $qcomment,
-							'$profile_uid' =>  $profile_owner,
-							'$mylink' => $observer['xchan_url'],
-							'$mytitle' => t('This is you'),
-							'$myphoto' => $observer['xchan_photo_s'],
-							'$comment' => t('Comment'),
-							'$submit' => t('Submit'),
-							'$edbold' => t('Bold'),
-							'$editalic' => t('Italic'),
-							'$eduline' => t('Underline'),
-							'$edquote' => t('Quote'),
-							'$edcode' => t('Code'),
-							'$edimg' => t('Image'),
-							'$edurl' => t('Link'),
-							'$edvideo' => t('Video'),
-							'$preview' => t('Preview'),
-							'$sourceapp' => t($a->sourcename),
-							'$ww' => (($mode === 'network') ? $commentww : '')
-						));
-					}
-				}
-
-				if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-					$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-				else
-					$edpost = false;
-
-				$drop = '';
-				$dropping = false;
-
-				if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-					$dropping = true;
-
-				$drop = array(
-					'pagedropping' => $page_dropping,
-					'dropping' => $dropping,
-					'select' => t('Select'), 
-					'delete' => t('Delete'),
-				);
-
-				$star = false;
-				$filer = false;
-
-				$isstarred = "unstarred";
-				if ($profile_owner == local_user()) {
-					if($toplevelpost) {
-						$isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-						$star = array(
-							'do' => t("add star"),
-							'undo' => t("remove star"),
-							'toggle' => t("toggle star status"),
-							'classdo' => (($item['starred']) ? "hidden" : ""),
-							'classundo' => (($item['starred']) ? "" : "hidden"),
-							'starred' =>  t('starred'),
-							'tagger' => t("add tag"),
-							'classtagger' => "",
-						);
-					}
-					$filer = t("save to folder");
-				}
-
-
-				$photo = $item['photo'];
-				$thumb = $item['thumb'];
-
-				// Post was remotely authored.
-
-				$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-				$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-
-				if($item['author-link'] && (! $item['author-name']))
-					$profile_name = $item['author-link'];
-
-				$sp = false;
-				$profile_link = best_link_url($item,$sp);
-				if($sp)
-					$sparkle = ' sparkle';
-				else
-					$profile_link = zid($profile_link);					
-
-				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-				if(x($a->contacts,$normalised))
-					$profile_avatar = $a->contacts[$normalised]['thumb'];
-				else
-					$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-
-
-				$profile_avatar = $item['author']['xchan_photo_m'];
-				$profile_link = zid($item['author']['xchan_url']);
-				$profile_name = $item['author']['xchan_name'];
-
-
-				$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-				$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
-
-				$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-				call_hooks('render_location',$locate);
-
-				$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
-
-				$indent = (($toplevelpost) ? '' : ' comment');
-
-				if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-					$indent .= ' shiny'; 
-
-				// 
-				localize_item($item);
-
-
-				$tags=array();
-				$terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN));
-				if(count($terms))
-					foreach($terms as $tag)
-						$tags[] = format_term_for_display($tag);
-
-
-				// Build the HTML
-
-				$body = prepare_body($item,true);
-				//$tmp_item = replace_macros($template,
-				$tmp_item = array(
-					// collapse comments in template. I don't like this much...
-					'comment_firstcollapsed' => $comment_firstcollapsed,
-					'comment_lastcollapsed' => $comment_lastcollapsed,
-					// template to use to render item (wall, walltowall, search)
-					'template' => $template,
-					
-					'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-					'tags' => $tags,
-					'body' => template_escape($body),
-					'text' => strip_tags(template_escape($body)),
-					'id' => $item['item_id'],
-					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-					'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-					'to' => t('to'),
-					'wall' => t('Wall-to-Wall'),
-					'vwall' => t('via Wall-To-Wall:'),
-					'profile_url' => $profile_link,
-					'item_photo_menu' => item_photo_menu($item),
-					'name' => template_escape($profile_name),
-					'thumb' => $profile_avatar,
-					'osparkle' => $osparkle,
-					'sparkle' => $sparkle,
-					'title' => template_escape($item['title']),
-					'ago' => datetime_convert('UTC',date_default_timezone_get(),$item['created'],'r'), // relative_date($item['created']),
-					'app' => $item['app'],
-					'str_app' => sprintf( t(' from %s'), $item['app']),
-					'localtime' => datetime_convert('UTC', 'UTC', $item['created'], 'c'),
-					'lock' => $lock,
-					'location' => template_escape($location),
-					'indent' => $indent,
-					'owner_url' => $owner_url,
-					'owner_photo' => $owner_photo,
-					'owner_name' => template_escape($owner_name),
-					'plink' => get_plink($item),
-					'edpost' => $edpost,
-					'isstarred' => $isstarred,
-					'star' => $star,
-					'filer' => $filer,
-					'drop' => $drop,
-					'vote' => $likebuttons,
-					'like' => $like,
-					'dislike' => $dislike,
-					'nolike' => ((feature_enabled($profile_uid,'dislike')) ? '1' : ''),
-					'comment' => $comment,
-					'previewing' => $previewing,
-					'wait' => t('Please wait'),
-
-				);
-
-
-				$arr = array('item' => $item, 'output' => $tmp_item);
-				call_hooks('display_item', $arr);
-
-				$threads[$threadsid]['items'][] = $arr['output'];
-
-				$tlast = dba_timer();
-
-//				logger('render dba_timer: item# ' . $item['id'] . ' ' . sprintf('%01.4f',$tlast - $tfirst));
-
-
-
-
-			}
-		}
-
-//		logger('render total dba_timer: ' . sprintf('%01.4f',$tlast - $tstart));
-
-
-
-	}
-
-//	logger('threads: ' . count($threads) . ' update: ' . $update);
-
-	if($page_mode === 'traditional' || $page_mode === 'preview') {
-		$page_template = get_markup_template("conversation.tpl");
-		$o = replace_macros($page_template, array(
-			'$baseurl' => $a->get_baseurl($ssl_state),
-			'$mode' => $mode,
-			'$user' => $a->user,
-			'$threads' => $threads,
-			'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
-		));
-	}
-	elseif($update) {
-		$page_template = get_markup_template("conv.tpl");
-		$o = replace_macros($page_template, array(
-			'$baseurl' => $a->get_baseurl($ssl_state),
-			'$mode' => $mode,
-			'$user' => $a->user,
-			'$threads' => $threads,
-		));
-	}
-	else {
-		$page_template = get_markup_template("conv_frame.tpl");
-		$o = replace_macros($page_template, array(
-			'$baseurl' => $a->get_baseurl($ssl_state),
-			'$mode' => $mode,
-			'$user' => $a->user,
-			'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
-		));
-	}
-
-	$tfinal = dba_timer();
-//	logger('render template dba_timer: ' . sprintf('%01.4f',$tfinal - $tlast));
-
-
-	return $o;
-}}
-*/
-
 function best_link_url($item,&$sparkle,$ssl_state = false) {
 
 	$a = get_app();