]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
allow users to set categories on their posts
[friendica.git] / include / conversation.php
old mode 100644 (file)
new mode 100755 (executable)
index acbbc9b..df92a40
@@ -4,7 +4,29 @@
  * Render actions localized
  */
 function localize_item(&$item){
-       
+
+       $Text = $item['body'];
+       $saved_image = '';
+       $img_start = strpos($Text,'[img]data:');
+       $img_end = strpos($Text,'[/img]');
+
+       if($img_start !== false && $img_end !== false && $img_end > $img_start) {
+               $start_fragment = substr($Text,0,$img_start);
+               $img_start += strlen('[img]');
+               $saved_image = substr($Text,$img_start,$img_end - $img_start);
+               $end_fragment = substr($Text,$img_end + strlen('[/img]'));              
+               $Text = $start_fragment . '[!#saved_image#!]' . $end_fragment;
+               $search = '/\[url\=(.*?)\]\[!#saved_image#!\]\[\/url\]' . '/is';
+               $replace = '[url=' . z_path() . '/redir/' . $item['contact-id'] 
+                       . '?f=1&url=' . '$1' . '][!#saved_image#!][/url]' ;
+
+               $Text = preg_replace($search,$replace,$Text);
+
+               if(strlen($saved_image))
+                       $item['body'] = str_replace('[!#saved_image#!]', '[img]' . $saved_image . '[/img]',$Text);
+       }
+
+       $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
        if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
 
                $r = q("SELECT * from `item`,`contact` WHERE 
@@ -72,14 +94,85 @@ function localize_item(&$item){
                        
                }
                
-               $A = '[url=' . $Alink . ']' . $Aname . '[/url]';
-               $B = '[url=' . $Blink . ']' . $Bname . '[/url]';
-               if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+               if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
 
                $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
        }
-        
+    if ($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]';
+               $objauthor =  '[url=' . zrl($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]';
+               
+               $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 ($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",
+                                       dbesc($obj->id),
+                                       intval($item['uid'])
+                       );
+                       if(count($r) && $r[0]['plink']) {
+                               $target = $r[0];
+                               $Bname = $target['author-name'];
+                               $Blink = $target['author-link'];
+                               $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+                               $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+                               $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
+                               $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
+
+                       }
+               }
+       }
+       $matches = null;
+       if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
+               foreach($matches as $mtch) {
+                       if(! strpos($mtch[1],'zrl='))
+                               $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
+               }
+       }
 
 }
 
