tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7797 from annando/arrival-order

Browse source 
Posted order is now arrival order
This commit is contained in:
Tobias Diekershoff 2019-11-02 16:02:27 +01:00 committed by GitHub
parent b543ee8ac7 682001ab0a
commit 9f215fc33b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
mod/network.php
View file

@ -86,7 +86,7 @@ function network_init(App $a)
if ($remember_tab) { if ($remember_tab) {
// redirect if current selected tab is '/network' and // redirect if current selected tab is '/network' and
// last selected tab is _not_ '/network?order=comment'. // last selected tab is _not_ '/network?order=activity'.
// and this isn't a date query // and this isn't a date query
$tab_baseurls = [ $tab_baseurls = [
@ -98,7 +98,7 @@ function network_init(App $a)
'', //bookmarked '', //bookmarked
]; ];
$tab_args = [ $tab_args = [
'order=comment', //all 'order=activity', //all
'order=post', //postord 'order=post', //postord
'conv=1', //conv 'conv=1', //conv
'', //new '', //new
@ -152,7 +152,7 @@ function network_init(App $a)
* *
* urls -> returns * urls -> returns
* '/network' => $no_active = 'active' * '/network' => $no_active = 'active'
* '/network?order=comment' => $comment_active = 'active' * '/network?order=activity' => $activity_active = 'active'
* '/network?order=post' => $postord_active = 'active' * '/network?order=post' => $postord_active = 'active'
* '/network?conv=1', => $conv_active = 'active' * '/network?conv=1', => $conv_active = 'active'
* '/network/new', => $new_active = 'active' * '/network/new', => $new_active = 'active'
@ -160,7 +160,7 @@ function network_init(App $a)
* '/network?bmark=1', => $bookmarked_active = 'active' * '/network?bmark=1', => $bookmarked_active = 'active'
* *
* @param App $a * @param App $a
* @return array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active); * @return array ($no_active, $activity_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
*/ */
function network_query_get_sel_tab(App $a) function network_query_get_sel_tab(App $a)
{ {
@ -195,7 +195,7 @@ function network_query_get_sel_tab(App $a)
if ($no_active == 'active' && !empty($_GET['order'])) { if ($no_active == 'active' && !empty($_GET['order'])) {
switch($_GET['order']) { switch($_GET['order']) {
case 'post' : $postord_active = 'active'; $no_active=''; break; case 'post' : $postord_active = 'active'; $no_active=''; break;
case 'comment' : $all_active = 'active'; $no_active=''; break; case 'activity' : $all_active = 'active'; $no_active=''; break;
} }
} }
@ -490,7 +490,7 @@ function networkThreadedView(App $a, $update, $parent)
$star = intval($_GET['star'] ?? 0); $star = intval($_GET['star'] ?? 0);
$bmark = intval($_GET['bmark'] ?? 0); $bmark = intval($_GET['bmark'] ?? 0);
$conv = intval($_GET['conv'] ?? 0); $conv = intval($_GET['conv'] ?? 0);
$order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'comment'); $order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity');
$nets = $_GET['nets'] ?? ''; $nets = $_GET['nets'] ?? '';
$allowedCids = []; $allowedCids = [];
@ -913,9 +913,9 @@ function network_tabs(App $a)
// item filter tabs // item filter tabs
/// @TODO fix this logic, reduce duplication /// @TODO fix this logic, reduce duplication
/// $a->page['content'] .= '<div class="tabs-wrapper">'; /// $a->page['content'] .= '<div class="tabs-wrapper">';
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a); list($no_active, $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
// if no tabs are selected, defaults to comments // if no tabs are selected, defaults to activitys
if ($no_active == 'active') { if ($no_active == 'active') {
$all_active = 'active'; $all_active = 'active';
} }
@ -925,19 +925,19 @@ function network_tabs(App $a)
// tabs // tabs
$tabs = [ $tabs = [
[ [
'label' => L10n::t('Commented Order'), 'label' => L10n::t('Latest Activity'),
'url' => str_replace('/new', '', $cmd) . '?order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'url' => str_replace('/new', '', $cmd) . '?order=activity' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $all_active, 'sel' => $all_active,
'title' => L10n::t('Sort by Comment Date'), 'title' => L10n::t('Sort by lastest activity on the posts'),
'id' => 'commented-order-tab', 'id' => 'activity-order-tab',
'accesskey' => 'e', 'accesskey' => 'e',
], ],
[ [
'label' => L10n::t('Posted Order'), 'label' => L10n::t('Latest Posts'),
'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $postord_active, 'sel' => $post_active,
'title' => L10n::t('Sort by Post Date'), 'title' => L10n::t("Sort by the posts' receiving date"),
'id' => 'posted-order-tab', 'id' => 'post-order-tab',
'accesskey' => 't', 'accesskey' => 't',
], ],
]; ];
@ -985,7 +985,7 @@ function network_tabs(App $a)
// save selected tab, but only if not in file mode // save selected tab, but only if not in file mode
if (empty($_GET['file'])) { if (empty($_GET['file'])) {
PConfig::set(local_user(), 'network.view', 'tab.selected', [ PConfig::set(local_user(), 'network.view', 'tab.selected', [
$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active
]); ]);
} }