diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.php | 20 | ||||
| -rw-r--r-- | include/group.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 14 | ||||
| -rw-r--r-- | include/text.php | 22 |
4 files changed, 45 insertions, 13 deletions
diff --git a/include/features.php b/include/features.php index 616e3f6c5..3d3e41a05 100644 --- a/include/features.php +++ b/include/features.php @@ -386,21 +386,21 @@ function get_features($filtered = true, $level = (-1)) { ], [ - 'personal_tab', - t('Network Personal Tab'), - t('Enable tab to display only Network posts that you\'ve interacted on'), + 'order_tab', + t('Alternate Stream Order'), + t('Ability to order the stream by last post date, last comment date or unthreaded activities'), false, - get_config('feature_lock','personal_tab'), - feature_level('personal_tab',1), + get_config('feature_lock','order_tab'), + feature_level('order_tab',2), ], [ - 'new_tab', - t('Network New Tab'), - t('Enable tab to display all new Network activity'), + 'personal_tab', + t('Network Personal Tab'), + t('Enable tab to display only Network posts that you\'ve interacted on'), false, - get_config('feature_lock','new_tab'), - feature_level('new_tab',2), + get_config('feature_lock','personal_tab'), + feature_level('personal_tab',1), ], [ diff --git a/include/group.php b/include/group.php index 8c95f6224..03ebf7ee5 100644 --- a/include/group.php +++ b/include/group.php @@ -284,7 +284,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id 'text' => t('All Channels'), 'id' => 0, 'selected' => (($group_id == 0) ? 'group-selected' : ''), - 'href' => $every . (($every === 'network') ? '?f=&gid=0' : '') . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : ''), + 'href' => $every . (($every === 'network') ? '?f=&gid=0' : ''), ); diff --git a/include/nav.php b/include/nav.php index c5ceb97c5..994819ed4 100644 --- a/include/nav.php +++ b/include/nav.php @@ -168,7 +168,19 @@ function nav($template = 'default') { $nav['help'] = [$help_url, t('Help'), "", t('Help and documentation'), 'help_nav_btn', $context_help, $enable_context_help]; } - $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content')]; + switch(App::$module) { + case 'network': + $search_form_action = 'network'; + break; + case 'channel': + $search_form_action = 'channel'; + break; + default: + $search_form_action = 'search'; + } + + + $nav['search'] = ['search', t('Search'), "", t('Search site @name, !forum, #tag, ?docs, content'), $search_form_action]; /** diff --git a/include/text.php b/include/text.php index 34063cdd7..319de67a8 100644 --- a/include/text.php +++ b/include/text.php @@ -3333,4 +3333,24 @@ function unique_multidim_array($array, $key) { $i++; } return $temp_array; -} +} + +function network_qstring($req) { + + $ret = '?f='; + + if(x($req, 'cid')) + $ret .= '&cid=' . $req['cid']; + + if(x($req, 'gid')) + $ret .= '&gid=' . $req['gid']; + + if(x($req, 'star')) + $ret .= '&star=' . $req['star']; + + if(x($req, 'conv')) + $ret .= '&conv=' . $req['conv']; + + return $ret; + +} |