@@ -93,13 +186,20 @@ function localize_item(&$item){
  * that are based on unique features of the calling module.
  *
  */
-function conversation(&$a, $items, $mode, $update) {
+
+if(!function_exists('conversation')) {
+function conversation(&$a, $items, $mode, $update, $preview = false) {
+
 
        require_once('bbcode.php');
 
+       $ssl_state = ((local_user()) ? true : false);
+
        $profile_owner = 0;
        $page_writeable      = false;
 
+       $previewing = (($preview) ? ' preview ' : '');
+
        if($mode === 'network') {
                $profile_owner = local_user();
                $page_writeable = true;
@@ -128,32 +228,40 @@ function conversation(&$a, $items, $mode, $update) {
        if($update)
                $return_url = $_SESSION['return_url'];
        else
-               $return_url = $_SESSION['return_url'] = $a->cmd;
+               $return_url = $_SESSION['return_url'] = $a->query_string;
 
        load_contact_links(local_user());
 
+       $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview);
+       call_hooks('conversation_start',$cb);
+
+       $items = $cb['items'];
 
        $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');
+       $tpl         = 'wall_item.tpl';
+       $wallwall    = 'wallwall_item.tpl';
+       $hide_comments_tpl = get_markup_template('hide_comments.tpl');
 
        $alike = array();
        $dlike = array();
        
-       if(count($items)) {
+       
+       // array with html for each thread (parent+comments)
+       $threads = array();
+       $threadsid = -1;
+       
+       if($items && count($items)) {
 
                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 = get_markup_template('search_item.tpl');
+                       //$tpl = get_markup_template('search_item.tpl');
+                       $tpl = 'search_item.tpl';
 
                        foreach($items as $item) {
+                               $threadsid++;
 
                                $comment     = '';
                                $owner_url   = '';
@@ -169,16 +277,22 @@ function conversation(&$a, $items, $mode, $update) {
                                }
                                else
                                        $nickname = $a->user['nickname'];
+                               
                        
                                $profile_name   = ((strlen($item['author-name']))   ? $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($sp)
-                                       $sparkle = ' sparkle';
                                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])))
@@ -186,386 +300,431 @@ function conversation(&$a, $items, $mode, $update) {
                                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>' : '');
-                               if($coord) {
-                                       if($location)
-                                               $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-                                       else
-                                               $location = '<span class="smalltext">' . $coord . '</span>';
-                               }
+                               $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+                               call_hooks('render_location',$locate);
 
-                               $drop = '';
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
                                localize_item($item);
                                if($mode === 'network-new')
-                                       $t = $droptpl;
+                                       $dropping = true;
                                else
-                                       $t = $fakedrop;
+                                       $dropping = false;
+
+
+                               $drop = array(
+                                       'dropping' => $dropping,
+                                       'select' => t('Select'), 
+                                       'delete' => t('Delete'),
+                               );
 
-                               $drop = replace_macros($t,array('$id' => $item['id']));
-                               $lock = '<div class="wall-item-lock"></div>';
-                               $star = '';
+                               $star = false;
+                               $isstarred = "unstarred";
+                               
+                               $lock = false;
+                               $likebuttons = false;
+                               $shareable = false;
 
                                $body = prepare_body($item,true);
                                
-                               $o .= replace_macros($tpl,array(
-                                       '$id' => $item['item_id'],
-                                       '$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' => template_escape($profile_name),
-                                       '$sparkle' => $sparkle,
-                                       '$lock' => $lock,
-                                       '$thumb' => $profile_avatar,
-                                       '$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'])),
-                                       '$location' => template_escape($location),
-                                       '$indent' => '',
-                                       '$owner_url' => $owner_url,
-                                       '$owner_photo' => $owner_photo,
-                                       '$owner_name' => template_escape($owner_name),
-                                       '$star' => $star,
-                                       '$drop' => $drop,
-                                       '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
-                               ));
+                               //$tmp_item = replace_macros($tpl,array(
+                               $tmp_item = array(
+                                       'template' => $tpl,
+                                       'id' => (($preview) ? 'P0' : $item['item_id']),
+                                       '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' => template_escape($profile_name),
+                                       'sparkle' => $sparkle,
+                                       'lock' => $lock,
+                                       'thumb' => $profile_avatar,
+                                       'title' => template_escape($item['title']),
+                                       'body' => template_escape($body),
+                                       'text' => strip_tags(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,
+                                       'plink' => get_plink($item),
+                                       'edpost' => false,
+                                       'isstarred' => $isstarred,
+                                       'star' => $star,
+                                       'drop' => $drop,
+                                       'vote' => $likebuttons,
+                                       'like' => '',
+                                       'dislike' => '',
+                                       'comment' => '',
+                                       'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+                                       'previewing' => $previewing,
+                                       'wait' => t('Please wait'),
+                               );
+
+                               $arr = array('item' => $item, 'output' => $tmp_item);
+                               call_hooks('display_item', $arr);
+
+                               $threads[$threadsid]['id'] = $item['item_id'];
+                               $threads[$threadsid]['items'] = array($arr['output']);
 
                        }
 
-                       return $o;
                }
+               else
+               {
+                       // 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;
+                               } elseif(! x($comments,$item['parent'])) 
+                                       $comments[$item['parent']] = 0; // avoid notices later on
+                       }
 
+                       // map all the like/dislike activities for each parent item 
+                       // Store these in the $alike and $dlike arrays
 
-               // Normal View
+                       foreach($items as $item) {
+                               like_puller($a,$item,$alike,'like');
+                               like_puller($a,$item,$dlike,'dislike');
+                       }
 
+                       $comments_collapsed = false;
+                       $comment_lastcollapsed = false;
+                       $comment_firstcollapsed = false;
+                       $blowhard = 0;
+                       $blowhard_count = 0;
 
-               // 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;
-                       }
-               }
+                       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;
 
-               // array with html for each thread (parent+comments)
-               $treads = array();
-               $treadsid = -1;
+                               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+                               $toplevelprivate = false;
 
