]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
allow comments on other folks wall-to-wall postings
[friendica.git] / include / conversation.php
index 6c3f13477fdf4cd16371e504d6a8baedc26be032..ceef63a9927d83da75d1b675bfc27150fcfc7d7a 100644 (file)
@@ -1,5 +1,8 @@
 <?php
 
+require_once("include/bbcode.php");
+
+
 // Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
 // is identical to the code in mod/message.php for 'item_extract_images' and
 // 'item_redir_and_replace_images'
@@ -51,19 +54,27 @@ function item_redir_and_replace_images($body, $images, $cid) {
        $origbody = $body;
        $newbody = '';
 
-       for($i = 0; $i < count($images); $i++) {
-               $search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
+       $cnt = 1;
+       $pos = get_bb_tag_pos($origbody, 'url', 1);
+       while($pos !== false && $cnt < 1000) {
+
+               $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
                $replace = '[url=' . z_path() . '/redir/' . $cid 
-                          . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
+                          . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
 
-               $img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
-               $process_part = substr($origbody, 0, $img_end);
-               $origbody = substr($origbody, $img_end);
+               $newbody .= substr($origbody, 0, $pos['start']['open']);
+               $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
+               $origbody = substr($origbody, $pos['end']['close']);
+               if($origbody === false)
+                       $origbody = '';
 
-               $process_part = preg_replace($search, $replace, $process_part);
-               $newbody = $newbody . $process_part;
+               $subject = preg_replace($search, $replace, $subject);
+               $newbody .= $subject;
+
+               $cnt++;
+               $pos = get_bb_tag_pos($origbody, 'url', 1);
        }
-       $newbody = $newbody . $origbody;
+       $newbody .= $origbody;
 
        $cnt = 0;
        foreach($images as $image) {
@@ -162,6 +173,63 @@ function localize_item(&$item){
                $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
        }
+       if (stristr($item['verb'],ACTIVITY_POKE)) {
+               $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+               if(! $verb)
+                       return;
+               if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
+
+               $Aname = $item['author-name'];
+               $Alink = $item['author-link'];
+               
+               $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+               
+               $obj = parse_xml_string($xmlhead.$item['object']);
+               $links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+               
+               $Bname = $obj->title;
+               $Blink = ""; $Bphoto = "";
+               foreach ($links->link as $l){
+                       $atts = $l->attributes();
+                       switch($atts['rel']){
+                               case "alternate": $Blink = $atts['href'];
+                               case "photo": $Bphoto = $atts['href'];
+                       }
+                       
+               }
+               
+               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+               if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+
+               // we can't have a translation string with three positions but no distinguishable text
+               // So here is the translate string.
+
+               $txt = t('%1$s poked %2$s');
+
+               // now translate the verb
+
+               $txt = str_replace( t('poked'), t($verb), $txt);
+
+               // then do the sprintf on the translation string
+
+               $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
+
+       }
+       if (stristr($item['verb'],ACTIVITY_MOOD)) {
+               $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+               if(! $verb)
+                       return;
+
+               $Aname = $item['author-name'];
+               $Alink = $item['author-link'];
+               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+               
+               $txt = t('%1$s is currently %2$s');
+
+               $item['body'] = sprintf($txt, $A, t($verb));
+       }
+
     if ($item['verb']===ACTIVITY_TAG){
                $r = q("SELECT * from `item`,`contact` WHERE 
                `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -236,10 +304,10 @@ function localize_item(&$item){
        }
 
        // add zrl's to public images
-       if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
-               foreach($matches as $mtch) {
-                               $item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5]  . '[/img][/url]',$item['body']);
-               }
+       $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
+       if(preg_match($photo_pattern,$item['body'])) {
+               $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5'  . '[/img][/url]';
+               $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
        }
 
        // add sparkle links to appropriate permalinks
@@ -256,6 +324,379 @@ 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) {
+                       if($child['verb'] === ACTIVITY_LIKE || $child['verb'] === ACTIVITY_DISLIKE) {
+                               $total --;
+                       }
+                       $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, $alike, $dlike, $previewing, $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($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                       // Don't count it as a visible item
+                       $nb_items--;
+                       $total_children --;
+               }
+               if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+                       $nb_items --;
+                       $total_children --;
+
+               }
+       }
+
+       foreach($items as $item) {
+               // prevent private email reply to public conversation from leaking.
+               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                       continue;
+               }
+
+               if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+                       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;
+                               }
+                       }
+               }
+
+               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+               // This will allow us to comment on wall-to-wall items owned by our friends
+               // and community forums even if somebody else wrote the post. 
+
+               if($visiting && $mode == 'profile')
+                       $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($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    = ((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(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 === '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'),
+                                       '$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' => $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']),
+                       'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+
+                       '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, $previewing, ($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.
  * There are two major forms of display:
@@ -305,6 +746,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                $page_writeable = false;
        }
 
+       $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
+
+
        if($update)
                $return_url = $_SESSION['return_url'];
        else
@@ -329,7 +773,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') {
@@ -424,6 +870,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'title' => template_escape($item['title']),
                                        'body' => template_escape($body),
                                        'text' => strip_tags(template_escape($body)),
+                                       'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
                                        'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                                        'location' => template_escape($location),
                                        'indent' => '',
@@ -442,6 +889,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
                                        'previewing' => $previewing,
                                        'wait' => t('Please wait'),
+                                       'thread_level' => 1,
                                );
 
                                $arr = array('item' => $item, 'output' => $tmp_item);
@@ -456,371 +904,33 @@ 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
-                       }
-
-                       // 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();
 
+                               if($item['id'] == $item['parent']) {
+                                       $threads[] = $item;
                                }
-                               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'),
-                                                       '$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'), $profile_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, $alike, $dlike, $previewing);
                }
        }
-
-       $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' => ($dropping?t('Delete Selected Items'):False),
+               '$dropping' => ($page_dropping?t('Delete Selected Items'):False),
        ));
 
        return $o;
@@ -867,6 +977,7 @@ function item_photo_menu($item){
                 if(! count($a->contacts))
                        load_contact_links(local_user());
        }
+       $poke_link="";
        $contact_url="";
        $pm_url="";
        $status_link="";
@@ -896,6 +1007,7 @@ function item_photo_menu($item){
                }
        }
        if(($cid) && (! $item['self'])) {
+               $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
                $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
                $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
 
@@ -918,6 +1030,7 @@ function item_photo_menu($item){
                t("Network Posts") => $posts_link, 
                t("Edit Contact") => $contact_url,
                t("Send PM") => $pm_url,
+               t("Poke") => $poke_link
        );
        
        
@@ -929,7 +1042,7 @@ function item_photo_menu($item){
 
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+               if ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
        }
        return $o;
 }}
@@ -1009,7 +1122,6 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                $plaintext = true;
 
        $tpl = get_markup_template('jot-header.tpl');
-       
        $a->page['htmlhead'] .= replace_macros($tpl, array(
                '$newpost' => 'true',
                '$baseurl' => $a->get_baseurl(true),
@@ -1026,6 +1138,23 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
        ));
 
 
+       $tpl = get_markup_template('jot-end.tpl');
+       $a->page['end'] .= replace_macros($tpl, array(
+               '$newpost' => 'true',
+               '$baseurl' => $a->get_baseurl(true),
+               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+               '$geotag' => $geotag,
+               '$nickname' => $x['nickname'],
+               '$ispublic' => t('Visible to <strong>everybody</strong>'),
+               '$linkurl' => t('Please enter a link URL:'),
+               '$vidurl' => t("Please enter a video link/URL:"),
+               '$audurl' => t("Please enter an audio link/URL:"),
+               '$term' => t('Tag term:'),
+               '$fileas' => t('Save to Folder:'),
+               '$whereareu' => t('Where are you right now?')
+       ));
+
+
        $tpl = get_markup_template("jot.tpl");
                
        $jotplugins = '';
@@ -1101,6 +1230,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                '$bang' => $x['bang'],
                '$profile_uid' => $x['profile_uid'],
                '$preview' => t('Preview'),
+               '$sourceapp' => t($a->sourcename),
        ));
 
 
@@ -1113,12 +1243,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'])
@@ -1131,21 +1304,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;*/
                        }
                }       
        }
@@ -1155,8 +1329,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;*/
                }
        }