clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4300 from MrPetovan/task/remove-network-nets-groups-from-config 

Remove network nets and groups from config
This commit is contained in:
Michael Vogel 2018-01-22 10:20:12 +01:00 committed by GitHub
parent 4af9c26fd3 0a8e350e4b
commit 316d57d186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 175 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
mod/network.php
View File

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/network.php * @file mod/network.php
*/ */
@ -8,9 +9,9 @@ use Friendica\Content\ForumManager;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
@ -21,7 +22,8 @@ require_once 'include/conversation.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
function network_init(App $a) { function network_init(App $a)
{
if (!local_user()) { if (!local_user()) {
notice(t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
@ -54,8 +56,6 @@ function network_init(App $a) {
$group_id = 0; $group_id = 0;
} }
PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
if ($a->argc > 1) { if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) { for ($x = 1; $x < $a->argc; $x ++) {
if (is_a_date_arg($a->argv[$x])) { if (is_a_date_arg($a->argv[$x])) {
@ -67,29 +67,23 @@ function network_init(App $a) {
// convert query string to array. remove friendica args // convert query string to array. remove friendica args
$query_array = []; $query_array = [];
$query_string = str_replace($a->cmd."?", "", $a->query_string); $query_string = str_replace($a->cmd . '?', '', $a->query_string);
parse_str($query_string, $query_array); parse_str($query_string, $query_array);
array_shift($query_array); array_shift($query_array);
// fetch last used network view and redirect if needed // fetch last used network view and redirect if needed
if (!$is_a_date_query) { if (!$is_a_date_query) {
$sel_nets = defaults($_GET, 'nets', false);
$sel_tabs = network_query_get_sel_tab($a); $sel_tabs = network_query_get_sel_tab($a);
$sel_nets = network_query_get_sel_net();
$sel_groups = network_query_get_sel_group($a); $sel_groups = network_query_get_sel_group($a);
$last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected'); $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
$last_sel_nets = PConfig::get(local_user(), 'network.view', 'net.selected');
$last_sel_groups = PConfig::get(local_user(), 'network.view', 'group.selected');
$remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active'); $remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active');
$remember_net = ($sel_nets === false && $last_sel_nets && $last_sel_nets !== 'all');
$remember_group = ($sel_groups === false && $last_sel_groups && $last_sel_groups != 0);
$net_baseurl = '/network'; $net_baseurl = '/network';
$net_args = []; $net_args = [];
if ($remember_group) { if ($sel_groups !== false) {
$net_baseurl .= '/' . $last_sel_groups; // Note that the group number must come before the "/new" tab selection
} elseif ($sel_groups !== false) {
$net_baseurl .= '/' . $sel_groups; $net_baseurl .= '/' . $sel_groups;
} }
@ -130,22 +124,17 @@ function network_init(App $a) {
} else { } else {
$remember_tab = false; $remember_tab = false;
} }
} elseif ($sel_tabs[4] === 'active') {
// The '/new' tab is selected
$remember_group = false;
} }
if ($remember_net) { if ($sel_nets !== false) {
$net_args['nets'] = $last_sel_nets;
} elseif ($sel_nets!==false) {
$net_args['nets'] = $sel_nets; $net_args['nets'] = $sel_nets;
} }
if ($remember_tab || $remember_net || $remember_group) { if ($remember_tab) {
$net_args = array_merge($query_array, $net_args); $net_args = array_merge($query_array, $net_args);
$net_queries = build_querystring($net_args); $net_queries = build_querystring($net_args);
$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl); $redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
goaway(System::baseUrl() . $redir_url); goaway(System::baseUrl() . $redir_url);
} }
@ -156,12 +145,12 @@ function network_init(App $a) {
unset($_GET['nets']); unset($_GET['nets']);
} }
if (!x($a->page, 'aside')) { if (!x($a->page, 'aside')) {
$a->page['aside'] = ''; $a->page['aside'] = '';
} }
$a->page['aside'] .= (Feature::isEnabled(local_user(), 'groups') ? Group::sidebarWidget('network/0', 'network', 'standard', $group_id) : ''); $a->page['aside'] .= (Feature::isEnabled(local_user(), 'groups') ?
Group::sidebarWidget('network/0', 'network', 'standard', $group_id) : '');
$a->page['aside'] .= (Feature::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : ''); $a->page['aside'] .= (Feature::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
$a->page['aside'] .= posted_date_widget('network', local_user(), false); $a->page['aside'] .= posted_date_widget('network', local_user(), false);
$a->page['aside'] .= Widget::networks('network', (x($_GET, 'nets') ? $_GET['nets'] : '')); $a->page['aside'] .= Widget::networks('network', (x($_GET, 'nets') ? $_GET['nets'] : ''));
@ -169,8 +158,8 @@ function network_init(App $a) {
$a->page['aside'] .= Widget::fileAs('network', (x($_GET, 'file') ? $_GET['file'] : '')); $a->page['aside'] .= Widget::fileAs('network', (x($_GET, 'file') ? $_GET['file'] : ''));
} }
function saved_searches($search) { function saved_searches($search)
{
if (!Feature::isEnabled(local_user(), 'savedsearch')) { if (!Feature::isEnabled(local_user(), 'savedsearch')) {
return ''; return '';
} }
@ -203,7 +192,7 @@ function saved_searches($search) {
]; ];
} }
$tpl = get_markup_template("saved_searches_aside.tpl"); $tpl = get_markup_template('saved_searches_aside.tpl');
$o = replace_macros($tpl, [ $o = replace_macros($tpl, [
'$title' => t('Saved Searches'), '$title' => t('Saved Searches'),
'$add' => t('add'), '$add' => t('add'),
@ -229,7 +218,8 @@ function saved_searches($search) {
* *
* @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); * @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
*/ */
function network_query_get_sel_tab(App $a) { function network_query_get_sel_tab(App $a)
{
$no_active = ''; $no_active = '';
$starred_active = ''; $starred_active = '';
$new_active = ''; $new_active = '';
@ -239,8 +229,7 @@ function network_query_get_sel_tab(App $a) {
$spam_active = ''; $spam_active = '';
$postord_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')) {
$new_active = 'active'; $new_active = 'active';
} }
@ -260,13 +249,7 @@ function network_query_get_sel_tab(App $a) {
$spam_active = 'active'; $spam_active = 'active';
} }
if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '') && ($spam_active == '')) {
if (($new_active == '')
&& ($starred_active == '')
&& ($bookmarked_active == '')
&& ($conv_active == '')
&& ($spam_active == '')) {
$no_active = 'active'; $no_active = 'active';
} }
@ -280,21 +263,8 @@ function network_query_get_sel_tab(App $a) {
return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active]; return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active];
} }
/** function network_query_get_sel_group(App $a)
* @brief Return selected network from query {
* @return string Name of the selected network
*/
function network_query_get_sel_net() {
$network = false;
if (x($_GET,'nets')) {
$network = $_GET['nets'];
}
return $network;
}
function network_query_get_sel_group(App $a) {
$group = false; $group = false;
if ($a->argc >= 2 && is_numeric($a->argv[1])) { if ($a->argc >= 2 && is_numeric($a->argv[1])) {
@ -311,11 +281,11 @@ function network_query_get_sel_group(App $a) {
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string SQL with the appropriate LIMIT clause * @return string SQL with the appropriate LIMIT clause
*/ */
function networkPager($a, $update) { function networkPager($a, $update)
{
if ($update) { if ($update) {
// only setup pagination on initial page view // only setup pagination on initial page view
return ' LIMIT 100'; return ' LIMIT 100';
} }
// check if we serve a mobile device and get the user settings // check if we serve a mobile device and get the user settings
@ -344,7 +314,8 @@ function networkPager($a, $update) {
* *
* @param array $condition The array with the SQL condition * @param array $condition The array with the SQL condition
*/ */
function networkSetSeen($condition) { function networkSetSeen($condition)
{
if (empty($condition)) { if (empty($condition)) {
return; return;
} }
@ -365,7 +336,8 @@ function networkSetSeen($condition) {
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the conversation * @return string HTML of the conversation
*/ */
function networkConversation($a, $items, $mode, $update) { function networkConversation($a, $items, $mode, $update)
{
// Set this so that the conversation function can find out contact info for our wall-wall items // Set this so that the conversation function can find out contact info for our wall-wall items
$a->page_contact = $a->contact; $a->page_contact = $a->contact;
@ -382,7 +354,8 @@ function networkConversation($a, $items, $mode, $update) {
return $o; return $o;
} }
function network_content(App $a, $update = 0) { function network_content(App $a, $update = 0)
{
if (!local_user()) { if (!local_user()) {
return Login::form(); return Login::form();
} }
@ -421,13 +394,13 @@ function network_content(App $a, $update = 0) {
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the network content in flat view * @return string HTML of the network content in flat view
*/ */
function networkFlatView(App $a, $update = 0) { function networkFlatView(App $a, $update = 0)
{
// Rawmode is used for fetching new content at the end of the page // Rawmode is used for fetching new content at the end of the page
$rawmode = (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")); $rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
if (isset($_GET["last_id"])) { if (isset($_GET['last_id'])) {
$last_id = intval($_GET["last_id"]); $last_id = intval($_GET['last_id']);
} else { } else {
$last_id = 0; $last_id = 0;
} }
@ -436,8 +409,6 @@ function networkFlatView(App $a, $update = 0) {
$file = ((x($_GET, 'file')) ? $_GET['file'] : ''); $file = ((x($_GET, 'file')) ? $_GET['file'] : '');
PConfig::set(local_user(), 'network.view', 'net.selected', 'all');
if (!$update && !$rawmode) { if (!$update && !$rawmode) {
$tabs = network_tabs($a); $tabs = network_tabs($a);
$o .= $tabs; $o .= $tabs;
@ -501,16 +472,16 @@ function networkFlatView(App $a, $update = 0) {
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the network content in flat view * @return string HTML of the network content in flat view
*/ */
function networkThreadedView(App $a, $update = 0) { function networkThreadedView(App $a, $update = 0)
{
// Rawmode is used for fetching new content at the end of the page // Rawmode is used for fetching new content at the end of the page
$rawmode = (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")); $rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
if (isset($_GET["last_received"]) && isset($_GET["last_commented"]) && isset($_GET["last_created"]) && isset($_GET["last_id"])) { if (isset($_GET['last_received']) && isset($_GET['last_commented']) && isset($_GET['last_created']) && isset($_GET['last_id'])) {
$last_received = DBM::date($_GET["last_received"]); $last_received = DBM::date($_GET['last_received']);
$last_commented = DBM::date($_GET["last_commented"]); $last_commented = DBM::date($_GET['last_commented']);
$last_created = DBM::date($_GET["last_created"]); $last_created = DBM::date($_GET['last_created']);
$last_id = intval($_GET["last_id"]); $last_id = intval($_GET['last_id']);
} else { } else {
$last_received = ''; $last_received = '';
$last_commented = ''; $last_commented = '';
@ -540,12 +511,12 @@ function networkThreadedView(App $a, $update = 0) {
$o = ''; $o = '';
$cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); $cid = intval(defaults($_GET, 'cid' , 0));
$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); $star = intval(defaults($_GET, 'star' , 0));
$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0); $bmark = intval(defaults($_GET, 'bmark', 0));
$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment'); $conv = intval(defaults($_GET, 'conv' , 0));
$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); $order = notags(defaults($_GET, 'order', 'comment'));
$nets = ((x($_GET,'nets')) ? $_GET['nets'] : ''); $nets = defaults($_GET, 'nets' , '');
if ($cid) { if ($cid) {
$def_acl = ['allow_cid' => '<' . intval($cid) . '>']; $def_acl = ['allow_cid' => '<' . intval($cid) . '>'];
@ -562,7 +533,6 @@ function networkThreadedView(App $a, $update = 0) {
$def_acl = ['allow_cid' => $str]; $def_acl = ['allow_cid' => $str];
} }
} }
PConfig::set(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
if (!$update && !$rawmode) { if (!$update && !$rawmode) {
$tabs = network_tabs($a); $tabs = network_tabs($a);
@ -571,25 +541,24 @@ function networkThreadedView(App $a, $update = 0) {
if ($gid) { if ($gid) {
if (($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) { if (($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
notice(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.", notice(tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
"Warning: This group contains %s members from a network that doesn't allow non public messages.", "Warning: This group contains %s members from a network that doesn't allow non public messages.", $t) . EOL);
$t) . EOL);
notice(t("Messages in this group won't be send to these receivers.") . EOL); notice(t("Messages in this group won't be send to these receivers.") . EOL);
} }
} }
Nav::setSelected('network'); Nav::setSelected('network');
$content = ""; $content = '';
if ($cid) { if ($cid) {
// If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor // If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
$condition = ["`id` = ? AND (`forum` OR `prv`)", $cid]; $condition = ["`id` = ? AND (`forum` OR `prv`)", $cid];
$contact = dba::selectFirst('contact', ['addr', 'nick'], $condition); $contact = dba::selectFirst('contact', ['addr', 'nick'], $condition);
if (DBM::is_result($contact)) { if (DBM::is_result($contact)) {
if ($contact["addr"] != '') { if ($contact['addr'] != '') {
$content = "!".$contact["addr"]; $content = '!' . $contact['addr'];
} else { } else {
$content = "!".$contact["nick"]."+".$cid; $content = '!' . $contact['nick'] . '+' . $cid;
} }
} }
} }
@ -617,18 +586,18 @@ function networkThreadedView(App $a, $update = 0) {
// that belongs to you, hence you can see all of it. We will filter by group if // that belongs to you, hence you can see all of it. We will filter by group if
// desired. // desired.
$sql_post_table = ""; $sql_post_table = '';
$sql_options = (($star) ? " AND `thread`.`starred` " : ''); $sql_options = (($star) ? " AND `thread`.`starred` " : '');
$sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : ''); $sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : '');
$sql_extra = $sql_options; $sql_extra = $sql_options;
$sql_extra2 = ""; $sql_extra2 = '';
$sql_extra3 = ""; $sql_extra3 = '';
$sql_table = "`thread`"; $sql_table = '`thread`';
$sql_parent = "`iid`"; $sql_parent = '`iid`';
if ($update) { if ($update) {
$sql_table = "`item`"; $sql_table = '`item`';
$sql_parent = "`parent`"; $sql_parent = '`parent`';
$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`"; $sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
} }
@ -649,12 +618,12 @@ function networkThreadedView(App $a, $update = 0) {
$contacts = Group::expand([$gid]); $contacts = Group::expand([$gid]);
if ((is_array($contacts)) && count($contacts)) { if ((is_array($contacts)) && count($contacts)) {
$contact_str_self = ""; $contact_str_self = '';
$contact_str = implode(',', $contacts); $contact_str = implode(',', $contacts);
$self = dba::selectFirst('contact', ['id'], ['uid' => $_SESSION['uid'], 'self' => true]); $self = dba::selectFirst('contact', ['id'], ['uid' => $_SESSION['uid'], 'self' => true]);
if (DBM::is_result($self)) { if (DBM::is_result($self)) {
$contact_str_self = $self["id"]; $contact_str_self = $self['id'];
} }
$sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = " . $sql_table . "." . $sql_parent; $sql_post_table .= " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = " . $sql_table . "." . $sql_parent;
@ -665,10 +634,9 @@ function networkThreadedView(App $a, $update = 0) {
info(t('Group is empty')); info(t('Group is empty'));
} }
$o = replace_macros(get_markup_template("section_title.tpl"),[ $o = replace_macros(get_markup_template('section_title.tpl'), [
'$title' => t('Group: %s', $group['name']) '$title' => t('Group: %s', $group['name'])
]) . $o; ]) . $o;
} elseif ($cid) { } elseif ($cid) {
$fields = ['id', 'name', 'network', 'writable', 'nurl', $fields = ['id', 'name', 'network', 'writable', 'nurl',
'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location']; 'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location'];
@ -685,17 +653,17 @@ function networkThreadedView(App $a, $update = 0) {
'details' => $contact['location'], 'details' => $contact['location'],
]; ];
$entries[0]["account_type"] = Contact::getAccountType($contact); $entries[0]['account_type'] = Contact::getAccountType($contact);
$o = replace_macros(get_markup_template("viewcontact_template.tpl"),[ $o = replace_macros(get_markup_template('viewcontact_template.tpl'), [
'contacts' => $entries, 'contacts' => $entries,
'id' => 'network', 'id' => 'network',
]) . $o; ]) . $o;
if ($contact['network'] === NETWORK_OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) { if ($contact['network'] === NETWORK_OSTATUS && $contact['writable'] && !PConfig::get(local_user(), 'system',
'nowarn_insecure')) {
notice(t('Private messages to this person are at risk of public disclosure.') . EOL); notice(t('Private messages to this person are at risk of public disclosure.') . EOL);
} }
} else { } else {
notice(t('Invalid contact.') . EOL); notice(t('Invalid contact.') . EOL);
goaway('network'); goaway('network');
@ -709,14 +677,16 @@ function networkThreadedView(App $a, $update = 0) {
} }
if ($datequery) { if ($datequery) {
$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ",
dbesc(datetime_convert(date_default_timezone_get(), '', $datequery))));
} }
if ($datequery2) { if ($datequery2) {
$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ",
dbesc(datetime_convert(date_default_timezone_get(), '', $datequery2))));
} }
$sql_order = ""; $sql_order = '';
$order_mode = "received"; $order_mode = 'received';
if ($conv) { if ($conv) {
$sql_extra3 .= " AND $sql_table.`mention`"; $sql_extra3 .= " AND $sql_table.`mention`";
@ -724,23 +694,23 @@ function networkThreadedView(App $a, $update = 0) {
// Normal conversation view // Normal conversation view
if ($order === 'post') { if ($order === 'post') {
$ordering = "`created`"; $ordering = '`created`';
if ($sql_order == "") { if ($sql_order == '') {
$order_mode = "created"; $order_mode = 'created';
} }
} else { } else {
$ordering = "`commented`"; $ordering = '`commented`';
if ($sql_order == "") { if ($sql_order == '') {
$order_mode = "commented"; $order_mode = 'commented';
} }
} }
if ($sql_order == "") { if ($sql_order == '') {
$sql_order = "$sql_table.$ordering"; $sql_order = "$sql_table.$ordering";
} }
if (x($_GET, 'offset')) { if (x($_GET, 'offset')) {
$sql_range = sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"])); $sql_range = sprintf(" AND $sql_order <= '%s'", dbesc($_GET['offset']));
} else { } else {
$sql_range = ''; $sql_range = '';
} }
@ -775,7 +745,7 @@ function networkThreadedView(App $a, $update = 0) {
} }
break; break;
case 'id': case 'id':
if (($last_id > 0) && ($sql_table == "`thread`")) { if (($last_id > 0) && ($sql_table == '`thread`')) {
$sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", dbesc($last_id)); $sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", dbesc($last_id));
$a->set_pager_page(1); $a->set_pager_page(1);
$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
@ -785,10 +755,10 @@ function networkThreadedView(App $a, $update = 0) {
// Fetch a page full of parent items for this page // Fetch a page full of parent items for this page
if ($update) { if ($update) {
if (Config::get("system", "like_no_comment")) { if (Config::get('system', 'like_no_comment')) {
$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'"; $sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'";
} else { } else {
$sql_extra4 = ""; $sql_extra4 = '';
} }
$r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date` $r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@ -812,9 +782,7 @@ function networkThreadedView(App $a, $update = 0) {
} }
// Only show it when unfiltered (no groups, no networks, ...) // Only show it when unfiltered (no groups, no networks, ...)
if (Config::get('system', 'comment_public') && in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) if (Config::get('system', 'comment_public') && in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
&& (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$top_limit = current($r)['order_date']; $top_limit = current($r)['order_date'];
$bottom_limit = end($r)['order_date']; $bottom_limit = end($r)['order_date'];
@ -846,7 +814,7 @@ function networkThreadedView(App $a, $update = 0) {
$data = dba::inArray($items); $data = dba::inArray($items);
if (count($data) > 0) { if (count($data) > 0) {
logger('Tagged items: '.count($data).' - '.$bottom_limit." - ".$top_limit.' - '.local_user()); //$last_date); logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user()); //$last_date);
$r = array_merge($r, $data); $r = array_merge($r, $data);
} }
} }
@ -855,7 +823,7 @@ function networkThreadedView(App $a, $update = 0) {
$parents_arr = []; $parents_arr = [];
$parents_str = ''; $parents_str = '';
$date_offset = ""; $date_offset = '';
$items = []; $items = [];
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
@ -865,12 +833,12 @@ function networkThreadedView(App $a, $update = 0) {
} }
} }
$parents_str = implode(", ", $parents_arr); $parents_str = implode(', ', $parents_arr);
// splitted into separate queries to avoid the problem with very long threads // splitted into separate queries to avoid the problem with very long threads
// so always the last X comments are loaded // so always the last X comments are loaded
// This problem can occur expecially with imported facebook posts // This problem can occur expecially with imported facebook posts
$max_comments = Config::get("system", "max_comments"); $max_comments = Config::get('system', 'max_comments');
if ($max_comments == 0) { if ($max_comments == 0) {
$max_comments = 100; $max_comments = 100;
} }
@ -889,7 +857,7 @@ function networkThreadedView(App $a, $update = 0) {
} }
if (x($_GET, 'offset')) { if (x($_GET, 'offset')) {
$date_offset = $_GET["offset"]; $date_offset = $_GET['offset'];
} elseif (count($items)) { } elseif (count($items)) {
$date_offset = $items[0][$order_mode]; $date_offset = $items[0][$order_mode];
} else { } else {
@ -945,7 +913,7 @@ function network_tabs(App $a)
'sel' => $all_active, 'sel' => $all_active,
'title' => t('Sort by Comment Date'), 'title' => t('Sort by Comment Date'),
'id' => 'commented-order-tab', 'id' => 'commented-order-tab',
'accesskey' => "e", 'accesskey' => 'e',
], ],
[ [
'label' => t('Posted Order'), 'label' => t('Posted Order'),
@ -953,7 +921,7 @@ function network_tabs(App $a)
'sel' => $postord_active, 'sel' => $postord_active,
'title' => t('Sort by Post Date'), 'title' => t('Sort by Post Date'),
'id' => 'posted-order-tab', 'id' => 'posted-order-tab',
'accesskey' => "t", 'accesskey' => 't',
], ],
]; ];
@ -964,7 +932,7 @@ function network_tabs(App $a)
'sel' => $conv_active, 'sel' => $conv_active,
'title' => t('Posts that mention or involve you'), 'title' => t('Posts that mention or involve you'),
'id' => 'personal-tab', 'id' => 'personal-tab',
'accesskey' => "r", 'accesskey' => 'r',
]; ];
} }
@ -975,7 +943,7 @@ function network_tabs(App $a)
'sel' => $new_active, 'sel' => $new_active,
'title' => t('Activity Stream - by date'), 'title' => t('Activity Stream - by date'),
'id' => 'activitiy-by-date-tab', 'id' => 'activitiy-by-date-tab',
'accesskey' => "w", 'accesskey' => 'w',
]; ];
} }
@ -986,7 +954,7 @@ function network_tabs(App $a)
'sel' => $bookmarked_active, 'sel' => $bookmarked_active,
'title' => t('Interesting Links'), 'title' => t('Interesting Links'),
'id' => 'shared-links-tab', 'id' => 'shared-links-tab',
'accesskey' => "b", 'accesskey' => 'b',
]; ];
} }
@ -997,13 +965,15 @@ function network_tabs(App $a)
'sel' => $starred_active, 'sel' => $starred_active,
'title' => t('Favourite Posts'), 'title' => t('Favourite Posts'),
'id' => 'starred-posts-tab', 'id' => 'starred-posts-tab',
'accesskey' => "m", 'accesskey' => 'm',
]; ];
} }
// save selected tab, but only if not in file mode // save selected tab, but only if not in file mode
if (!x($_GET, 'file')) { if (!x($_GET, 'file')) {
PConfig::set(local_user(), 'network.view','tab.selected',[$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active]); PConfig::set(local_user(), 'network.view', 'tab.selected', [
$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active
]);
} }
$arr = ['tabs' => $tabs]; $arr = ['tabs' => $tabs];