-               foreach($items as $item) {
+                               // Take care of author collapsing and comment collapsing
+                               // (author collapsing is currently disabled)
+                               // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+                               // If there are more than two comments, squash all but the last 2.
+                       
+                               if($toplevelpost) {
+                                       $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
+                                       $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+                                       $comments_seen = 0;
+                                       $comments_collapsed = false;
+                                       $comment_lastcollapsed  = false;
+                                       $comment_firstcollapsed = false;
+                                       
+                                       $threadsid++;
+                                       $threads[$threadsid]['id'] = $item['item_id'];
+                                       $threads[$threadsid]['private'] = $item['private'];
+                                       $threads[$threadsid]['items'] = array();
 
-                       $comment = '';
-                       $template = $tpl;
-                       $commentww = '';
-                       $sparkle = '';
-                       $owner_url = $owner_photo = $owner_name = '';
+                               }
+                               else {
+
+                                       // prevent private email reply to public conversation from leaking.
+                                       if($item['private'] && ! $threads[$threadsid]['private'])
+                                               continue;
 
-                       // We've already parsed out like/dislike for special treatment. We can ignore them now
+                                       $comments_seen ++;
+                                       $comment_lastcollapsed  = false;
+                                       $comment_firstcollapsed = false;
+                               }       
 
-                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-                               || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-                               && ($item['id'] != $item['parent']))
-                               continue;
+                               $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+                               $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
-                       $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') && ($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;" >';
+                               if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+
+                                       if (!$comments_collapsed){
+                                               $threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
+                                               $threads[$threadsid]['hide_text'] = t('show more');
+                                               $comments_collapsed = true;
+                                               $comment_firstcollapsed = true;
                                        }
                                }
-                               else {
-                                       $blowhard = $item['cid'];                                       
-                                       if($blowhard_count >= 3)
-                                               $o .= '</div>';
-                                       $blowhard_count = 0;
-                               }*/
-
-                               $comments_seen = 0;
-                               $comments_collapsed = false;
-                               
-                               $treadsid++;
-                               $treads[$treadsid] = "";
-                       }
-                       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) {
-                                       $treads[$treadsid] .= '<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))) {
+
+                                       $comment_lastcollapsed = true;
                                }
-                       }
-                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-                               $treads[$treadsid] .= '</div>';
-                       }
 
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+                               $redirect_url = $a->get_baseurl($ssl_state) . '/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']))))
-                               ? t('Private Message')
-                               : false);
+                               $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['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['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';
+                                               $owner_url = zrl($a->page_contact['url']);
+                                               $owner_photo = $a->page_contact['thumb'];
+                                               $owner_name = $a->page_contact['name'];
+                                               $template = $wallwall;
+                                               $commentww = 'ww';      
+                                       }
+                                       if((! $item['wall']) && (strlen($item['owner-link'])) && (! link_compare($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'] === NETWORK_DFRN)) {
+                                                       $owner_url = $redirect_url;
+                                                       $osparkle = ' sparkle';
+                                               }
+                                               else
+                                                       $owner_url = zrl($owner_url);
                                        }
                                }
-                       }
 
-                       $likebuttons = '';
-                       $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
+                               $likebuttons = '';
+                               $shareable = ((($profile_owner == local_user()) &&  (! $item['private'])) ? true : false); //($mode != 'display') &&
 
-                       if($page_writeable) {
-                               if($toplevelpost) {
-                                       $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"),
-                                               '$share' => t('Share'),
-                                               '$wait' => t('Please wait') 
-                                       ));
-                               }
+                               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(($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 : '')
-                                       ));
+                                       $qc = $qcomment =  null;
+
+                                       if(in_array('qcomment',$a->plugins)) {
+                                               $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+                                               $qcomment = (($qc) ? explode("\n",$qc) : null);
+                                       }
+
+                                       if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
+                                               $comment = replace_macros($cmnt_tpl,array(
+                                                       '$return_path' => '', 
+                                                       '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+                                                       '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+                                                       '$id' => $item['item_id'],
+                                                       '$parent' => $item['parent'],
+                                                       '$qcomment' => $qcomment,
+                                                       '$profile_uid' =>  $profile_owner,
+                                                       '$mylink' => $a->contact['url'],
+                                                       '$mytitle' => t('This is you'),
+                                                       '$myphoto' => $a->contact['thumb'],
+                                                       '$comment' => t('Comment'),
+                                                       '$submit' => t('Submit'),
+                                                       '$preview' => t('Preview'),
+                                                       '$ww' => (($mode === 'network') ? $commentww : '')
+                                               ));
+                                       }
                                }
-                       }
 
-                       $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>'
-                                       : '');
+                               $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
+                                               ? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
+                                               : False);
 
 
-                       $drop = '';
-                       $dropping = false;
+                               $drop = '';
+                               $dropping = false;
 
