]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
Merge remote branch 'friendica/master' into quattro-fontsoptions
[friendica.git] / include / conversation.php
index 73c3337d520046f83a344a9a36a38df7eb699d8c..b41f3f0b76ef98c32eed38b6e36b05cf7f262f25 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';
-               $replace = '[url=' . z_path() . '/redir/' . $cid 
-                          . '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
+       $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' . '$2' .'#!][/url]';
+
+               $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 = '';
 
-               $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);
+               $subject = preg_replace($search, $replace, $subject);
+               $newbody .= $subject;
 
-               $process_part = preg_replace($search, $replace, $process_part);
-               $newbody = $newbody . $process_part;
+               $cnt++;
+               $pos = get_bb_tag_pos($origbody, 'url', 1);
        }
-       $newbody = $newbody . $origbody;
+       $newbody .= $origbody;
 
        $cnt = 0;
        foreach($images as $image) {
@@ -88,17 +99,17 @@ function localize_item(&$item){
                $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
 
        $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-       if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
+       if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
 
-               $r = q("SELECT * from `item`,`contact` WHERE 
+               $r = q("SELECT * from `item`,`contact` WHERE
                                `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
                                 dbesc($item['parent-uri']));
                if(count($r)==0) return;
                $obj=$r[0];
-               
-               $author  = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+
+               $author  = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
                $objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
-               
+
                switch($obj['verb']){
                        case ACTIVITY_POST:
                                switch ($obj['object-type']){
@@ -112,38 +123,36 @@ function localize_item(&$item){
                        default:
                                if($obj['resource-id']){
                                        $post_type = t('photo');
-                                       $m=array();     preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+                                       $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
                                        $rr['plink'] = $m[1];
                                } else {
                                        $post_type = t('status');
                                }
                }
-       
+
                $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-                
-               switch($item['verb']){
-                       case ACTIVITY_LIKE :
-                               $bodyverb = t('%1$s likes %2$s\'s %3$s');
-                               break;
-                       case ACTIVITY_DISLIKE:
-                               $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-                               break;
+
+               if(activity_match($item['verb'],ACTIVITY_LIKE)) {
+                       $bodyverb = t('%1$s likes %2$s\'s %3$s');
+               }
+               elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
+                       $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
                }
                $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
-                       
+
        }
-       if ($item['verb']=== ACTIVITY_FRIEND){
+       if (activity_match($item['verb'],ACTIVITY_FRIEND)) {
 
                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){
@@ -152,9 +161,9 @@ function localize_item(&$item){
                                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]' . $Bphoto . '[/img][/url]';
@@ -170,12 +179,12 @@ function localize_item(&$item){
 
                $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){
@@ -184,9 +193,9 @@ function localize_item(&$item){
                                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]';
@@ -205,16 +214,30 @@ function localize_item(&$item){
                $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
 
        }
-    if ($item['verb']===ACTIVITY_TAG){
-               $r = q("SELECT * from `item`,`contact` WHERE 
+       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 (activity_match($item['verb'],ACTIVITY_TAG)) {
+               $r = q("SELECT * from `item`,`contact` WHERE
                `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
                 dbesc($item['parent-uri']));
                if(count($r)==0) return;
                $obj=$r[0];
-               
-               $author  = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
+
+               $author  = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
                $objauthor =  '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
-               
+
                switch($obj['verb']){
                        case ACTIVITY_POST:
                                switch ($obj['object-type']){
@@ -228,30 +251,30 @@ function localize_item(&$item){
                        default:
                                if($obj['resource-id']){
                                        $post_type = t('photo');
-                                       $m=array();     preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+                                       $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
                                        $rr['plink'] = $m[1];
                                } else {
                                        $post_type = t('status');
                                }
                }
                $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-               
+
                $parsedobj = parse_xml_string($xmlhead.$item['object']);
-               
+
                $tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
                $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
-               
+
        }
-       if ($item['verb']=== ACTIVITY_FAVORITE){
+       if (activity_match($item['verb'],ACTIVITY_FAVORITE)){
 
                if ($item['object-type']== "")
                        return;
 
                $Aname = $item['author-name'];
                $Alink = $item['author-link'];
-               
+
                $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-               
+
                $obj = parse_xml_string($xmlhead.$item['object']);
                if(strlen($obj->id)) {
                        $r = q("select * from item where uri = '%s' and uid = %d limit 1",
@@ -279,10 +302,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
@@ -293,7 +316,7 @@ function localize_item(&$item){
                $y = best_link_url($item,$sparkle,true);
                if(strstr($y,'/redir/'))
                        $item['plink'] = $y . '?f=&url=' . $item['plink'];
-       } 
+       }
 
 
 
@@ -307,6 +330,8 @@ function count_descendants($item) {
 
        if($total > 0) {
                foreach($item['children'] as $child) {
+                       if(! visible_activity($child))
+                               $total --;
                        $total += count_descendants($child);
                }
        }
@@ -314,326 +339,28 @@ function count_descendants($item) {
        return $total;
 }
 
-/**
- * Recursively prepare a thread for HTML
- */
+function visible_activity($item) {
 
-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));
+       if(activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE))
+               return false;
 
-               $tags=array();
-               foreach(explode(',',$item['tag']) as $tag){
-                       $tag = trim($tag);
-                       if ($tag!="") $tags[] = bbcode($tag);
+       if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
+               if(! (($item['self']) && ($item['uid'] == local_user()))) {
+                       return false;
                }
-               
-               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;
+       return true;
 }
 
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
  *      - Sequential or unthreaded ("New Item View" or search results)
  *      - conversation view
  * The $mode parameter decides between the various renderings and also
- * figures out how to determine page owner and other contextual items 
+ * figures out how to determine page owner and other contextual items
  * that are based on unique features of the calling module.
  *
  */
@@ -676,6 +403,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
@@ -689,28 +419,26 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $items = $cb['items'];
 
        $cmnt_tpl    = get_markup_template('comment_item.tpl');
-       $tpl         = 'wall_item.tpl';
-       $wallwall    = 'wallwall_item.tpl';
        $hide_comments_tpl = get_markup_template('hide_comments.tpl');
 
        $alike = array();
        $dlike = array();
-       
-       
+
+
        // 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') {
 
-                       // "New Item View" on network page or search page results 
+                       // "New Item View" on network page or search page results
                        // - just loop through the items and format them minimally for display
 
-                       //$tpl = get_markup_template('search_item.tpl');
+//                     $tpl = get_markup_template('search_item.tpl');
                        $tpl = 'search_item.tpl';
 
                        foreach($items as $item) {
@@ -723,24 +451,39 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $sparkle     = '';
 
                                if($mode === 'search' || $mode === 'community') {
-                                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+                                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
                                                && ($item['id'] != $item['parent']))
                                                continue;
                                        $nickname = $item['nickname'];
                                }
                                else
                                        $nickname = $a->user['nickname'];
-                               
+
                                // prevent private email from leaking.
                                if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
                                                continue;
-                       
+
                                $profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
                                if($item['author-link'] && (! $item['author-name']))
                                        $profile_name = $item['author-link'];
 
 
 
+                               $tags=array();
+                               $hashtags = array();
+                               $mentions = array();
+                               foreach(explode(',',$item['tag']) as $tag){
+                                       $tag = trim($tag);
+                                       if ($tag!="") {
+                                               $t = bbcode($tag);
+                                               $tags[] = $t;
+                                               if($t[0] == '#')
+                                                       $hashtags[] = $t;
+                                               elseif($t[0] == '@')
+                                                       $mentions[] = $t;
+                                       }
+                               }
+
                                $sp = false;
                                $profile_link = best_link_url($item,$sp);
                                if($profile_link === 'mailbox')
@@ -748,7 +491,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                if($sp)
                                        $sparkle = ' sparkle';
                                else
-                                       $profile_link = zrl($profile_link);                                     
+                                       $profile_link = zrl($profile_link);
 
                                $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
                                if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
@@ -770,20 +513,23 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
                                $drop = array(
                                        'dropping' => $dropping,
-                                       'select' => t('Select'), 
+                                       'pagedrop' => $page_dropping,
+                                       'select' => t('Select'),
                                        'delete' => t('Delete'),
                                );
 
                                $star = false;
                                $isstarred = "unstarred";
-                               
+
                                $lock = false;
                                $likebuttons = false;
                                $shareable = false;
 
                                $body = prepare_body($item,true);
-                               
-                               //$tmp_item = replace_macros($tpl,array(
+
+
+                               list($categories, $folders) = get_cats_and_terms($item);
+
                                $tmp_item = array(
                                        'template' => $tpl,
                                        'id' => (($preview) ? 'P0' : $item['item_id']),
@@ -796,7 +542,17 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'thumb' => $profile_avatar,
                                        'title' => template_escape($item['title']),
                                        'body' => template_escape($body),
+                                       'tags' => template_escape($tags),
+                                       'hashtags' => template_escape($hashtags),
+                                       'mentions' => template_escape($mentions),
+                                       'txt_cats' => t('Categories:'),
+                                       'txt_folders' => t('Filed under:'),
+                                       'has_cats' => ((count($categories)) ? 'true' : ''),
+                                       'has_folders' => ((count($folders)) ? 'true' : ''),
+                                       'categories' => $categories,
+                                       'folders' => $folders,
                                        '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' => '',
@@ -815,6 +571,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);
@@ -831,27 +588,53 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        // Normal View
                        $page_template = get_markup_template("threaded_conversation.tpl");
 
+                       require_once('object/Conversation.php');
+                       require_once('object/Item.php');
+
+                       $conv = new Conversation($mode, $preview);
+
                        // get all the topmost parents
-                       // this shouldn't be needed, as we should have only them in ou array
+                       // this shouldn't be needed, as we should have only them in our array
                        // But for now, this array respects the old style, just in case
 
                        $threads = array();
                        foreach($items as $item) {
+
+                               // Can we put this after the visibility check?
+                               like_puller($a,$item,$alike,'like');
+                               like_puller($a,$item,$dlike,'dislike');
+
+                               // Only add what is visible
+                               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                                       continue;
+                               }
+                               if(! visible_activity($item)) {
+                                       continue;
+                               }
+
+                               $item['pagedrop'] = $page_dropping;
+
                                if($item['id'] == $item['parent']) {
-                                       $threads[] = $item;
+                                       $item_object = new Item($item);
+                                       $conv->add_thread($item_object);
                                }
                        }
 
-                       $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
+                       $threads = $conv->get_template_data($alike, $dlike);
+                       if(!$threads) {
+                               logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
+                               $threads = array();
+                       }
                }
        }
-               
+
        $o = replace_macros($page_template, array(
                '$baseurl' => $a->get_baseurl($ssl_state),
+        '$remove' => t('remove'),
                '$mode' => $mode,
                '$user' => $a->user,
                '$threads' => $threads,
-               '$dropping' => ($dropping?t('Delete Selected Items'):False),
+               '$dropping' => ($page_dropping?t('Delete Selected Items'):False),
        ));
 
        return $o;
@@ -898,6 +681,7 @@ function item_photo_menu($item){
                 if(! count($a->contacts))
                        load_contact_links(local_user());
        }
+       $sub_link="";
        $poke_link="";
        $contact_url="";
        $pm_url="";
@@ -905,8 +689,12 @@ function item_photo_menu($item){
        $photos_link="";
        $posts_link="";
 
+       if((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) {
+               $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
+       }
+
        $sparkle = false;
-    $profile_link = best_link_url($item,$sparkle,$ssl_state);
+       $profile_link = best_link_url($item,$sparkle,$ssl_state);
        if($profile_link === 'mailbox')
                $profile_link = '';
 
@@ -922,7 +710,7 @@ function item_photo_menu($item){
                $profile_link = zrl($profile_link);
                if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
                        $cid = $item['contact-id'];
-               }               
+               }
                else {
                        $cid = 0;
                }
@@ -945,25 +733,30 @@ function item_photo_menu($item){
        }
 
        $menu = Array(
+               t("Follow Thread") => $sub_link,
                t("View Status") => $status_link,
                t("View Profile") => $profile_link,
                t("View Photos") => $photos_link,
-               t("Network Posts") => $posts_link, 
+               t("Network Posts") => $posts_link,
                t("Edit Contact") => $contact_url,
                t("Send PM") => $pm_url,
                t("Poke") => $poke_link
        );
-       
-       
+
+
        $args = array('item' => $item, 'menu' => $menu);
-       
+
        call_hooks('item_photo_menu', $args);
 
-       $menu = $args['menu'];  
+       $menu = $args['menu'];
 
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
+               if(strpos($v,'javascript:') === 0) {
+                       $v = substr($v,11);
+                       $o .= "<li><a href=\"#\" onclick=\"$v\">$k</a></li>\n";
+               }
+               elseif ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
        }
        return $o;
 }}
@@ -991,7 +784,7 @@ function like_puller($a,$item,&$arr,$mode) {
                        $arr[$item['thr-parent'] . '-l'] = array();
                if(! isset($arr[$item['thr-parent']]))
                        $arr[$item['thr-parent']] = 1;
-               else    
+               else
                        $arr[$item['thr-parent']] ++;
                $arr[$item['thr-parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
        }
@@ -1012,10 +805,10 @@ function format_like($cnt,$arr,$type,$id) {
                $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
        else {
                $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
-               $o .= (($type === 'like') ? 
+               $o .= (($type === 'like') ?
                                        sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
-                                        : 
-                                       sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
+                                        :
+                                       sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) );
                $o .= EOL ;
                $total = count($arr);
                if($total >= MAX_LIKERS)
@@ -1035,7 +828,7 @@ function format_like($cnt,$arr,$type,$id) {
 function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
        $o = '';
-               
+
        $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
        $plaintext = false;
@@ -1077,7 +870,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 
        $tpl = get_markup_template("jot.tpl");
-               
+
        $jotplugins = '';
        $jotnets = '';
 
@@ -1108,7 +901,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
        if($notes_cid)
                $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
 
-       $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
+       $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
 
        $o .= replace_macros($tpl,array(
                '$return_path' => $a->query_string,
@@ -1152,12 +945,13 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                '$profile_uid' => $x['profile_uid'],
                '$preview' => t('Preview'),
                '$sourceapp' => t($a->sourcename),
+               '$cancel' => t('Cancel')
        ));
 
 
        if ($popup==true){
                $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
-               
+
        }
 
        return $o;
@@ -1173,7 +967,7 @@ function get_item_children($arr, $parent) {
                                $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;
@@ -1224,7 +1018,7 @@ function conv_sort($arr,$order) {
                usort($parents,'sort_thr_commented');
 
        if(count($parents))
-               foreach($parents as $i=>$_x) 
+               foreach($parents as $i=>$_x)
                        $parents[$i]['children'] = get_item_children($arr, $_x);
 
        /*foreach($arr as $x) {
@@ -1242,7 +1036,7 @@ function conv_sort($arr,$order) {
                                usort($y,'sort_thr_created_rev');
                                $parents[$k]['children'] = $y;*/
                        }
-               }       
+               }
        }
 
        $ret = array();