]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
bug #147 comments not working on private notes page
[friendica.git] / include / conversation.php
index 5c8327e56e0b7fe1d778c076ea3cf9b54bd7ec84..6aad2485a7ab505d4ead881af73ea14e2b0295cd 100644 (file)
@@ -1,5 +1,88 @@
 <?php
 
+/**
+ * Render actions localized
+ */
+function localize_item(&$item){
+       
+       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';",
+                                dbesc($item['parent-uri']));
+               if(count($r)==0) return;
+               $obj=$r[0];
+               
+               $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']){
+                                       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 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;
+               }
+               $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
+                       
+       }
+       if ($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){
+                       $atts = $l->attributes();
+                       switch($atts['rel']){
+                               case "alternate": $Blink = $atts['href'];
+                               case "photo": $Bphoto = $atts['href'];
+                       }
+                       
+               }
+               
+               $A = '[url=' . $Alink . ']' . $Aname . '[/url]';
+               $B = '[url=' . $Blink . ']' . $Bname . '[/url]';
+               if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+
+               $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
+
+       }
+        
+
+}
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
@@ -10,7 +93,6 @@
  * that are based on unique features of the calling module.
  *
  */
-
 function conversation(&$a, $items, $mode, $update) {
 
        require_once('bbcode.php');
@@ -28,42 +110,48 @@ function conversation(&$a, $items, $mode, $update) {
                $page_writeable = can_write_wall($a,$profile_owner);
        }
 
+       if($mode === 'notes') {
+               $profile_owner = local_user();
+               $page_writeable = true;
+       }
+
        if($mode === 'display') {
                $profile_owner = $a->profile['uid'];
                $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
                $return_url = $_SESSION['return_url'] = $a->cmd;
 
-
-       // find all the authors involved in remote conversations
-       // We will use a local profile photo if they are one of our contacts
-       // otherwise we have to get the photo from the item owner's site
-
-       $author_contacts = extract_item_authors($items,local_user());
+       load_contact_links(local_user());
 
 
-       $cmnt_tpl    = load_view_file('view/comment_item.tpl');
-       $like_tpl    = load_view_file('view/like.tpl');
-       $noshare_tpl = load_view_file('view/like_noshare.tpl');
-       $tpl         = load_view_file('view/wall_item.tpl');
-       $wallwall    = load_view_file('view/wallwall_item.tpl');
+       $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();
        
        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
 
-                       $tpl = load_view_file('view/search_item.tpl');
-                       $droptpl = load_view_file('view/wall_fake_drop.tpl');
+                       $tpl = get_markup_template('search_item.tpl');
 
                        foreach($items as $item) {
 
@@ -73,7 +161,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;
@@ -83,21 +171,20 @@ function conversation(&$a, $items, $mode, $update) {
                                        $nickname = $a->user['nickname'];
                        
                                $profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-                               $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-                               $profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
 
-                               $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+                               $sp = false;
+                               $profile_link = best_link_url($item,$sp);
+                               if($sp)
+                                       $sparkle = ' sparkle';
+                               if($profile_link === 'mailbox')
+                                       $profile_link = '';
 
-                               if(strlen($item['author-link'])) {
-                                       if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-                                               $profile_link = $redirect_url;
-                                               $sparkle = ' sparkle';
-                                       }
-                                       elseif(isset($author_contacts[$item['author-link']])) {
-                                               $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-                                               $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'])) ? $item['author-avatar'] : $item['thumb']);
 
                                $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>' : '');
@@ -109,17 +196,18 @@ function conversation(&$a, $items, $mode, $update) {
                                }
 
                                $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')));
-
 
+                               localize_item($item);
+                               if($mode === 'network-new')
+                                       $t = $droptpl;
+                               else
+                                       $t = $fakedrop;
 
-                               $drop = replace_macros($droptpl,array('$id' => $item['id']));
+                               $drop = replace_macros($t,array('$id' => $item['id']));
                                $lock = '<div class="wall-item-lock"></div>';
+                               $star = '';
+
+                               $body = prepare_body($item,true);
                                
                                $o .= replace_macros($tpl,array(
                                        '$id' => $item['item_id'],
@@ -131,13 +219,14 @@ function conversation(&$a, $items, $mode, $update) {
                                        '$lock' => $lock,
                                        '$thumb' => $profile_avatar,
                                        '$title' => $item['title'],
-                                       '$body' => smilies(bbcode($item['body'])),
-                                       '$ago' => relative_date($item['created']),
+                                       '$body' => $body,
+                                       '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                                        '$location' => $location,
                                        '$indent' => '',
                                        '$owner_url' => $owner_url,
                                        '$owner_photo' => $owner_photo,
                                        '$owner_name' => $owner_name,
+                                       '$star' => $star,
                                        '$drop' => $drop,
                                        '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
                                ));
@@ -159,7 +248,7 @@ function conversation(&$a, $items, $mode, $update) {
 
                $comments = array();
                foreach($items as $item) {
-                       if(intval($item['gravity']) == 6) {
+                       if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
                                if(! x($comments,$item['parent']))
                                        $comments[$item['parent']] = 1;
                                else
@@ -195,21 +284,21 @@ function conversation(&$a, $items, $mode, $update) {
                                continue;
 
                        $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
+                       $toplevelprivate = false;
 
                        // 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')) {
+                               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'] . '\');" >' 
+                                                       . '" 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;" >';
                                        }
@@ -224,16 +313,20 @@ function conversation(&$a, $items, $mode, $update) {
                                $comments_seen = 0;
                                $comments_collapsed = false;
                        }
-                       else
+                       else {
+                               // 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) {
                                        $o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-                                               . '" onclick="openClose(' . '\'ccollapse-' . $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;
@@ -258,7 +351,7 @@ function conversation(&$a, $items, $mode, $update) {
 
                        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.
@@ -270,7 +363,7 @@ function conversation(&$a, $items, $mode, $update) {
                                        $template = $wallwall;
                                        $commentww = 'ww';      
                                }
-                               if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+                               if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
 
                                        // Could be anybody. 
 
@@ -288,12 +381,12 @@ function conversation(&$a, $items, $mode, $update) {
                                }
                        }
 
-
                        $likebuttons = '';
+                       $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
 
                        if($page_writeable) {
                                if($toplevelpost) {
-                                       $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+                                       $likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array(
                                                '$id' => $item['id'],
                                                '$likethis' => t("I like this \x28toggle\x29"),
                                                '$nolike' => t("I don't like this \x28toggle\x29"),
@@ -302,7 +395,7 @@ function conversation(&$a, $items, $mode, $update) {
                                        ));
                                }
 
-                               if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
+                               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'] : ''),
@@ -320,11 +413,22 @@ function conversation(&$a, $items, $mode, $update) {
                                }
                        }
 
-                       $edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
-                                       ? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
-                                               . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
+                       $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
+                                       ? '<a class="editpost icon pencil" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
+                                               . '" title="' . t('Edit') . '"></a>'
                                        : '');
-                       $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+                       $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'], '$select' => t('Select'), '$delete' => t('Delete')));
+
+                       $star = (($profile_owner == local_user() && $toplevelpost) ? '<a href="#" id="starred-' . $item['id'] . '" onclick="dostar(' . $item['id'] . '); return false;" class="star-item icon ' . (($item['starred']) ? 'starred' : 'unstarred') . '" title="' . t('toggle star status')  . '"></a>' : '');
+
 
                        $photo = $item['photo'];
                        $thumb = $item['thumb'];
@@ -334,31 +438,24 @@ function conversation(&$a, $items, $mode, $update) {
                        $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
                        $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-                       if($mode === 'profile') {
-                               if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
-                       $profile_link = $redirect_url;
-                   $sparkle = ' sparkle';
-                   }
-                               else {
-                                       $profile_link = $item['url'];
-                                       $sparkle = '';
-                               }
-                       }
-                       elseif(strlen($item['author-link'])) {
-                               $profile_link = $item['author-link'];
-                               if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-                                       $profile_link = $redirect_url;
-                                       $sparkle = ' sparkle';
-                               }
-                               elseif(isset($author_contacts[$item['author-link']])) {
-                                       $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-                                       $sparkle = ' sparkle';
-                               }
-                       }
-                       else 
-                               $profile_link = $item['url'];
+                       $sp = false;
+                       $profile_link = best_link_url($item,$sp);
+                       if($sp)
+                               $sparkle = ' sparkle';
+
+                       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']) : '');
@@ -379,8 +476,14 @@ function conversation(&$a, $items, $mode, $update) {
                        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),
@@ -395,8 +498,8 @@ function conversation(&$a, $items, $mode, $update) {
                                '$osparkle' => $osparkle,
                                '$sparkle' => $sparkle,
                                '$title' => $item['title'],
-                               '$body' => smilies(bbcode($item['body'])),
-                               '$ago' => relative_date($item['created']),
+                               '$body' => $body,
+                               '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                                '$lock' => $lock,
                                '$location' => $location,
                                '$indent' => $indent,
@@ -405,6 +508,7 @@ function conversation(&$a, $items, $mode, $update) {
                                '$owner_name' => $owner_name,
                                '$plink' => get_plink($item),
                                '$edpost' => $edpost,
+                               '$star' => $star,
                                '$drop' => $drop,
                                '$vote' => $likebuttons,
                                '$like' => $like,
@@ -412,6 +516,7 @@ function conversation(&$a, $items, $mode, $update) {
                                '$comment' => $comment
                        ));
 
+
                        $arr = array('item' => $item, 'output' => $tmp_item);
                        call_hooks('display_item', $arr);
 
@@ -426,97 +531,85 @@ function conversation(&$a, $items, $mode, $update) {
        if($blowhard_count >= 3)
                $o .= '</div>';
 
+       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;
 } 
 
+function best_link_url($item,&$sparkle) {
 
+       $a = get_app();
 
+       $best_url = '';
+       $sparkle  = false;
 
-if(! function_exists('extract_item_authors')) {
-function extract_item_authors($arr,$uid) {
+       $clean_url = normalise_link($item['author-link']);
 
-       if((! $uid) || (! is_array($arr)) || (! count($arr)))
-               return array();
-       $urls = array();
-       foreach($arr as $rr) {
-               if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
-                       $urls[] = "'" . dbesc($rr['author-link']) . "'";
-       }
-
-       // pre-quoted, don't put quotes on %s
-       if(count($urls)) {
-               $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
-                       intval($uid),
-                       implode(',',$urls)
-               );
-               if(count($r)) {
-                       $ret = array();
-                       $authors = array();
-                       foreach($r as $rr){
-                               if ($rr['network']=='dfrn')
-                                       $ret[$rr['url']] = $rr['id'];
-                               $authors[$r['url']]= $rr;
+       if((local_user()) && (local_user() == $item['uid'])) {
+               if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+                       if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
+                               $best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
+                               $sparkle = true;
                        }
-                       $a->authors = $authors;
-                       return $ret;
+                       else
+                               $best_url = $a->contacts[$clean_url]['url'];
                }
        }
-       return array();         
-}}
+       if(! $best_url) {
+               if(strlen($item['author-link']))
+                       $best_url = $item['author-link'];
+               else
+                       $best_url = $item['url'];
+       }
+
+       return $best_url;
+}
+
 
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
        $a = get_app();
        
-       if (!isset($a->authors)){
-               $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
-               $authors = array();
-               foreach($rr as $r) $authors[$r['url']]= $r;
-               $a->authors = $authors;
-       }
-       
+       if (local_user() && (! count($a->contacts)))
+               load_contact_links(local_user());
+
        $contact_url="";
        $pm_url="";
-
        $status_link="";
-       $photo_link="";
-       $profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
-       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-       // $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
-       $profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0); 
-
-       // So we are checking that this is a logged in user on some page that *isn't* a profile page
-       // OR a profile page where the viewer owns the profile. 
-       // Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
-       // or a friend's contact that we both have a connection to. 
-
-       if((local_user() && ($profile_owner == 0)) 
-               || ($profile_owner && $profile_owner == local_user())) {
-
-               if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
-                       $redir = $redirect_url;
-               elseif(isset($a->authors[$item['author-link']])) {
-                       $redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
-                       $cid = $a->authors[$item['author-link']]['id'];
-               }
-
-               if($item['network'] === 'dfrn' && (! $item['self'])) {
-                       $status_link = $redir . "?url=status";
-                       $profile_link = $redir . "?url=profile";
-                       $photos_link = $redir . "?url=photos";
-                       $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+       $photos_link="";
+       $posts_link="";
+
+       $sparkle = false;
+    $profile_link = best_link_url($item,$sparkle);
+       if($profile_link === 'mailbox')
+               $profile_link = '';
+
+       if($sparkle) {
+               $cid = intval(basename($profile_link));
+               $status_link = $profile_link . "?url=status";
+               $photos_link = $profile_link . "?url=photos";
+               $profile_link = $profile_link . "?url=profile";
+               $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+       }
+       else {
+               if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
+                       $cid = $item['contact-id'];
+               }               
+               else {
+                       $cid = 0;
                }
-
-               $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
        }
-
+       if(($cid) && (! $item['self'])) {
+               $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+               $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+       }
 
        $menu = Array(
                t("View status") => $status_link,
                t("View profile") => $profile_link,
                t("View photos") => $photos_link,               
+               t("View recent") => $posts_link, 
                t("Edit contact") => $contact_url,
                t("Send PM") => $pm_url,
        );
@@ -589,3 +682,96 @@ function format_like($cnt,$arr,$type,$id) {
        }
        return $o;
 }}
+
+
+function status_editor($a,$x, $notes_cid = 0) {
+
+       $o = '';
+               
+       $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
+
+               $tpl = get_markup_template('jot-header.tpl');
+       
+               $a->page['htmlhead'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$geotag' => $geotag,
+                       '$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:"),
+                       '$whereareu' => t('Where are you right now?'),
+                       '$title' => t('Enter a title for this item') 
+               ));
+
+
+               $tpl = get_markup_template("jot.tpl");
+               
+               $jotplugins = '';
+               $jotnets = '';
+
+               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+               $mail_enabled = false;
+               $pubmail_enabled = false;
+
+               if(($x['is_owner']) && (! $mail_disabled)) {
+                       $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+                               intval(local_user())
+                       );
+                       if(count($r)) {
+                               $mail_enabled = true;
+                               if(intval($r[0]['pubmail']))
+                                       $pubmail_enabled = true;
+                       }
+               }
+
+               if($mail_enabled) {
+              $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+                       $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+               . t("Post to Email") . '</div>';
+               }
+
+               call_hooks('jot_tool', $jotplugins);
+               call_hooks('jot_networks', $jotnets);
+
+               if($notes_cid)
+                       $jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
+
+               $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
+
+               $o .= replace_macros($tpl,array(
+                       '$return_path' => $a->cmd,
+                       '$action' => 'item',
+                       '$share' => (($x['button']) ? $x['button'] : t('Share')),
+                       '$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'),
+                       '$setloc' => t('Set your location'),
+                       '$noloc' => t('Clear browser location'),
+                       '$title' => t('Set title'),
+                       '$wait' => t('Please wait'),
+                       '$permset' => t('Permission settings'),
+                       '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
+                       '$content' => '',
+                       '$post_id' => '',
+                       '$baseurl' => $a->get_baseurl(),
+                       '$defloc' => $x['default_location'],
+                       '$visitor' => $x['visitor'],
+                       '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
+                       '$emailcc' => t('CC: email addresses'),
+                       '$public' => t('Public post'),
+                       '$jotnets' => $jotnets,
+                       '$emtitle' => t('Example: bob@example.com, mary@example.com'),
+                       '$lockstate' => $x['lockstate'],
+                       '$acl' => $x['acl'],
+                       '$bang' => $x['bang'],
+                       '$profile_uid' => $x['profile_uid'],
+               ));
+
+       return $o;
+}