]> git.mxchange.org Git - friendica.git/blobdiff - mod/network.php
sorting through key issue
[friendica.git] / mod / network.php
index 7a81fd1a2c419c7bb297317d1f6dbed6b48943ce..5faeee453b3947ee1412d4d6ff5da45b69ce60fa 100644 (file)
 
 
 function network_init(&$a) {
+       if(! local_user()) {
+               notice( t('Permission denied.') . EOL);
+               return;
+       }
+  
+       $group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
+                 
        require_once('include/group.php');
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
-       $a->page['aside'] .= group_side('network','network');
+
+       $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
+
+       // We need a better way of managing a growing argument list
+
+       $srchurl = '/network' 
+               . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
+               . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
+               . ((x($_GET,'order')) ? '?order=' . $_GET['order'] : '')
+               . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '');
+
+       if(x($_GET,'save')) {
+               $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
+                       intval(local_user()),
+                       dbesc($search)
+               );
+               if(! count($r)) {
+                       q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
+                               intval(local_user()),
+                               dbesc($search)
+                       );
+               }
+       }
+       if(x($_GET,'remove')) {
+               q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
+                       intval(local_user()),
+                       dbesc($search)
+               );
+       }
+
+       $a->page['aside'] .= search($search,'netsearch-box',$srchurl,true);
+
+       $a->page['aside'] .= '<div id="network-new-link">';
+
+
+       $a->page['aside'] .= '<div id="network-view-link">';
+       if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new') || x($_GET,'search')) {
+               $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . '">' . t('View Conversations') . '</a></div>';
+       }
+       else { 
+               $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' . t('View New Items') . '</a></div>';
+
+               if(x($_GET,'star'))
+                       $a->page['aside'] .= '<div id="network-star-link">'
+                               . '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd 
+                               . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '">' 
+                               . t('View Any Items') . '</a>' 
+                               . '<span class="network-star icon starred"></span>' 
+                               . '<span class="network-star icon unstarred"></span>' 
+                               . '<div class="clear"></div></div>';
+               else
+                       $a->page['aside'] .= '<div id="network-star-link">'
+                               . '<a class="network-star" href="' . $a->get_baseurl() . '/' . $a->cmd 
+                               . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1" >' 
+                               . t('View Starred Items') . '</a>'
+                               . '<span class="network-star icon starred"></span>' 
+                               . '<div class="clear"></div></div>';
+
+               if(! $_GET['bmark'])
+                       $a->page['aside'] .= '<div id="network-bmark-link">'
+                               . '<a class="network-bmark" href="' . $a->get_baseurl() . '/' . $a->cmd 
+                               . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1" >' 
+                               . t('View Bookmarks') . '</a>'
+                               . '<div class="clear"></div></div>';
+
+
+       }
+
+       $a->page['aside'] .= '</div>';
+
+       $a->page['aside'] .= group_side('network','network',true,$group_id);
+
+       $a->page['aside'] .= saved_searches();
+
+}
+
+function saved_searches() {
+
+       $o = '';
+
+       $r = q("select `term` from `search` WHERE `uid` = %d",
+               intval(local_user())
+       );
+
+       if(count($r)) {
+               $o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
+               $o .= '<div id="saved-search-list"><ul id="saved-search-ul">' . "\r\n";
+               foreach($r as $rr) {
+                       $o .= '<li class="saved-search-li clear"><a href="network/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="network/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+               }
+               $o .= '</ul></div>' . "\r\n";
+       }               
+
+       return $o;
+
 }
 
 
+
+
 function network_content(&$a, $update = 0) {
 
+       require_once('include/conversation.php');
+
        if(! local_user())
-               return '';
+       return login(false);
 
        $o = '';
 
-       require_once("include/bbcode.php");
-
        $contact_id = $a->cid;
 
        $group = 0;
 
-       if(! $update) {
-               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
+       $nouveau = false;
+       require_once('include/acl_selectors.php');
+
+       $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0);
+       $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
+       $bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
+       $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
+
+
+       if(($a->argc > 2) && $a->argv[2] === 'new')
+               $nouveau = true;
 
-                       // pull out the group here because the updater might have different args
-               if($a->argc > 1) {
+       if($a->argc > 1) {
+               if($a->argv[1] === 'new')
+                       $nouveau = true;
+               else {
                        $group = intval($a->argv[1]);
-                       $group_acl = array('allow_gid' => '<' . $group . '>');
+                       $def_acl = array('allow_gid' => '<' . $group . '>');
                }
-               $_SESSION['return_url'] = $a->cmd;
+       }
 
-               $geotag = (($a->user['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+       if(x($_GET,'search'))
+               $nouveau = true;
+       if($cid)
+               $def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
-               $tpl = load_view_file('view/jot-header.tpl');
-       
-               $a->page['htmlhead'] .= replace_macros($tpl, array(
-                       '$baseurl' => $a->get_baseurl(),
-                       '$geotag' => $geotag,
-                       '$nickname' => $a->user['nickname']
-               ));
+       if(! $update) {
+               if(group) {
+                       if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
+                               notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
+                                                                       'Warning: This group contains %s members from an insecure network.',
+                                                                       $t), $t ) . EOL);
+                               notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
+                       }
+               }
 
-               require_once('include/acl_selectors.php');
+               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
 
-               $tpl = load_view_file("view/jot.tpl");
-               
-               if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))))
-                               $lockstate = 'lock';
-                       else
-                               $lockstate = 'unlock';
+               $_SESSION['return_url'] = $a->cmd;
 
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-               $o .= replace_macros($tpl,array(
-                       '$return_path' => $a->cmd,
-                       '$baseurl' => $a->get_baseurl(),
-                       '$defloc' => $a->user['default-location'],
-                       '$visitor' => 'block',
-                       '$lockstate' => $lockstate,
-                       '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
-                       '$bang' => (($group) ? '!' : ''),
-                       '$profile_uid' => $_SESSION['uid']
-               ));
+               $x = array(
+                       'is_owner' => true,
+                       'allow_location' => $a->user['allow_location'],
+                       'default_location' => $a->user['default_location'],
+                       'nickname' => $a->user['nickname'],
+                       'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+                       'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
+                       'bang' => (($group || $cid) ? '!' : ''),
+                       'visitor' => 'block',
+                       'profile_uid' => local_user()
+               );
 
