Merge pull request #330 from fabrixxm/savenetworktab
network view: rembember last tab selected by user
This commit is contained in:
commit
0ac3f5fc1c
112
mod/network.php
112
mod/network.php
|
@ -7,6 +7,30 @@ function network_init(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// fetch last used tab and redirect if needed
|
||||||
|
$sel_tabs = network_query_get_sel_tab($a);
|
||||||
|
$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
|
||||||
|
if (is_array($last_sel_tabs)){
|
||||||
|
$tab_urls = array(
|
||||||
|
'/network?f=&order=comment', //all
|
||||||
|
'/network?f=&order=post', //postord
|
||||||
|
'/network?f=&conv=1', //conv
|
||||||
|
'/network/new', //new
|
||||||
|
'/network?f=&star=1', //starred
|
||||||
|
'/network?f=&bmark=1', //bookmarked
|
||||||
|
'/network?f=&spam=1', //spam
|
||||||
|
);
|
||||||
|
|
||||||
|
// redirect if current selected tab is 'no_active' and
|
||||||
|
// last selected tab is _not_ 'all_active'.
|
||||||
|
if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active') {
|
||||||
|
$k = array_search('active', $last_sel_tabs);
|
||||||
|
//echo "<pre>"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
|
||||||
|
goaway($a->get_baseurl() . $tab_urls[$k]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
|
$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
|
||||||
|
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
|
@ -98,26 +122,23 @@ function saved_searches($search) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
function network_content(&$a, $update = 0) {
|
* Return selected tab from query
|
||||||
|
*
|
||||||
require_once('include/conversation.php');
|
* urls -> returns
|
||||||
|
* '/network' => $no_active = 'active'
|
||||||
if(! local_user()) {
|
* '/network?f=&order=comment' => $comment_active = 'active'
|
||||||
$_SESSION['return_url'] = $a->query_string;
|
* '/network?f=&order=post' => $postord_active = 'active'
|
||||||
return login(false);
|
* '/network?f=&conv=1', => $conv_active = 'active'
|
||||||
}
|
* '/network/new', => $new_active = 'active'
|
||||||
|
* '/network?f=&star=1', => $starred_active = 'active'
|
||||||
$arr = array('query' => $a->query_string);
|
* '/network?f=&bmark=1', => $bookmarked_active = 'active'
|
||||||
|
* '/network?f=&spam=1', => $spam_active = 'active'
|
||||||
call_hooks('network_content_init', $arr);
|
*
|
||||||
|
* @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
|
||||||
$o = '';
|
*/
|
||||||
|
function network_query_get_sel_tab($a) {
|
||||||
// item filter tabs
|
$no_active='';
|
||||||
// TODO: fix this logic, reduce duplication
|
|
||||||
//$a->page['content'] .= '<div class="tabs-wrapper">';
|
|
||||||
|
|
||||||
$starred_active = '';
|
$starred_active = '';
|
||||||
$new_active = '';
|
$new_active = '';
|
||||||
$bookmarked_active = '';
|
$bookmarked_active = '';
|
||||||
|
@ -125,6 +146,7 @@ function network_content(&$a, $update = 0) {
|
||||||
$search_active = '';
|
$search_active = '';
|
||||||
$conv_active = '';
|
$conv_active = '';
|
||||||
$spam_active = '';
|
$spam_active = '';
|
||||||
|
$postord_active = '';
|
||||||
|
|
||||||
if(($a->argc > 1 && $a->argv[1] === 'new')
|
if(($a->argc > 1 && $a->argv[1] === 'new')
|
||||||
|| ($a->argc > 2 && $a->argv[2] === 'new')) {
|
|| ($a->argc > 2 && $a->argv[2] === 'new')) {
|
||||||
|
@ -152,28 +174,56 @@ function network_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (($new_active == '')
|
if (($new_active == '')
|
||||||
&& ($starred_active == '')
|
&& ($starred_active == '')
|
||||||
&& ($bookmarked_active == '')
|
&& ($bookmarked_active == '')
|
||||||
&& ($conv_active == '')
|
&& ($conv_active == '')
|
||||||
&& ($search_active == '')
|
&& ($search_active == '')
|
||||||
&& ($spam_active == '')) {
|
&& ($spam_active == '')) {
|
||||||
$all_active = 'active';
|
$no_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($no_active=='active' && x($_GET,'order')) {
|
||||||
$postord_active = '';
|
switch($_GET['order']){
|
||||||
|
case 'post': $postord_active = 'active'; $no_active=''; break;
|
||||||
if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
|
case 'comment' : $all_active = 'active'; $no_active=''; break;
|
||||||
$all_active = '';
|
|
||||||
$postord_active = 'active';
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
|
require_once('include/conversation.php');
|
||||||
|
|
||||||
|
if(! local_user()) {
|
||||||
|
$_SESSION['return_url'] = $a->query_string;
|
||||||
|
return login(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
$arr = array('query' => $a->query_string);
|
||||||
|
|
||||||
|
call_hooks('network_content_init', $arr);
|
||||||
|
|
||||||
|
$o = '';
|
||||||
|
|
||||||
|
// item filter tabs
|
||||||
|
// TODO: fix this logic, reduce duplication
|
||||||
|
//$a->page['content'] .= '<div class="tabs-wrapper">';
|
||||||
|
|
||||||
|
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
|
||||||
|
// if no tabs are selected, defaults to comments
|
||||||
|
if ($no_active=='active') $all_active='active';
|
||||||
|
//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
|
||||||
|
|
||||||
// tabs
|
// tabs
|
||||||
$tabs = array(
|
$tabs = array(
|
||||||
array(
|
array(
|
||||||
'label' => t('Commented Order'),
|
'label' => t('Commented Order'),
|
||||||
'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''),
|
'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
|
||||||
'sel'=>$all_active,
|
'sel'=>$all_active,
|
||||||
'title'=> t('Sort by Comment Date'),
|
'title'=> t('Sort by Comment Date'),
|
||||||
),
|
),
|
||||||
|
@ -215,9 +265,13 @@ function network_content(&$a, $update = 0) {
|
||||||
// 'title' => t('Posts flagged as SPAM'),
|
// 'title' => t('Posts flagged as SPAM'),
|
||||||
// ),
|
// ),
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// save selected tab, but only if not in search or file mode
|
||||||
|
if(!x($_GET,'search') && !x($_GET,'file')) {
|
||||||
|
set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
|
||||||
|
}
|
||||||
|
|
||||||
$arr = array('tabs' => $tabs);
|
$arr = array('tabs' => $tabs);
|
||||||
call_hooks('network_tabs', $arr);
|
call_hooks('network_tabs', $arr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user