-                       if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                               $dropping = true;
+                               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')));
+                               $drop = array(
+                                       'dropping' => $dropping,
+                                       'select' => t('Select'), 
+                                       'delete' => t('Delete'),
+                               );
+
+                               $star = false;
+                               $filer = false;
+
+                               $isstarred = "unstarred";
+                               if ($profile_owner == local_user()) {
+                                       if($toplevelpost) {
+                                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+                                               $star = array(
+                                                       'do' => t("add star"),
+                                                       'undo' => t("remove star"),
+                                                       'toggle' => t("toggle star status"),
+                                                       'classdo' => (($item['starred']) ? "hidden" : ""),
+                                                       'classundo' => (($item['starred']) ? "" : "hidden"),
+                                                       'starred' =>  t('starred'),
+                                                       'tagger' => t("add tag"),
+                                                       'classtagger' => "",
+                                               );
+                                       }
+                                       $filer = t("save to folder");
+                               }
 
-                       $star = false;
 
-                       if ($profile_owner == local_user() && $toplevelpost) {
-                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
+                               $photo = $item['photo'];
+                               $thumb = $item['thumb'];
 
-                               $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'),
-                               );
-                       }
+                               // Post was remotely authored.
 
+                               $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+                               $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+
+                               if($item['author-link'] && (! $item['author-name']))
+                                       $profile_name = $item['author-link'];
+
+                               $sp = false;
+                               $profile_link = best_link_url($item,$sp);
+                               if($profile_link === 'mailbox')
+                                       $profile_link = '';
+                               if($sp)
+                                       $sparkle = ' sparkle';
+                               else
+                                       $profile_link = zrl($profile_link);                                     
 
+                               $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+                               if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+                                       $profile_avatar = $a->contacts[$normalised]['thumb'];
+                               else
+                                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-                       $photo = $item['photo'];
-                       $thumb = $item['thumb'];
 
-                       // Post was remotely authored.
 
-                       $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
-                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 
-                       $sp = false;
-                       $profile_link = best_link_url($item,$sp);
-                       if($sp)
-                               $sparkle = ' sparkle';
+                               $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']) : '');
 
-                       if($profile_link === 'mailbox')
-                               $profile_link = '';
+                               $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+                               call_hooks('render_location',$locate);
 
-                       $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);
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
+                               $indent = (($toplevelpost) ? '' : ' comment');
 
+                               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+                                       $indent .= ' shiny'; 
 
+                               // 
+                               localize_item($item);
 
 
-                       $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']) : '');
+                               $tags=array();
+                               foreach(explode(',',$item['tag']) as $tag){
+                                       $tag = trim($tag);
+                                       if ($tag!="") $tags[] = bbcode($tag);
+                               }
 
-                       $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>';
-                       }
+                               // Build the HTML
 
-                       $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(
-                               '$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']) && ($item['id'] == $item['parent'])) ? 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
-
-                       ));
-
-
-                       $arr = array('item' => $item, 'output' => $tmp_item);
-                       call_hooks('display_item', $arr);
-
-                       $treads[$treadsid] .= $arr['output'];
+                               $body = prepare_body($item,true);
+                               //$tmp_item = replace_macros($template,
+                               $tmp_item = array(
+                                       // collapse comments in template. I don't like this much...
+                                       'comment_firstcollapsed' => $comment_firstcollapsed,
+                                       'comment_lastcollapsed' => $comment_lastcollapsed,
+                                       // template to use to render item (wall, walltowall, search)
+                                       'template' => $template,
+                                       
+                                       'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+                                       'tags' => $tags,
+                                       'body' => template_escape($body),
+                                       'text' => strip_tags(template_escape($body)),
+                                       'id' => $item['item_id'],
+                                       'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                                       'to' => t('to'),
+                                       'wall' => t('Wall-to-Wall'),
+                                       'vwall' => t('via Wall-To-Wall:'),
+                                       'profile_url' => $profile_link,
+                                       'item_photo_menu' => item_photo_menu($item),
+                                       'name' => template_escape($profile_name),
+                                       'thumb' => $profile_avatar,
+                                       'osparkle' => $osparkle,
+                                       'sparkle' => $sparkle,
+                                       'title' => template_escape($item['title']),
+                                       'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                                       'lock' => $lock,
+                                       'location' => template_escape($location),
+                                       'indent' => $indent,
+                                       'owner_url' => $owner_url,
+                                       'owner_photo' => $owner_photo,
+                                       'owner_name' => template_escape($owner_name),
+                                       'plink' => get_plink($item),
+                                       'edpost' => $edpost,
+                                       'isstarred' => $isstarred,
+                                       'star' => $star,
+                                       'filer' => $filer,
+                                       'drop' => $drop,
+                                       'vote' => $likebuttons,
+                                       'like' => $like,
+                                       'dislike' => $dislike,
+                                       'comment' => $comment,
+                                       'previewing' => $previewing,
+                                       'wait' => t('Please wait'),
 
-               }
-       }
+                               );
 
 
-       // if author collapsing is in force but didn't get closed, close it off now.
+                               $arr = array('item' => $item, 'output' => $tmp_item);
+                               call_hooks('display_item', $arr);
 