+               $o .= status_editor($a,$x);
 
                // The special div is needed for liveUpdate to kick in for this page.
                // We only launch liveUpdate if you are on the front page, you aren't
                // filtering by group and also you aren't writing a comment (the last
                // criteria is discovered in javascript).
 
-               if($a->pager['start'] == 0 && $a->argc == 1) {
                        $o .= '<div id="live-network"></div>' . "\r\n";
-                       $o .= "<script> var profile_uid = " . $_SESSION['uid'] . "; </script>\r\n";
-               }
+                       $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
+                               . "; var netargs = '" . substr($a->cmd,8)
+                               . '?f='
+                               . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
+                               . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
+                               . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
+                               . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') 
+                               . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') 
+                               . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
        }
 
-       // We aren't going to try and figure out at the item, group, and page level 
-       // which items you've seen and which you haven't. You're looking at some
-       // subset of items, so just mark everything seen. 
+       // We aren't going to try and figure out at the item, group, and page
+       // level which items you've seen and which you haven't. If you're looking
+       // at the top level network page just mark everything seen. 
        
-       $r = q("UPDATE `item` SET `unseen` = 0 
-               WHERE `unseen` = 1 AND `uid` = %d",
-               intval($_SESSION['uid'])
-       );
+       if((! $group) && (! $cid) && (! $star)) {
+               $r = q("UPDATE `item` SET `unseen` = 0 
+                       WHERE `unseen` = 1 AND `uid` = %d",
+                       intval($_SESSION['uid'])
+               );
+       }
 
        // We don't have to deal with ACL's on this page. You're looking at everything
        // that belongs to you, hence you can see all of it. We will filter by group if
        // desired. 
 
-       $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+       $star_sql = (($star) ?  " AND `starred` = 1 " : '');
+
+       if($bmark)
+               $star_sql .= " AND `bookmark` = 1 ";
+
+       $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql ) ";
 
        if($group) {
                $r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -98,217 +227,153 @@ function network_content(&$a, $update = 0) {
                        intval($_SESSION['uid'])
                );
                if(! count($r)) {
+                       if($update)
+                               killme();
                        notice( t('No such group') . EOL );
                        goaway($a->get_baseurl() . '/network');
-                       return; // NOTREACHED
+                       // NOTREACHED
                }
 
                $contacts = expand_groups(array($group));
-               $contact_str = implode(',',$contacts);
-                $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
-                $o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
+               if((is_array($contacts)) && count($contacts)) {
+                       $contact_str = implode(',',$contacts);
+               }
+               else {
+                               $contact_str = ' 0 ';
+                               info( t('Group is empty'));
+               }
+
 
+               $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";
+               $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
        }
