diff options
author | root <root@diekershoff.homeunix.net> | 2011-01-20 08:17:07 +0100 |
---|---|---|
committer | root <root@diekershoff.homeunix.net> | 2011-01-20 08:17:07 +0100 |
commit | 030f6f306cba0f025d124fc7a2912a2bafb291be (patch) | |
tree | 7643c61b5d25671b3d79ba2d8c28fd7c9bb60b4a /mod/network.php | |
parent | 8e22c669a0668fc0498e9c1d822dcefd97bae1e5 (diff) | |
parent | 2ffe0d0b1d9589b6b37d8ade0114caef31339001 (diff) | |
download | volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.tar.gz volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.tar.bz2 volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.zip |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/network.php')
-rw-r--r-- | mod/network.php | 138 |
1 files changed, 117 insertions, 21 deletions
diff --git a/mod/network.php b/mod/network.php index c761af810..aa42e2f52 100644 --- a/mod/network.php +++ b/mod/network.php @@ -5,6 +5,16 @@ function network_init(&$a) { require_once('include/group.php'); if(! x($a->page,'aside')) $a->page['aside'] = ''; + + $a->page['aside'] .= '<div id="network-new-link">'; + + if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) + $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '">' . t('Normal View') . '</a>'; + else + $a->page['aside'] .= '<a href="' . $a->get_baseurl() . '/' . $a->cmd . '/new' . '">' . t('New Item View') . '</a>'; + + $a->page['aside'] .= '</div>'; + $a->page['aside'] .= group_side('network','network'); } @@ -25,11 +35,21 @@ function network_content(&$a, $update = 0) { if(! $update) { $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>'; + $nouveau = false; + + 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) { - $group = intval($a->argv[1]); - $group_acl = array('allow_gid' => '<' . $group . '>'); + if($a->argv[1] === 'new') + $nouveau = true; + else { + $group = intval($a->argv[1]); + $group_acl = array('allow_gid' => '<' . $group . '>'); + } } + $_SESSION['return_url'] = $a->cmd; $geotag = (($a->user['allow_location']) ? load_view_file('view/jot_geotag.tpl') : ''); @@ -111,6 +131,7 @@ function network_content(&$a, $update = 0) { $contact_str = ' 0 '; notice( t('Group is empty')); } + $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; } @@ -130,22 +151,39 @@ function network_content(&$a, $update = 0) { 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`, (SELECT `p`.`id`,`p`.`created` 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` - $sql_extra - ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC LIMIT %d ,%d ", - intval($_SESSION['uid']), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); + if($nouveau) { + $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`, `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`.`created` DESC LIMIT %d ,%d ", + intval($_SESSION['uid']), + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + } + else { + $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`, (SELECT `p`.`id`,`p`.`created` 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` + $sql_extra + ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`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'); @@ -158,6 +196,64 @@ function network_content(&$a, $update = 0) { if(count($r)) { + if($nouveau) { + + $tpl = load_view_file('view/search_item.tpl'); + $droptpl = load_view_file('view/wall_fake_drop.tpl'); + + foreach($r as $item) { + + $comment = ''; + $owner_url = ''; + $owner_photo = ''; + $owner_name = ''; + $sparkle = ''; + + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); + $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); + + + $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>'; + } + + $drop = replace_macros($droptpl,array('$id' => $item['id'])); + $lock = '<div class="wall-item-lock"></div>'; + + $o .= replace_macros($tpl,array( + '$id' => $item['item_id'], + '$profile_url' => $profile_link, + '$name' => $profile_name, + '$sparkle' => $sparkle, + '$lock' => $lock, + '$thumb' => $profile_avatar, + '$title' => $item['title'], + '$body' => bbcode($item['body']), + '$ago' => relative_date($item['created']), + '$location' => $location, + '$indent' => '', + '$owner_url' => $owner_url, + '$owner_photo' => $owner_photo, + '$owner_name' => $owner_name, + '$drop' => $drop, + '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>' + )); + + } + $o .= paginate($a); + + return $o; + + } + + + foreach($r as $item) { like_puller($a,$item,$alike,'like'); like_puller($a,$item,$dlike,'dislike'); @@ -207,7 +303,7 @@ function network_content(&$a, $update = 0) { $template = $wallwall; $commentww = 'ww'; // If it is our contact, use a friendly redirect link - if(($item['owner-link'] == $item['url']) + if((link_compare($item['owner-link'],$item['url'])) && ($item['network'] === 'dfrn')) { $owner_url = $redirect_url; $osparkle = ' sparkle'; @@ -254,7 +350,7 @@ function network_content(&$a, $update = 0) { // Post was remotely authored. - $diff_author = (($item['url'] !== $item['author-link']) ? true : false); + $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb); @@ -265,7 +361,7 @@ function network_content(&$a, $update = 0) { // Can we use our special contact URL for this author? if(strlen($item['author-link'])) { - if($item['author-link'] == $item['url'] && ($item['network'] === 'dfrn') && (! $item['self'])) { + if((link_compare($item['author-link'],$item['url'])) && ($item['network'] === 'dfrn') && (! $item['self'])) { $profile_link = $redirect_url; $sparkle = ' sparkle'; } |