-       if($blowhard_count >= 3)
-               $treads[$treadsid] .= '</div>';
+                               $threads[$threadsid]['items'][] = $arr['output'];
+                       }
+               }
+       }
 
        $page_template = get_markup_template("conversation.tpl");
        $o .= replace_macros($page_template, array(
-               '$treads' => $treads,
-               '$dropping' => $dropping,
+               '$baseurl' => $a->get_baseurl($ssl_state),
+               '$mode' => $mode,
+               '$user' => $a->user,
+               '$threads' => $threads,
+               '$dropping' => ($dropping?t('Delete Selected Items'):False),
        ));
-       //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) {
+function best_link_url($item,&$sparkle,$ssl_state = false) {
 
        $a = get_app();
 
@@ -577,7 +736,7 @@ function best_link_url($item,&$sparkle) {
        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'];
+                               $best_url = $a->get_baseurl($ssl_state) . '/redir/' . $a->contacts[$clean_url]['id'];
                                $sparkle = true;
                        }
                        else
@@ -598,10 +757,14 @@ function best_link_url($item,&$sparkle) {
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
        $a = get_app();
-       
-       if (local_user() && (! count($a->contacts)))
-               load_contact_links(local_user());
 
+       $ssl_state = false;
+
+       if(local_user()) {
+               $ssl_state = true;
+                if(! count($a->contacts))
+                       load_contact_links(local_user());
+       }
        $contact_url="";
        $pm_url="";
        $status_link="";
@@ -609,7 +772,7 @@ function item_photo_menu($item){
        $posts_link="";
 
        $sparkle = false;
-    $profile_link = best_link_url($item,$sparkle);
+    $profile_link = best_link_url($item,$sparkle,$ssl_state);
        if($profile_link === 'mailbox')
                $profile_link = '';
 
@@ -618,9 +781,11 @@ function item_photo_menu($item){
                $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;
+               $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+               $zurl = '';
        }
        else {
+               $profile_link = zrl($profile_link);
                if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
                        $cid = $item['contact-id'];
                }               
@@ -629,24 +794,37 @@ function item_photo_menu($item){
                }
        }
        if(($cid) && (! $item['self'])) {
-               $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-               $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+               $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
+               $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
+
+               $clean_url = normalise_link($item['author-link']);
+
+               if((local_user()) && (local_user() == $item['uid'])) {
+                       if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+                               if($a->contacts[$clean_url]['network'] === NETWORK_DIASPORA) {
+                                       $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+                               }
+                       }
+               }
+
        }
 
        $menu = Array(
                t("View status") => $status_link,
                t("View profile") => $profile_link,
-               t("View photos") => $photos_link,               
+               t("View photos") => $photos_link,
                t("View recent") => $posts_link, 
                t("Edit contact") => $contact_url,
                t("Send PM") => $pm_url,
        );
        
        
-       $args = array($item, &$menu);
+       $args = array('item' => $item, 'menu' => $menu);
        
        call_hooks('item_photo_menu', $args);
-       
+
+       $menu = $args['menu'];  
+
        $o = "";
        foreach($menu as $k=>$v){
                if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
@@ -664,9 +842,11 @@ function like_puller($a,$item,&$arr,$mode) {
        if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
                $url = $item['author-link'];
                if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
-                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+                       $url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
                        $sparkle = ' class="sparkle" ';
                }
+               else
+                       $url = zrl($url);
                if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
                        $arr[$item['parent'] . '-l'] = array();
                if(! isset($arr[$item['parent']]))
@@ -712,94 +892,201 @@ function format_like($cnt,$arr,$type,$id) {
 }}
 
 
-function status_editor($a,$x, $notes_cid = 0) {
+function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
        $o = '';
                
        $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-               $tpl = get_markup_template('jot-header.tpl');
+       $plaintext = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $plaintext = true;
+
+       $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");
+       $a->page['htmlhead'] .= replace_macros($tpl, array(
+               '$newpost' => 'true',
+               '$baseurl' => $a->get_baseurl(true),
+               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+               '$geotag' => $geotag,
+               '$nickname' => $x['nickname'],
+               '$ispublic' => t('Visible to <strong>everybody</strong>'),
+               '$linkurl' => t('Please enter a link URL:'),
+               '$vidurl' => t("Please enter a video link/URL:"),
+               '$audurl' => t("Please enter an audio link/URL:"),
+               '$term' => t('Tag term:'),
+               '$fileas' => t('Save to Folder:'),
+               '$whereareu' => t('Where are you right now?')
+       ));
+
+
+       $tpl = get_markup_template("jot.tpl");
                
-               $jotplugins = '';
-               $jotnets = '';
+       $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>';
+       }
 
-               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       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' =>  $a->get_baseurl(true) . '/item',
+               '$share' => (x($x,'button') ? $x['button'] : t('Share')),
+               '$upload' => t('Upload photo'),
+               '$shortupload' => t('upload photo'),
+               '$attach' => t('Attach file'),
+               '$shortattach' => t('attach file'),
+               '$weblink' => t('Insert web link'),
+               '$shortweblink' => t('web link'),
+               '$video' => t('Insert video link'),
+               '$shortvideo' => t('video link'),
+               '$audio' => t('Insert audio link'),
+               '$shortaudio' => t('audio link'),
+               '$setloc' => t('Set your location'),
+               '$shortsetloc' => t('set location'),
+               '$noloc' => t('Clear browser location'),
+               '$shortnoloc' => t('clear location'),
+               '$title' => "",
+               '$placeholdertitle' => t('Set title'),
+               '$category' => "",
+               '$placeholdercategory' => t('Categories (comma-separated list)'),
+               '$wait' => t('Please wait'),
+               '$permset' => t('Permission settings'),
+               '$shortpermset' => t('permissions'),
+               '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
+               '$content' => '',
+               '$post_id' => '',
+               '$baseurl' => $a->get_baseurl(true),
+               '$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'],
+               '$preview' => t('Preview'),
+       ));
 