+       elseif($cid) {
 
+               $r = q("SELECT `id`,`name`,`network`,`writable` FROM `contact` WHERE `id` = %d 
+                               AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+                       intval($cid)
+               );
+               if(count($r)) {
+                       $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND `contact-id` IN ( " . intval($cid) . " )) ";
+                       $o = '<h2>' . t('Contact: ') . $r[0]['name'] . '</h2>' . $o;
+                       if($r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['network'] !== NETWORK_DIASPORA && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
+                               notice( t('Private messages to this person are at risk of public disclosure.') . EOL);
+                       }
+
+               }
+               else {
+                       notice( t('Invalid contact.') . EOL);
+                       goaway($a->get_baseurl() . '/network');
+                       // NOTREACHED
+               }
+       }
+
+       if((! $group) && (! $cid) && (! $update))
+               $o .= get_birthdays();
+
+       $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
+
+       if(x($_GET,'search'))
+               $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
+
+       
        $r = q("SELECT COUNT(*) AS `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               $sql_extra2
                $sql_extra ",
                intval($_SESSION['uid'])
        );
 
-       if(count($r))
-               $a->set_pager_total($r[0]['total']);
-
-       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-               `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
-               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-               FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               $sql_extra
-               ORDER BY `parent` DESC, `gravity` ASC, `created` ASC LIMIT %d ,%d ",
-               intval($_SESSION['uid']),
-               intval($a->pager['start']),
-               intval($a->pager['itemspage'])
-       );
-
-
-       $cmnt_tpl = load_view_file('view/comment_item.tpl');
-       $like_tpl = load_view_file('view/like.tpl');
-       $tpl = load_view_file('view/wall_item.tpl');
-       $wallwall = load_view_file('view/wallwall_item.tpl');
-
-       $alike = array();
-       $dlike = array();
-       
        if(count($r)) {
+               $a->set_pager_total($r[0]['total']);
+               $a->set_pager_itemspage(40);
+       }
 
-               foreach($r as $item) {
-                       like_puller($a,$item,$alike,'like');
-                       like_puller($a,$item,$dlike,'dislike');
-               }
-
-               foreach($r as $item) {
-
-                       $comment = '';
-                       $template = $tpl;
-                       $commentww = '';
-                       $owner_url = $owner_photo = $owner_name = '';
-
-                       $profile_url = $item['url'];
-
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
-                               continue;
-
-                       $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-                               || strlen($item['deny_cid']) || strlen($item['deny_gid']))
-                               ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-                               : '<div class="wall-item-lock"></div>');
-
-                       // Top-level wall post not written by the wall owner (wall-to-wall)
-                       // First figure out who owns it. 
-
-                       $osparkle = '';
-
-                       if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
-
-                               if($item['type'] === 'wall') {
-                                       // I do. Put me on the left of the wall-to-wall notice.
-                                       $owner_url = $a->contact['url'];
-                                       $owner_photo = $a->contact['thumb'];
-                                       $owner_name = $a->contact['name'];
-                                       $template = $wallwall;
-                                       $commentww = 'ww';      
-                               }
-                               if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-                                       // Could be anybody. 
-                                       $owner_url = $item['owner-link'];
-                                       $owner_photo = $item['owner-avatar'];
-                                       $owner_name = $item['owner-name'];
-                                       $template = $wallwall;
-                                       $commentww = 'ww';
-                                       // If it is our contact, use a friendly redirect link
-                                       if(($item['owner-link'] == $item['url']) 
-                                               && ($item['network'] === 'dfrn')) {
-                                               $owner_url = $redirect_url;
-                                               $osparkle = ' sparkle';
-                                       }
-
-                               }
-                       }
-
-                       if($update)
-                               $return_url = $_SESSION['return_url'];
-                       else
-                               $return_url = $_SESSION['return_url'] = $a->cmd;
-
-                       $likebuttons = '';
-                       if($item['id'] == $item['parent']) {
-                               $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
-                       }
-
-                       if($item['last-child']) {
-                               $comment = replace_macros($cmnt_tpl,array(
-                                       '$return_path' => $_SESSION['return_url'],
-                                       '$type' => 'net-comment',
-                                       '$id' => $item['item_id'],
-                                       '$parent' => $item['parent'],
-                                       '$profile_uid' =>  $_SESSION['uid'],
-                                       '$mylink' => $a->contact['url'],
-                                       '$mytitle' => t('This is you'),
-                                       '$myphoto' => $a->contact['thumb'],
-                                       '$ww' => $commentww
-                               ));
-                       }
-
-                       $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
 
+       if($nouveau) {
 
-       
-                       if(($item['network'] === 'dfrn') && (! $item['self'] )) {
-                               $profile_url = $redirect_url;
-                               $sparkle = ' sparkle';
-                       }
+               // "New Item View" - show all items unthreaded in reverse created date order
 
-                       $photo = $item['photo'];
-                       $thumb = $item['thumb'];
-
-                       // Post was remotely authored.
-
-                       $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
+                       `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+                       `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+                       FROM `item`, `contact`
+                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+                       AND `contact`.`id` = `item`.`contact-id`
+                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                       $sql_extra
+                       ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+                       intval($_SESSION['uid']),
+                       intval($a->pager['start']),
+                       intval($a->pager['itemspage'])
+               );
+               
+       }
+       else {
 
-                       $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);
+               // Normal conversation view
 
 
-                       $profile_link = $profile_url;
+               if($order === 'post')
+                               $ordering = "`created`";
+               else
+                               $ordering = "`commented`";
 
-                       // Can we use our special contact URL for this author? 
+               // Fetch a page full of parent items for this page
 
-                       if(strlen($item['author-link'])) {
-                               if($item['author-link'] == $item['url'] && ($item['network'] === 'dfrn') && (! $item['self'])) {
-                                       $profile_link = $redirect_url;
-                                       $sparkle = ' sparkle';
-                               }
-                               else {
-                                       $profile_link = $item['author-link'];
-                                       $sparkle = '';
-                               }
-                       }
+               $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
+                       FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+                       AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                       AND `item`.`parent` = `item`.`id`
+                       $sql_extra
+                       ORDER BY `item`.$ordering DESC LIMIT %d ,%d ",
+                       intval(local_user()),
+                       intval($a->pager['start']),
+                       intval($a->pager['itemspage'])
+               );
 
+               // Then fetch all the children of the parents that are on this page
+
+               $parents_arr = array();
+               $parents_str = '';
+
+               if(count($r)) {
+                       foreach($r as $rr)
+                               $parents_arr[] = $rr['item_id'];
+                       $parents_str = implode(', ', $parents_arr);
+
+                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+                               `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
+                               `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+                               `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+                               FROM `item`, (SELECT `p`.`id`,`p`.`created`,`p`.`commented` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
+                               WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+                               AND `contact`.`id` = `item`.`contact-id`
+                               AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                               AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
+                               $sql_extra
+                               ORDER BY `parentitem`.$ordering DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
+                               intval(local_user()),
+                               dbesc($parents_str)
+                       );
+               }       
+       }
 
