]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
stuff
[friendica.git] / include / conversation.php
index 0d3123831e14e53accabdf8e69ecde22a5729330..29fa779024825373cd548887274da7f189ea7326 100644 (file)
@@ -5,8 +5,7 @@
  */
 function localize_item(&$item){
        
-       if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
-               $item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
+       if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
 
                $r = q("SELECT * from `item`,`contact` WHERE 
                                `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -17,23 +16,42 @@ function localize_item(&$item){
                $author  = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
                $objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
                
-               $post_type = (($obj['resource-id']) ? t('photo') : t('status'));                
+               switch($obj['verb']){
+                       case ACTIVITY_POST:
+                               switch ($obj['object-type']){
+                                       case ACTIVITY_OBJ_EVENT:
+                                               $post_type = t('event');
+                                               break;
+                                       default:
+                                               $post_type = t('status');
+                               }
+                               break;
+                       default:
+                               if($obj['resource-id']){
+                                       $post_type = t('photo');
+                                       $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 "http://activitystrea.ms/schema/1.0/like":
+                       case ACTIVITY_LIKE :
                                $bodyverb = t('%1$s likes %2$s\'s %3$s');
                                break;
-                       case "http://activitystrea.ms/schema/1.0/dislike":
+                       case ACTIVITY_DISLIKE:
                                $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
                                break;
                }
                $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
                        
        }
-       if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
+       if ($item['verb']=== ACTIVITY_FRIEND){
 
-               if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+               if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
 
                $Aname = $item['author-name'];
                $Alink = $item['author-link'];
@@ -62,6 +80,7 @@ function localize_item(&$item){
 
        }
         
+
 }
 
 /**
@@ -92,7 +111,7 @@ function conversation(&$a, $items, $mode, $update) {
        }
 
        if($mode === 'notes') {
-               $profile_owner = $a->profile['profile_uid'];
+               $profile_owner = local_user();
                $page_writeable = true;
        }
 
@@ -101,6 +120,11 @@ function conversation(&$a, $items, $mode, $update) {
                $page_writeable = can_write_wall($a,$profile_owner);
        }
 
+       if($mode === 'community') {
+               $profile_owner = 0;
+               $page_writeable = false;
+       }
+
        if($update)
                $return_url = $_SESSION['return_url'];
        else
@@ -110,19 +134,20 @@ function conversation(&$a, $items, $mode, $update) {
 
 
        $cmnt_tpl    = get_markup_template('comment_item.tpl');
-       $like_tpl    = get_markup_template('like.tpl');
-       $noshare_tpl = get_markup_template('like_noshare.tpl');
        $tpl         = get_markup_template('wall_item.tpl');
        $wallwall    = get_markup_template('wallwall_item.tpl');
-       $droptpl     = get_markup_template('wall_item_drop.tpl');
-       $fakedrop    = get_markup_template('wall_fake_drop.tpl');
 
        $alike = array();
        $dlike = array();
        
+       
+       // array with html for each thread (parent+comments)
+       $threads = array();
+       $threadsid = -1;
+       
        if(count($items)) {
 
-               if($mode === 'network-new' || $mode === 'search') {
+               if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 
                        // "New Item View" on network page or search page results 
                        // - just loop through the items and format them minimally for display
@@ -130,6 +155,7 @@ function conversation(&$a, $items, $mode, $update) {
                        $tpl = get_markup_template('search_item.tpl');
 
                        foreach($items as $item) {
+                               $threadsid++;
 
                                $comment     = '';
                                $owner_url   = '';
@@ -137,7 +163,7 @@ function conversation(&$a, $items, $mode, $update) {
                                $owner_name  = '';
                                $sparkle     = '';
 
-                               if($mode === 'search') {
+                               if($mode === 'search' || $mode === 'community') {
                                        if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
                                                && ($item['id'] != $item['parent']))
                                                continue;
@@ -171,362 +197,392 @@ function conversation(&$a, $items, $mode, $update) {
                                                $location = '<span class="smalltext">' . $coord . '</span>';
                                }
 
-                               $drop = '';
 
                                localize_item($item);
+                               if($mode === 'network-new')
+                                       $dropping = true;
+                               else
+                                       $dropping = false;
 
-                               $drop = replace_macros($droptpl,array('$id' => $item['id']));
-                               $lock = '<div class="wall-item-lock"></div>';
+
+                               $drop = array(
+                                       'dropping' => $dropping,
+                                       'select' => t('Select'), 
+                                       'delete' => t('Delete'),
+                               );
+
+                               $star = false;
+                               $isstarred = "unstarred";
+                               
+                               $lock = false;
+                               $likebuttons = false;
+                               $shareable = false;
 
                                $body = prepare_body($item,true);
                                
-                               $o .= replace_macros($tpl,array(
+                               $tmp_item = replace_macros($tpl,array(
                                        '$id' => $item['item_id'],
-                                       '$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
+                                       '$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
                                        '$profile_url' => $profile_link,
                                        '$item_photo_menu' => item_photo_menu($item),
-                                       '$name' => $profile_name,
+                                       '$name' => template_escape($profile_name),
                                        '$sparkle' => $sparkle,
                                        '$lock' => $lock,
                                        '$thumb' => $profile_avatar,
-                                       '$title' => $item['title'],
-                                       '$body' => $body,
-                                       '$ago' => relative_date($item['created']),
-                                       '$location' => $location,
+                                       '$title' => template_escape($item['title']),
+                                       '$body' => template_escape($body),
+                                       '$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' => '',
+                                       '$owner_name' => template_escape($owner_name),
                                        '$owner_url' => $owner_url,
                                        '$owner_photo' => $owner_photo,
-                                       '$owner_name' => $owner_name,
+                                       '$plink' => get_plink($item),
+                                       '$edpost' => false,
+                                       '$isstarred' => $isstarred,
+                                       '$star' => $star,
                                        '$drop' => $drop,
-                                       '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+                                       '$vote' => $likebuttons,
+                                       '$like' => '',
+                                       '$dislike' => '',
+                                       '$comment' => '',
+                                       '$conv' => array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context')),
+                                       '$wait' => t('Please wait'),
                                ));
 
-                       }
-
-                       return $o;
-               }
+                               $arr = array('item' => $item, 'output' => $tmp_item);
+                               call_hooks('display_item', $arr);
 
+                               $threads[$threadsid] .= $arr['output'];
 
-
-
-               // Normal View
-
-
-               // Figure out how many comments each parent has
-               // (Comments all have gravity of 6)
-               // Store the result in the $comments array
-
-               $comments = array();
-               foreach($items as $item) {
-                       if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
-                               if(! x($comments,$item['parent']))
-                                       $comments[$item['parent']] = 1;
-                               else
-                                       $comments[$item['parent']] += 1;
                        }
+
                }
+               else
+               {
+                       // Normal View
 
-               // 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');
-               }
+                       // Figure out how many comments each parent has
+                       // (Comments all have gravity of 6)
+                       // Store the result in the $comments array
 
-               $comments_collapsed = false;
-               $blowhard = 0;
-               $blowhard_count = 0;
+                       $comments = array();
+                       foreach($items as $item) {
+                               if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
+                                       if(! x($comments,$item['parent']))
+                                               $comments[$item['parent']] = 1;
+                                       else
+                                               $comments[$item['parent']] += 1;
+                               }
+                       }
 
-               foreach($items as $item) {
+                       // map all the like/dislike activities for each parent item 
+                       // Store these in the $alike and $dlike arrays
 
-                       $comment = '';
-                       $template = $tpl;
-                       $commentww = '';
-                       $sparkle = '';
-                       $owner_url = $owner_photo = $owner_name = '';
+                       foreach($items as $item) {
+                               like_puller($a,$item,$alike,'like');
+                               like_puller($a,$item,$dlike,'dislike');
+                       }
 
-                       // We've already parsed out like/dislike for special treatment. We can ignore them now
+                       $comments_collapsed = false;
+                       $blowhard = 0;
+                       $blowhard_count = 0;
 
-                       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);
+                       foreach($items as $item) {
 
+                               $comment = '';
+                               $template = $tpl;
+                               $commentww = '';
+                               $sparkle = '';
+                               $owner_url = $owner_photo = $owner_name = '';
 
-                       // Take care of author collapsing and comment collapsing
-                       // 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.
+                               // We've already parsed out like/dislike for special treatment. We can ignore them now
 
-                       if($toplevelpost) {
+                               if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
+                                       || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+                                       && ($item['id'] != $item['parent']))
+                                       continue;
 
-                               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+                               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+                               $toplevelprivate = false;
 
-                               if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
-                                       $blowhard_count ++;
-                                       if($blowhard_count == 3) {
-                                               $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-                                                       . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
-                                                       . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
-                                                       . $item['parent'] . '" style="display: none;" >';
+                               // Take care of author collapsing and comment collapsing
+                               // 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) {
+                                       $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
+                                       $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+                                       /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+                                               $blowhard_count ++;
+                                               if($blowhard_count == 3) {
+                                                       $o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
+                                                               . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
+                                                               . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
+                                                               . $item['parent'] . '" style="display: none;" >';
+                                               }
                                        }
+                                       else {
+                                               $blowhard = $item['cid'];                                       
+                                               if($blowhard_count >= 3)
+                                                       $o .= '</div>';
+                                               $blowhard_count = 0;
+                                       }*/
+
+                                       $comments_seen = 0;
+                                       $comments_collapsed = false;
+                                       
+                                       $threadsid++;
+                                       $threads[$threadsid] = "";
                                }
                                else {
-                                       $blowhard = $item['cid'];                                       
-                                       if($blowhard_count >= 3)
-                                               $o .= '</div>';
-                                       $blowhard_count = 0;
+                                       // prevent private email from leaking into public conversation
+                                       if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+                                               continue;
+                                       $comments_seen ++;
+                               }       
+
+                               $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] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
+                                                       . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
+                                                       . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
+                                                       . '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+                                               $comments_collapsed = true;
+                                       }
                                }
-
-                               $comments_seen = 0;
-                               $comments_collapsed = false;
-                       }
-                       else
-                               $comments_seen ++;
-
-
-                       $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) {
-                                       $o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-                                               . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
-                                               . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
-                                               . '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
-                                       $comments_collapsed = true;
+                               if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+                                       $threads[$threadsid] .= '</div>';
                                }
-                       }
-                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-                               $o .= '</div>';
-                       }
 
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+                               $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-                       $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-                               || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-                               ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-                               : '<div class="wall-item-lock"></div>');
+                               $lock = ((($item['private']) || (($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. 
+                               // Top-level wall post not written by the wall owner (wall-to-wall)
+                               // First figure out who owns it. 
 
-                       $osparkle = '';
+                               $osparkle = '';
 
-                       if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
+                               if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
 
-                               if($item['type'] === 'wall') {
+                                       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 on the left of the wall-to-wall notice.
+                                               // 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 on the left of the wall-to-wall notice.
 
-                                       $owner_url = $a->page_contact['url'];
-                                       $owner_photo = $a->page_contact['thumb'];
-                                       $owner_name = $a->page_contact['name'];
-                                       $template = $wallwall;
-                                       $commentww = 'ww';      
-                               }
-                               if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-
-                                       // Could be anybody. 
-
-                                       $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'] === 'dfrn')) {
-                                               $owner_url = $redirect_url;
-                                               $osparkle = ' sparkle';
+                                               $owner_url = $a->page_contact['url'];
+                                               $owner_photo = $a->page_contact['thumb'];
+                                               $owner_name = $a->page_contact['name'];
+                                               $template = $wallwall;
+                                               $commentww = 'ww';      
+                                       }
+                                       if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+
+                                               // Could be anybody. 
+
+                                               $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'] === 'dfrn')) {
+                                                       $owner_url = $redirect_url;
+                                                       $osparkle = ' sparkle';
+                                               }
                                        }
                                }
-                       }
 
+                               $likebuttons = '';
+                               $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
 
-                       $likebuttons = '';
+                               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'));
+                                       }
 
-                       if($page_writeable) {
-                               if($toplevelpost) {
-                                       $likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
-                                               '$id' => $item['id'],
-                                               '$likethis' => t("I like this \x28toggle\x29"),
-                                               '$nolike' => t("I don't like this \x28toggle\x29"),
-                                               '$share' => t('Share'),
-                                               '$wait' => t('Please wait') 
-                                       ));
+                                       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'],
+                                                       '$profile_uid' =>  $profile_owner,
+                                                       '$mylink' => $a->contact['url'],
+                                                       '$mytitle' => t('This is you'),
+                                                       '$myphoto' => $a->contact['thumb'],
+                                                       '$comment' => t('Comment'),
+                                                       '$submit' => t('Submit'),
+                                                       '$ww' => (($mode === 'network') ? $commentww : '')
+                                               ));
+                                       }
                                }
 
-                               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'],
-                                               '$profile_uid' =>  $profile_owner,
-                                               '$mylink' => $a->contact['url'],
-                                               '$mytitle' => t('This is you'),
-                                               '$myphoto' => $a->contact['thumb'],
-                                               '$comment' => t('Comment'),
-                                               '$submit' => t('Submit'),
-                                               '$ww' => (($mode === 'network') ? $commentww : '')
-                                       ));
-                               }
-                       }
+                               $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
+                                               ? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
+                                               : False);
 
-                       $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-                                       ? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
-                                               . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
-                                       : '');
 
+                               $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;
+                               $isstarred = "unstarred";
+                               if ($profile_owner == local_user() && $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'),
+                                       );
+                               }
 
-                       $drop = '';
-                       $dropping = false;
 
-                       if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                               $dropping = true;
 
-            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
+                               $photo = $item['photo'];
+                               $thumb = $item['thumb'];
 
+                               // Post was remotely authored.
 
-                       $photo = $item['photo'];
-                       $thumb = $item['thumb'];
+                               $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
-                       // Post was remotely authored.
+                               $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 
-                       $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+                               $sp = false;
+                               $profile_link = best_link_url($item,$sp);
+                               if($sp)
+                                       $sparkle = ' sparkle';
 
-                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+                               if($profile_link === 'mailbox')
+                                       $profile_link = '';
 
-                       $sp = false;
-                       $profile_link = best_link_url($item,$sp);
-                       if($sp)
-                               $sparkle = ' sparkle';
+                               $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'] : $thumb);
 
-                       if($profile_link === 'mailbox')
-                               $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'] : $thumb);
 
 
 
+                               $like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+                               $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
+                               $location = (($item['location']) ? '<a target="map" title="' . $item['location'] 
+                                       . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+                               $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] 
+                                       . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+                               if($coord) {
+                                       if($location)
+                                               $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+                                       else
+                                               $location = '<span class="smalltext">' . $coord . '</span>';
+                               }
 
-                       $like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-                       $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+                               $indent = (($toplevelpost) ? '' : ' comment');
 
-                       $location = (($item['location']) ? '<a target="map" title="' . $item['location'] 
-                               . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-                       $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] 
-                               . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-                       if($coord) {
-                               if($location)
-                                       $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-                               else
-                                       $location = '<span class="smalltext">' . $coord . '</span>';
-                       }
+                               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+                                       $indent .= ' shiny'; 
 
-                       $indent = (($toplevelpost) ? '' : ' comment');
-
-                       if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                               $indent .= ' shiny'; 
-
-                       // 
-                       localize_item($item);
-
-                       // Build the HTML
-
-                       $body = prepare_body($item,true);
-
-
-                       $tmp_item = replace_macros($template,array(
-                               '$id' => $item['item_id'],
-                               '$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
-                               '$olinktitle' => sprintf( t('View %s\'s profile'), $owner_name),
-                               '$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' => $profile_name,
-                               '$thumb' => $profile_avatar,
-                               '$osparkle' => $osparkle,
-                               '$sparkle' => $sparkle,
-                               '$title' => $item['title'],
-                               '$body' => $body,
-                               '$ago' => relative_date($item['created']),
-                               '$lock' => $lock,
-                               '$location' => $location,
-                               '$indent' => $indent,
-                               '$owner_url' => $owner_url,
-                               '$owner_photo' => $owner_photo,
-                               '$owner_name' => $owner_name,
-                               '$plink' => get_plink($item),
-                               '$edpost' => $edpost,
-                               '$drop' => $drop,
-                               '$vote' => $likebuttons,
-                               '$like' => $like,
-                               '$dislike' => $dislike,
-                               '$comment' => $comment
-                       ));
-
-
-                       $arr = array('item' => $item, 'output' => $tmp_item);
-                       call_hooks('display_item', $arr);
-
-                       $o .= $arr['output'];
+                               // 
+                               localize_item($item);
 
-               }
-       }
+                               // Build the HTML
 
+                               $body = prepare_body($item,true);
 
-       // if author collapsing is in force but didn't get closed, close it off now.
 
-       if($blowhard_count >= 3)
-               $o .= '</div>';
+                               $tmp_item = replace_macros($template,array(
+                                       '$body' => 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,
+                                       '$drop' => $drop,
+                                       '$vote' => $likebuttons,
+                                       '$like' => $like,
+                                       '$dislike' => $dislike,
+                                       '$comment' => $comment,
+                                       '$wait' => t('Please wait'),
 
-       if($dropping)
-               $o .= '<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"><div id="item-delete-selected-icon" class="icon drophide" title="' . t('Delete Selected Items') . '" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div><div id="item-delete-selected-desc" >' .  t('Delete Selected Items') . '</div></div><div id="item-delete-selected-end"></div>';
+                               ));
 
-       return $o;
-} 
 
+                               $arr = array('item' => $item, 'output' => $tmp_item);
+                               call_hooks('display_item', $arr);
 
-if(! function_exists('load_contact_links')) {
-function load_contact_links($uid) {
+                               $threads[$threadsid] .= $arr['output'];
+                       }
+               }
+       }
 
-       $a = get_app();
 
-       $ret = array();
+       // if author collapsing is in force but didn't get closed, close it off now.
 
-       if(! $uid || x($a->contacts,'empty'))
-               return;
+       /*if($blowhard_count >= 3)
+               $threads[$threadsid] .= '</div>';*/
 
-       $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
-                       intval($uid)
-       );
-       if(count($r)) {
-               foreach($r as $rr){
-                       $url = normalise_link($rr['url']);
-                       $ret[$url] = $rr;
-               }
-       }
-       else 
-               $ret['empty'] = true;   
-       $a->contacts = $ret;
-       return;         
-}}
+       $page_template = get_markup_template("conversation.tpl");
+       $o .= replace_macros($page_template, array(
+               '$threads' => $threads,
+               '$dropping' => ($dropping?t('Delete Selected Items'):False),
+       ));
 
+       return $o;
+} 
 
 function best_link_url($item,&$sparkle) {
 
@@ -689,9 +745,8 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$nickname' => $x['nickname'],
                        '$ispublic' => t('Visible to <strong>everybody</strong>'),
                        '$linkurl' => t('Please enter a link URL:'),
-                       '$utubeurl' => t('Please enter a YouTube link:'),
-                       '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
-                       '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+                       '$vidurl' => t("Please enter a video link/URL:"),
+                       '$audurl' => t("Please enter an audio link/URL:"),
                        '$whereareu' => t('Where are you right now?'),
                        '$title' => t('Enter a title for this item') 
                ));
@@ -720,7 +775,7 @@ function status_editor($a,$x, $notes_cid = 0) {
 
                if($mail_enabled) {
               $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
                . t("Post to Email") . '</div>';
                }
 
@@ -739,9 +794,8 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$upload' => t('Upload photo'),
                        '$attach' => t('Attach file'),
                        '$weblink' => t('Insert web link'),
-                       '$youtube' => t('Insert YouTube video'),
-                       '$video' => t('Insert Vorbis [.ogg] video'),
-                       '$audio' => t('Insert Vorbis [.ogg] audio'),
+                       '$video' => t('Insert video link'),
+                       '$audio' => t('Insert audio link'),
                        '$setloc' => t('Set your location'),
                        '$noloc' => t('Clear browser location'),
                        '$title' => t('Set title'),
@@ -765,4 +819,4 @@ function status_editor($a,$x, $notes_cid = 0) {
                ));
 
        return $o;
-}
\ No newline at end of file
+}