tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Posted order is now arrival order

Browse source
This commit is contained in:
Michael 2019-11-02 10:39:51 +00:00
parent bc18cde412
commit b81ab4f9a4
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mod/network.php
View file

@ -91,7 +91,7 @@ function network_init(App $a)
$tab_baseurls = [ $tab_baseurls = [
'', //all '', //all
'', //postord '', //arrivalord
'', //conv '', //conv
'/new', //new '/new', //new
'', //starred '', //starred
@ -99,9 +99,9 @@ function network_init(App $a)
]; ];
$tab_args = [ $tab_args = [
'order=comment', //all 'order=comment', //all
'order=post', //postord 'order=arrival', //arrivalord
'conv=1', //conv 'conv=1', //conv
'', //new '', //new
'star=1', //starred 'star=1', //starred
'bmark=1', //bookmarked 'bmark=1', //bookmarked
]; ];
@ -153,14 +153,14 @@ 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=comment' => $comment_active = 'active'
* '/network?order=post' => $postord_active = 'active' * '/network?order=arrival' => $arrivalord_active = 'active'
* '/network?conv=1', => $conv_active = 'active' * '/network?conv=1', => $conv_active = 'active'
* '/network/new', => $new_active = 'active' * '/network/new', => $new_active = 'active'
* '/network?star=1', => $starred_active = 'active' * '/network?star=1', => $starred_active = 'active'
* '/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, $comment_active, $arrivalord_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)
{ {
@ -170,7 +170,7 @@ function network_query_get_sel_tab(App $a)
$bookmarked_active = ''; $bookmarked_active = '';
$all_active = ''; $all_active = '';
$conv_active = ''; $conv_active = '';
$postord_active = ''; $arrivalord_active = '';
if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) { if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) {
$new_active = 'active'; $new_active = 'active';
@ -194,12 +194,12 @@ 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 'arrival' : $arrivalord_active = 'active'; $no_active=''; break;
case 'comment' : $all_active = 'active'; $no_active=''; break; case 'comment' : $all_active = 'active'; $no_active=''; break;
} }
} }
return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active]; return [$no_active, $all_active, $arrivalord_active, $conv_active, $new_active, $starred_active, $bookmarked_active];
} }
function network_query_get_sel_group(App $a) function network_query_get_sel_group(App $a)
@ -475,7 +475,7 @@ function networkThreadedView(App $a, $update, $parent)
$datequery2 = Strings::escapeHtml($a->argv[$x]); $datequery2 = Strings::escapeHtml($a->argv[$x]);
} else { } else {
$datequery = Strings::escapeHtml($a->argv[$x]); $datequery = Strings::escapeHtml($a->argv[$x]);
$_GET['order'] = 'post'; $_GET['order'] = 'arrival';
} }
} elseif (intval($a->argv[$x])) { } elseif (intval($a->argv[$x])) {
$gid = intval($a->argv[$x]); $gid = intval($a->argv[$x]);
@ -671,14 +671,14 @@ function networkThreadedView(App $a, $update, $parent)
} }
// Normal conversation view // Normal conversation view
if ($order === 'post') { if ($order === 'arrival') {
$ordering = '`received`'; $ordering = '`received`';
$order_mode = 'received'; $order_mode = 'received';
} else { } else {
$ordering = '`commented`'; $ordering = '`commented`';
$order_mode = 'commented'; $order_mode = 'commented';
} }
Logger::info('Arrival order', ['ordering' => $ordering]);
$sql_order = "$sql_table.$ordering"; $sql_order = "$sql_table.$ordering";
if (!empty($_GET['offset'])) { if (!empty($_GET['offset'])) {
@ -738,7 +738,7 @@ function networkThreadedView(App $a, $update, $parent)
if (Config::get("system", "like_no_comment")) { if (Config::get("system", "like_no_comment")) {
$sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")"; $sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
} }
if ($order === 'post') { if ($order === 'arrival') {
// Only show toplevel posts when updating posts in this order mode // Only show toplevel posts when updating posts in this order mode
$sql_extra4 .= " AND `item`.`id` = `item`.`parent`"; $sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
} }
@ -913,7 +913,7 @@ 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, $arrival_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 comments
if ($no_active == 'active') { if ($no_active == 'active') {
@ -933,11 +933,11 @@ function network_tabs(App $a)
'accesskey' => 'e', 'accesskey' => 'e',
], ],
[ [
'label' => L10n::t('Posted Order'), 'label' => L10n::t('Arrival Order'),
'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'url' => str_replace('/new', '', $cmd) . '?order=arrival' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $postord_active, 'sel' => $arrival_active,
'title' => L10n::t('Sort by Post Date'), 'title' => L10n::t('Sort by arrival date'),
'id' => 'posted-order-tab', 'id' => 'arrival-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, $arrival_active, $conv_active, $new_active, $starred_active, $bookmarked_active
]); ]);
} }