-                       $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']) : '');
+       // Set this so that the conversation function can find out contact info for our wall-wall items
+       $a->page_contact = $a->contact;
 
-                       $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-                       $coord = (($item['coord']) ? '<a target="map" 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>';
-                       }
+       $mode = (($nouveau) ? 'network-new' : 'network');
 
-                       $indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-                       if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                               $indent .= ' shiny'; 
-
-
-                       // Build the HTML
-
-                       $o .= replace_macros($template,array(
-                               '$id' => $item['item_id'],
-                               '$profile_url' => $profile_link,
-                               '$name' => $profile_name,
-                               '$thumb' => $profile_avatar,
-                               '$osparkle' => $osparkle,
-                               '$sparkle' => $sparkle,
-                               '$title' => $item['title'],
-                               '$body' => bbcode($item['body']),
-                               '$ago' => relative_date($item['created']),
-                               '$lock' => $lock,
-                               '$location' => $location,
-                               '$indent' => $indent,
-                               '$owner_url' => $owner_url,
-                               '$owner_photo' => $owner_photo,
-                               '$owner_name' => $owner_name,
-                               '$drop' => $drop,
-                               '$vote' => $likebuttons,
-                               '$like' => $like,
-                               '$dislike' => $dislike,
-                               '$comment' => $comment
-                       ));
-               }
-       }
+       $o .= conversation($a,$r,$mode,$update);
 
-       if(! $update)
+       if(! $update) {
                $o .= paginate($a);
+               $o .= cc_license();
+       }
 
        return $o;
-}
\ No newline at end of file
+}