-               $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 ($popup==true){
+               $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
+               
+       }
+
+       return $o;
+}
+
+
+function conv_sort($arr,$order) {
+
+       if((!(is_array($arr) && count($arr))))
+               return array();
+
+       $parents = array();
+
+       foreach($arr as $x)
+               if($x['id'] == $x['parent'])
+                               $parents[] = $x;
+
+       if(stristr($order,'created'))
+               usort($parents,'sort_thr_created');
+       elseif(stristr($order,'commented'))
+               usort($parents,'sort_thr_commented');
+
+       if(count($parents))
+               foreach($parents as $i=>$_x) 
+                       $parents[$i]['children'] = array();
+
+       foreach($arr as $x) {
+               if($x['id'] != $x['parent']) {
+                       $p = find_thread_parent_index($parents,$x);
+                       if($p !== false)
+                               $parents[$p]['children'][] = $x;
                }
+       }
+       if(count($parents)) {
+               foreach($parents as $k => $v) {
+                       if(count($parents[$k]['children'])) {
+                               $y = $parents[$k]['children'];
+                               usort($y,'sort_thr_created_rev');
+                               $parents[$k]['children'] = $y;
+                       }
+               }       
+       }
 
-               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>';
+       $ret = array();
+       if(count($parents)) {
+               foreach($parents as $x) {
+                       $ret[] = $x;
+                       if(count($x['children']))
+                               foreach($x['children'] as $y)
+                                       $ret[] = $y;
                }
+       }
 
-               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 $ret;
+}
 
-       return $o;
+
+function sort_thr_created($a,$b) {
+       return strcmp($b['created'],$a['created']);
+}
+
+function sort_thr_created_rev($a,$b) {
+       return strcmp($a['created'],$b['created']);
+}
+
+function sort_thr_commented($a,$b) {
+       return strcmp($b['commented'],$a['commented']);
+}
+
+function find_thread_parent_index($arr,$x) {
+       foreach($arr as $k => $v)
+               if($v['id'] == $x['parent'])
+                       return $k;
+       return false;
+}
+
+function render_location_google($item) {
+       $location = '';
+       $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>';
+       }
+       return $location;
 }
+