diff --git a/include/conversation.php b/include/conversation.php
index 3c3169ec5..73c3337d5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -299,6 +299,334 @@ function localize_item(&$item){
}
+/**
+ * Count the total of comments on this item and its desendants
+ */
+function count_descendants($item) {
+ $total = count($item['children']);
+
+ if($total > 0) {
+ foreach($item['children'] as $child) {
+ $total += count_descendants($child);
+ }
+ }
+
+ return $total;
+}
+
+/**
+ * Recursively prepare a thread for HTML
+ */
+
+function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $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) {
+ // prevent private email reply to public conversation from leaking.
+ if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+ // Don't count it as a visible item
+ $nb_items--;
+ continue;
+ }
+
+ $items_seen++;
+
+ $alike = array();
+ $dlike = array();
+ $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 = '';
+ $lastcollapsed = false;
+ $firstcollapsed = false;
+ $total_children += count_descendants($item);
+
+ $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+ $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+ $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;
+ if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $dropping = true;
+
+ $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($profile_link === 'mailbox')
+ $profile_link = '';
+ if($sp)
+ $sparkle = ' sparkle';
+ else
+ $profile_link = zrl($profile_link);
+
+ $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+ if(($normalised != 'mailbox') && (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));
+
+ $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();
+ foreach(explode(',',$item['tag']) as $tag){
+ $tag = trim($tag);
+ if ($tag!="") $tags[] = bbcode($tag);
+ }
+
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
+
+ $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 !== 'profile')) {
+ 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 = zrl($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 = zrl($owner_url);
+ }
+ }
+ if($profile_owner == local_user()) {
+ $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' => "",
+ );
+ }
+ } 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($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' => '',
+ '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+ '$type' => (($mode === 'profile') ? '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'),
+ '$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' => $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' => (($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'),
+ );
+
+ $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, ($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')) {
+ $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.
* There are two major forms of display:
@@ -372,7 +700,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// array with html for each thread (parent+comments)
$threads = array();
$threadsid = -1;
-
+
+ $page_template = get_markup_template("conversation.tpl");
+
if($items && count($items)) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -499,366 +829,23 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else
{
// Normal View
+ $page_template = get_markup_template("threaded_conversation.tpl");
+ // get all the topmost parents
+ // this shouldn't be needed, as we should have only them in ou array
+ // But for now, this array respects the old style, just in case
- // Figure out how many comments each parent has
- // (Comments all have gravity of 6)
- // Store the result in the $comments array
-
- $comments = array();
+ $threads = 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
+ if($item['id'] == $item['parent']) {
+ $threads[] = $item;
+ }
}
- // 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');
- like_puller($a,$item,$dlike,'dislike');
- }
-
- $comments_collapsed = false;
- $comments_seen = 0;
- $comment_lastcollapsed = false;
- $comment_firstcollapsed = false;
- $blowhard = 0;
- $blowhard_count = 0;
-
-
- foreach($items as $item) {
-
- $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(((activity_match($item['verb'],ACTIVITY_LIKE))
- || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
- && ($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) {
-
- $item_writeable = (($item['writable'] || $item['self']) ? 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 {
-
- // prevent private email reply to public conversation from leaking.
- if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
- continue;
-
- $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 !== 'profile')) {
-
- 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 = zrl($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 = zrl($owner_url);
- }
- }
- }
-
- $likebuttons = '';
- $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
-
- if($page_writeable) {
-/* if($toplevelpost) { */
- $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) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
- $comment = replace_macros($cmnt_tpl,array(
- '$return_path' => '',
- '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
- '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
- '$id' => $item['item_id'],
- '$parent' => $item['parent'],
- '$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'),
- '$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(
- '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($profile_link === 'mailbox')
- $profile_link = '';
- if($sp)
- $sparkle = ' sparkle';
- else
- $profile_link = zrl($profile_link);
-
- $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- if(($normalised != 'mailbox') && (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));
-
- $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();
- foreach(explode(',',$item['tag']) as $tag){
- $tag = trim($tag);
- if ($tag!="") $tags[] = bbcode($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' => (($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' => $likebuttons,
- 'like' => $like,
- 'dislike' => $dislike,
- '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'];
- }
+ $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
}
}
-
- $page_template = get_markup_template("conversation.tpl");
+
$o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state),
'$mode' => $mode,
@@ -1177,12 +1164,55 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
}
+function get_item_children($arr, $parent) {
+ $children = array();
+ foreach($arr as $item) {
+ if($item['id'] != $item['parent']) {
+ if(get_config('system','thread_allow')) {
+ // Fallback to parent-uri if thr-parent is not set
+ $thr_parent = $item['thr-parent'];
+ if($thr_parent == '')
+ $thr_parent = $item['parent-uri'];
+
+ if($thr_parent == $parent['uri']) {
+ $item['children'] = get_item_children($arr, $item);
+ $children[] = $item;
+ }
+ }
+ else if($item['parent'] == $parent['id']) {
+ $children[] = $item;
+ }
+ }
+ }
+ return $children;
+}
+
+function sort_item_children($items) {
+ $result = $items;
+ usort($result,'sort_thr_created_rev');
+ foreach($result as $k => $i) {
+ if(count($result[$k]['children'])) {
+ $result[$k]['children'] = sort_item_children($result[$k]['children']);
+ }
+ }
+ return $result;
+}
+
+function add_children_to_list($children, &$arr) {
+ foreach($children as $y) {
+ $arr[] = $y;
+ if(count($y['children']))
+ add_children_to_list($y['children'], $arr);
+ }
+}
+
function conv_sort($arr,$order) {
if((!(is_array($arr) && count($arr))))
return array();
$parents = array();
+ $children = array();
foreach($arr as $x)
if($x['id'] == $x['parent'])
@@ -1195,21 +1225,22 @@ function conv_sort($arr,$order) {
if(count($parents))
foreach($parents as $i=>$_x)
- $parents[$i]['children'] = array();
+ $parents[$i]['children'] = get_item_children($arr, $_x);
- foreach($arr as $x) {
+ /*foreach($arr as $x) {
if($x['id'] != $x['parent']) {
$p = find_thread_parent_index($parents,$x);
if($p !== false)
$parents[$p]['children'][] = $x;
}
- }
+ }*/
if(count($parents)) {
foreach($parents as $k => $v) {
if(count($parents[$k]['children'])) {
- $y = $parents[$k]['children'];
+ $parents[$k]['children'] = sort_item_children($parents[$k]['children']);
+ /*$y = $parents[$k]['children'];
usort($y,'sort_thr_created_rev');
- $parents[$k]['children'] = $y;
+ $parents[$k]['children'] = $y;*/
}
}
}
@@ -1219,8 +1250,9 @@ function conv_sort($arr,$order) {
foreach($parents as $x) {
$ret[] = $x;
if(count($x['children']))
- foreach($x['children'] as $y)
- $ret[] = $y;
+ add_children_to_list($x['children'], $ret);
+ /*foreach($x['children'] as $y)
+ $ret[] = $y;*/
}
}
diff --git a/include/diaspora.php b/include/diaspora.php
index a23c11bd2..96b0b184e 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2257,12 +2257,13 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
// $theiraddr = $contact['addr'];
- if($item['thr-parent']) {
+ // Diaspora doesn't support threaded comments
+ /*if($item['thr-parent']) {
$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
dbesc($item['thr-parent'])
);
}
- else {
+ else {*/
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2270,7 +2271,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
intval($item['parent']),
intval($item['parent'])
);
- }
+ //}
if(count($p))
$parent = $p[0];
else
@@ -2332,13 +2333,13 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
$body = $item['body'];
$text = html_entity_decode(bb2diaspora($body));
-
- if($item['thr-parent']) {
+ // Diaspora doesn't support threaded comments
+ /*if($item['thr-parent']) {
$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
dbesc($item['thr-parent'])
);
}
- else {
+ else {*/
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2346,7 +2347,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
intval($item['parent']),
intval($item['parent'])
);
- }
+ //}
if(count($p))
$parent = $p[0];
else
diff --git a/include/items.php b/include/items.php
index c3dc7d06c..93200cc4b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -925,6 +925,8 @@ function item_store($arr,$force_parent = false) {
$arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 );
$arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid());
+
+ $arr['thr-parent'] = $arr['parent-uri'];
if($arr['parent-uri'] === $arr['uri']) {
$parent_id = 0;
$parent_deleted = 0;
@@ -950,7 +952,6 @@ function item_store($arr,$force_parent = false) {
// and re-attach to the conversation parent.
if($r[0]['uri'] != $r[0]['parent-uri']) {
- $arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $r[0]['parent-uri'];
$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
ORDER BY `id` ASC LIMIT 1",
@@ -992,7 +993,6 @@ function item_store($arr,$force_parent = false) {
if($force_parent) {
logger('item_store: $force_parent=true, reply converted to top-level post.');
$parent_id = 0;
- $arr['thr-parent'] = $arr['parent-uri'];
$arr['parent-uri'] = $arr['uri'];
$arr['gravity'] = 0;
}
diff --git a/js/main.js b/js/main.js
index c7db9a069..6ab574c4e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -280,8 +280,7 @@
//});
// add a new thread
-
- $('.tread-wrapper',data).each(function() {
+ $('.toplevel_item',data).each(function() {
var ident = $(this).attr('id');
if($('#' + ident).length == 0 && profile_page == 1) {
diff --git a/mod/admin.php b/mod/admin.php
index 05af01aa4..1752b3fe8 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -250,6 +250,7 @@ function admin_page_site_post(&$a){
$block_public = ((x($_POST,'block_public')) ? True : False);
$force_publish = ((x($_POST,'publish_all')) ? True : False);
$global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : '');
+ $thread_allow = ((x($_POST,'thread_allow')) ? True : False);
$no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False);
$no_openid = !((x($_POST,'no_openid')) ? True : False);
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
@@ -342,6 +343,7 @@ function admin_page_site_post(&$a){
} else {
set_config('system','directory_submit_url', $global_directory);
}
+ set_config('system','thread_allow', $thread_allow);
set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid);
@@ -442,6 +444,7 @@ function admin_page_site(&$a) {
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
'$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
+ '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
diff --git a/mod/display.php b/mod/display.php
index 92ffd1a70..afa61ef02 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -113,8 +113,9 @@ function display_content(&$a) {
);
}
-
- $o .= conversation($a,$r,'display', false);
+ $items = conv_sort($r,"`commented`");
+
+ $o .= conversation($a,$items,'display', false);
}
else {
diff --git a/mod/item.php b/mod/item.php
index 436adec50..c7b755eae 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -79,6 +79,7 @@ function item_post(&$a) {
// if this isn't the real parent of the conversation, find it
if($r !== false && count($r)) {
$parid = $r[0]['parent'];
+ $parent_uri = $r[0]['uri'];
if($r[0]['id'] != $r[0]['parent']) {
$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
intval($parid)
@@ -96,7 +97,7 @@ function item_post(&$a) {
$parent = $r[0]['id'];
// multi-level threading - preserve the info but re-parent to our single level threading
- if(($parid) && ($parid != $parent))
+ //if(($parid) && ($parid != $parent))
$thr_parent = $parent_uri;
if($parent_item['contact-id'] && $uid) {
@@ -544,6 +545,10 @@ function item_post(&$a) {
$uri = item_new_uri($a->get_hostname(),$profile_uid);
+ // Fallback so that we alway have a thr-parent
+ if(!$thr_parent)
+ $thr_parent = $uri;
+
$datarray = array();
$datarray['uid'] = $profile_uid;
$datarray['type'] = $post_type;
@@ -603,7 +608,7 @@ function item_post(&$a) {
if($preview) {
require_once('include/conversation.php');
- $o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
+ $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false);
logger('preview: ' . $o);
echo json_encode(array('preview' => $o));
killme();
diff --git a/mod/notes.php b/mod/notes.php
index 625bbd2ee..afaa60f70 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -129,9 +129,13 @@ function notes_content(&$a,$update = false) {
intval(local_user()),
dbesc($parents_str)
);
- }
- $o .= conversation($a,$r,'notes',$update);
+ if(count($r)) {
+ $items = conv_sort($r,"`commented`");
+
+ $o .= conversation($a,$items,'notes',$update);
+ }
+ }
$o .= paginate($a);
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 3ca03262d..e918ff787 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -71,6 +71,7 @@
{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+ {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index a1d4e1043..b2be6f94e 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,5 +1,6 @@
+{{ if $item.flatten }}
+{{ endif }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
new file mode 100644
index 000000000..4d454f00d
--- /dev/null
+++ b/view/theme/quattro/wall_thread.tpl
@@ -0,0 +1,127 @@
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+
+ {{endif}}
+{{ endif }}
+
+{{ if $item.flatten }}
+
+{{ endif }}
diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl
new file mode 100644
index 000000000..cc2f8e362
--- /dev/null
+++ b/view/theme/quattro/wallwall_thread.tpl
@@ -0,0 +1,134 @@
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+
+ {{endif}}
+{{ endif }}
+
+{{ if $item.flatten }}
+
+{{ endif }}
diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl
new file mode 100644
index 000000000..f60839e49
--- /dev/null
+++ b/view/threaded_conversation.tpl
@@ -0,0 +1,13 @@
+{{ for $threads as $item }}
+{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+
+
+{{ if $dropping }}
+
+
+{{ endif }}
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
new file mode 100644
index 000000000..600f755b1
--- /dev/null
+++ b/view/wall_thread.tpl
@@ -0,0 +1,100 @@
+{{if $item.comment_firstcollapsed}}
+
+ {{endif}}
diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl
new file mode 100644
index 000000000..89f121f21
--- /dev/null
+++ b/view/wallwall_thread.tpl
@@ -0,0 +1,105 @@
+{{if $item.comment_firstcollapsed}}
+
+ {{endif}}
+
