<?php
-
/**
- * @file mod/network.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
use Friendica\App;
use Friendica\Content\Widget;
use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\Item;
+use Friendica\Model\Post\Category;
use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
function network_init(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
Hook::add('head', __FILE__, 'network_infinite_scroll_head');
- $search = (!empty($_GET['search']) ? Strings::escapeHtml($_GET['search']) : '');
-
- if (($search != '') && !empty($_GET['submit'])) {
- $a->internalRedirect('search?search=' . urlencode($search));
- }
-
- if (!empty($_GET['save'])) {
- $exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]);
- if (!$exists) {
- DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
- }
- }
- if (!empty($_GET['remove'])) {
- DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
- }
-
$is_a_date_query = false;
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
$cid = 0;
- if (!empty($_GET['cid'])) {
- $cid = $_GET['cid'];
+ if (!empty($_GET['contactid'])) {
+ $cid = $_GET['contactid'];
$_GET['nets'] = '';
$group_id = 0;
}
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
- if (is_a_date_arg($a->argv[$x])) {
+ if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
$is_a_date_query = true;
break;
}
// convert query string to array. remove friendica args
$query_array = [];
- $query_string = str_replace($a->cmd . '?', '', $a->query_string);
- parse_str($query_string, $query_array);
- array_shift($query_array);
+ parse_str(parse_url(DI::args()->getQueryString(), PHP_URL_QUERY), $query_array);
// fetch last used network view and redirect if needed
if (!$is_a_date_query) {
- $sel_nets = defaults($_GET, 'nets', '');
+ $sel_nets = $_GET['nets'] ?? '';
$sel_tabs = network_query_get_sel_tab($a);
$sel_groups = network_query_get_sel_group($a);
- $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
+ $last_sel_tabs = DI::pConfig()->get(local_user(), 'network.view', 'tab.selected');
$remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active');
if ($remember_tab) {
// redirect if current selected tab is '/network' and
- // last selected tab is _not_ '/network?f=&order=comment'.
+ // last selected tab is _not_ '/network?order=activity'.
// and this isn't a date query
- $tab_baseurls = [
- '', //all
- '', //postord
- '', //conv
- '/new', //new
- '', //starred
- '', //bookmarked
- ];
$tab_args = [
- 'f=&order=comment', //all
- 'f=&order=post', //postord
- 'f=&conv=1', //conv
- '', //new
- 'f=&star=1', //starred
- 'f=&bmark=1', //bookmarked
+ 'order=activity', //all
+ 'order=post', //postord
+ 'conv=1', //conv
+ 'new=1', //new
+ 'star=1', //starred
+ 'bmark=1', //bookmarked
];
$k = array_search('active', $last_sel_tabs);
if ($k != 3) {
- $net_baseurl .= $tab_baseurls[$k];
-
// parse out tab queries
$dest_qa = [];
$dest_qs = $tab_args[$k];
if ($remember_tab) {
$net_args = array_merge($query_array, $net_args);
- $net_queries = build_querystring($net_args);
+ $net_queries = http_build_query($net_args);
$redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
- $a->internalRedirect($redir_url);
+ DI::baseUrl()->redirect($redir_url);
}
}
- if (empty($a->page['aside'])) {
- $a->page['aside'] = '';
+ if (empty(DI::page()['aside'])) {
+ DI::page()['aside'] = '';
}
- $a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
- $a->page['aside'] .= ForumManager::widget(local_user(), $cid);
- $a->page['aside'] .= posted_date_widget('network', local_user(), false);
- $a->page['aside'] .= Widget::networks('network', defaults($_GET, 'nets', '') );
- $a->page['aside'] .= saved_searches($search);
- $a->page['aside'] .= Widget::fileAs('network', defaults($_GET, 'file', '') );
-}
-
-function saved_searches($search)
-{
- $srchurl = '/network?f='
- . (!empty($_GET['cid']) ? '&cid=' . rawurlencode($_GET['cid']) : '')
- . (!empty($_GET['star']) ? '&star=' . rawurlencode($_GET['star']) : '')
- . (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
- . (!empty($_GET['conv']) ? '&conv=' . rawurlencode($_GET['conv']) : '')
- . (!empty($_GET['nets']) ? '&nets=' . rawurlencode($_GET['nets']) : '')
- . (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
- . (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
- . (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '');
- ;
-
- $terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
- $saved = [];
-
- while ($rr = DBA::fetch($terms)) {
- $saved[] = [
- 'id' => $rr['id'],
- 'term' => $rr['term'],
- 'encodedterm' => urlencode($rr['term']),
- 'delete' => L10n::t('Remove term'),
- 'selected' => ($search == $rr['term']),
- ];
- }
-
- $tpl = Renderer::getMarkupTemplate('saved_searches_aside.tpl');
- $o = Renderer::replaceMacros($tpl, [
- '$title' => L10n::t('Saved Searches'),
- '$add' => L10n::t('add'),
- '$searchbox' => HTML::search($search, 'netsearch-box', $srchurl),
- '$saved' => $saved,
- ]);
-
- return $o;
+ DI::page()['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
+ DI::page()['aside'] .= ForumManager::widget(local_user(), $cid);
+ DI::page()['aside'] .= Widget::postedByYear('network', local_user(), false);
+ DI::page()['aside'] .= Widget::networks('network', $_GET['nets'] ?? '');
+ DI::page()['aside'] .= Widget\SavedSearches::getHTML(DI::args()->getQueryString());
+ DI::page()['aside'] .= Widget::fileAs('network', $_GET['file'] ?? '');
}
/**
* Return selected tab from query
*
* urls -> returns
- * '/network' => $no_active = 'active'
- * '/network?f=&order=comment' => $comment_active = 'active'
- * '/network?f=&order=post' => $postord_active = 'active'
- * '/network?f=&conv=1', => $conv_active = 'active'
- * '/network/new', => $new_active = 'active'
- * '/network?f=&star=1', => $starred_active = 'active'
- * '/network?f=&bmark=1', => $bookmarked_active = 'active'
+ * '/network' => $no_active = 'active'
+ * '/network?order=activity' => $activity_active = 'active'
+ * '/network?order=post' => $postord_active = 'active'
+ * '/network?conv=1', => $conv_active = 'active'
+ * '/network?new=1', => $new_active = 'active'
+ * '/network?star=1', => $starred_active = 'active'
+ * '/network?bmark=1', => $bookmarked_active = 'active'
*
- * @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
+ * @param App $a
+ * @return array ($no_active, $activity_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
*/
function network_query_get_sel_tab(App $a)
{
$conv_active = '';
$postord_active = '';
- if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) {
+ if (!empty($_GET['new'])) {
$new_active = 'active';
}
if ($no_active == 'active' && !empty($_GET['order'])) {
switch($_GET['order']) {
- case 'post' : $postord_active = 'active'; $no_active=''; break;
- case 'comment' : $all_active = 'active'; $no_active=''; break;
+ case 'post' : $postord_active = 'active'; $no_active=''; break;
+ case 'activity' : $all_active = 'active'; $no_active=''; break;
}
}
}
/**
- * @brief Sets the pager data and returns SQL
+ * Sets the pager data and returns SQL
*
- * @param App $a The global App
+ * @param App $a The global App
+ * @param Pager $pager
* @param integer $update Used for the automatic reloading
* @return string SQL with the appropriate LIMIT clause
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function networkPager(App $a, Pager $pager, $update)
{
return ' LIMIT 100';
}
- // check if we serve a mobile device and get the user settings
- // accordingly
- if ($a->is_mobile) {
- $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network');
- $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+ if (DI::mode()->isMobile()) {
+ $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+ DI::config()->get('system', 'itemspage_network_mobile'));
} else {
- $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
- $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+ $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+ DI::config()->get('system', 'itemspage_network'));
}
// now that we have the user settings, see if the theme forces
}
/**
- * @brief Sets items as seen
+ * Sets items as seen
*
* @param array $condition The array with the SQL condition
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function networkSetSeen($condition)
{
$unseen = Item::exists($condition);
if ($unseen) {
- $r = Item::update(['unseen' => false], $condition);
+ Item::update(['unseen' => false], $condition);
}
}
/**
- * @brief Create the conversation HTML
+ * Create the conversation HTML
*
* @param App $a The global App
* @param array $items Items of the conversation
+ * @param Pager $pager
* @param string $mode Display mode for the conversation
* @param integer $update Used for the automatic reloading
+ * @param string $ordering
* @return string HTML of the conversation
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function networkConversation(App $a, $items, Pager $pager, $mode, $update, $ordering = '')
{
$items = [];
}
- $o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
+ $o = conversation($a, $items, $mode, $update, false, $ordering, local_user());
if (!$update) {
- if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
+ if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
$o .= HTML::scrollLoader();
} else {
$o .= $pager->renderMinimal(count($items));
}
/// @TODO Is this really necessary? $a is already available to hooks
- $arr = ['query' => $a->query_string];
- Addon::callHooks('network_content_init', $arr);
+ $arr = ['query' => DI::args()->getQueryString()];
+ Hook::callAll('network_content_init', $arr);
- $flat_mode = false;
-
- if ($a->argc > 1) {
- for ($x = 1; $x < $a->argc; $x ++) {
- if ($a->argv[$x] === 'new') {
- $flat_mode = true;
- }
- }
- }
-
- if (!empty($_GET['file'])) {
- $flat_mode = true;
- }
-
- if ($flat_mode) {
+ if (!empty($_GET['new']) || !empty($_GET['file'])) {
$o = networkFlatView($a, $update);
} else {
$o = networkThreadedView($a, $update, $parent);
}
/**
- * @brief Get the network content in flat view
+ * Get the network content in flat view
*
- * @param Pager $pager
* @param App $a The global App
* @param integer $update Used for the automatic reloading
* @return string HTML of the network content in flat view
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @global Pager $pager
*/
function networkFlatView(App $a, $update = 0)
{
// Rawmode is used for fetching new content at the end of the page
$rawmode = (isset($_GET['mode']) && ($_GET['mode'] == 'raw'));
- if (isset($_GET['last_id'])) {
- $last_id = intval($_GET['last_id']);
- } else {
- $last_id = 0;
- }
-
$o = '';
- $file = defaults($_GET, 'file', '');
+ $file = $_GET['file'] ?? '';
if (!$update && !$rawmode) {
$tabs = network_tabs($a);
(strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
'default_perms' => ACL::getDefaultUserPermissions($a->user),
- 'acl' => ACL::getFullSelectorHTML($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
$o .= status_editor($a, $x);
- if (!Config::get('theme', 'hide_eventlist')) {
+ if (!DI::config()->get('theme', 'hide_eventlist')) {
$o .= Profile::getBirthdays();
$o .= Profile::getEventsReminderHTML();
}
}
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
+
+ networkPager($a, $pager, $update);
- /// @TODO Figure out why this variable is unused
- $pager_sql = networkPager($a, $pager, $update);
if (strlen($file)) {
- $condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?",
- $file, TERM_OBJ_POST, TERM_FILE, local_user()];
- $params = ['order' => ['tid' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $result = DBA::select('term', ['oid'], $condition);
+ $item_params = ['order' => ['uri-id' => true]];
+ $term_condition = ['name' => $file, 'type' => Category::FILE, 'uid' => local_user()];
+ $term_params = ['order' => ['uri-id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+ $result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params);
$posts = [];
while ($term = DBA::fetch($result)) {
- $posts[] = $term['oid'];
+ $posts[] = $term['uri-id'];
}
DBA::close($result);
if (count($posts) == 0) {
return '';
}
- $condition = ['uid' => local_user(), 'id' => $posts];
+ $item_condition = ['uid' => local_user(), 'uri-id' => $posts];
} else {
- $condition = ['uid' => local_user()];
+ $item_params = ['order' => ['id' => true]];
+ $item_condition = ['uid' => local_user()];
+ $item_params['limit'] = [$pager->getStart(), $pager->getItemsPerPage()];
+
+ networkSetSeen(['unseen' => true, 'uid' => local_user()]);
}
- $params = ['order' => ['id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- $result = Item::selectForUser(local_user(), [], $condition, $params);
+ $result = Item::selectForUser(local_user(), [], $item_condition, $item_params);
$items = Item::inArray($result);
-
- $condition = ['unseen' => true, 'uid' => local_user()];
- networkSetSeen($condition);
-
$o .= networkConversation($a, $items, $pager, 'network-new', $update);
return $o;
}
/**
- * @brief Get the network content in threaded view
+ * Get the network content in threaded view
*
- * @global Pager $pager
* @param App $a The global App
* @param integer $update Used for the automatic reloading
* @param integer $parent
* @return string HTML of the network content in flat view
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @global Pager $pager
*/
function networkThreadedView(App $a, $update, $parent)
{
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
- if (is_a_date_arg($a->argv[$x])) {
+ if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
if ($datequery) {
$datequery2 = Strings::escapeHtml($a->argv[$x]);
} else {
}
} elseif (intval($a->argv[$x])) {
$gid = intval($a->argv[$x]);
- $default_permissions = ['allow_gid' => '<' . $gid . '>'];
+ $default_permissions['allow_gid'] = [$gid];
}
}
}
$o = '';
- $cid = intval(defaults($_GET, 'cid' , 0));
- $star = intval(defaults($_GET, 'star' , 0));
- $bmark = intval(defaults($_GET, 'bmark', 0));
- $conv = intval(defaults($_GET, 'conv' , 0));
- $order = Strings::escapeTags(defaults($_GET, 'order', 'comment'));
- $nets = defaults($_GET, 'nets' , '');
+ $cid = intval($_GET['contactid'] ?? 0);
+ $star = intval($_GET['star'] ?? 0);
+ $bmark = intval($_GET['bmark'] ?? 0);
+ $conv = intval($_GET['conv'] ?? 0);
+ $order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity');
+ $nets = $_GET['nets'] ?? '';
+ $allowedCids = [];
if ($cid) {
- $default_permissions = ['allow_cid' => '<' . intval($cid) . '>'];
+ $allowedCids[] = (int) $cid;
+ } elseif ($nets) {
+ $condition = [
+ 'uid' => local_user(),
+ 'network' => $nets,
+ 'self' => false,
+ 'blocked' => false,
+ 'pending' => false,
+ 'archive' => false,
+ 'rel' => [Contact::SHARING, Contact::FRIEND],
+ ];
+ $contactStmt = DBA::select('contact', ['id'], $condition);
+ while ($contact = DBA::fetch($contactStmt)) {
+ $allowedCids[] = (int) $contact['id'];
+ }
+ DBA::close($contactStmt);
}
- if ($nets) {
- $r = DBA::select('contact', ['id'], ['uid' => local_user(), 'network' => $nets], ['self' => false]);
-
- $str = '';
- while ($rr = DBA::fetch($r)) {
- $str .= '<' . $rr['id'] . '>';
- }
- if (strlen($str)) {
- $default_permissions = ['allow_cid' => $str];
- }
+ if (count($allowedCids)) {
+ $default_permissions['allow_cid'] = $allowedCids;
}
if (!$update && !$rawmode) {
$tabs = network_tabs($a);
$o .= $tabs;
- if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !PConfig::get(local_user(), 'system', 'nowarn_insecure')) {
- notice(L10n::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.",
- $t) . EOL);
- notice(L10n::t("Messages in this group won't be send to these receivers.").EOL);
- }
-
Nav::setSelected('network');
$content = '';
(strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
'default_perms' => ACL::getDefaultUserPermissions($a->user),
- 'acl' => ACL::getFullSelectorHTML($a->user, true, $default_permissions),
+ 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true, $default_permissions),
'bang' => (($gid || $cid || $nets) ? '!' : ''),
'visitor' => 'block',
'profile_uid' => local_user(),
$sql_extra3 = '';
$sql_table = '`thread`';
$sql_parent = '`iid`';
- $sql_order = '';
if ($update) {
$sql_table = '`item`';
$group = DBA::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
if (!DBA::isResult($group)) {
if ($update) {
- killme();
+ exit();
}
- notice(L10n::t('No such group') . EOL);
- $a->internalRedirect('network/0');
+ notice(DI::l10n()->t('No such group') . EOL);
+ DI::baseUrl()->redirect('network/0');
// NOTREACHED
}
- $contacts = Group::expand([$gid]);
+ $contacts = Group::expand(local_user(), [$gid]);
if ((is_array($contacts)) && count($contacts)) {
$contact_str_self = '';
$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '" . Strings::protectSprintf('%<' . intval($gid) . '>%') . "' AND `temp1`.`private`))";
} else {
$sql_extra3 .= " AND false ";
- info(L10n::t('Group is empty'));
+ info(DI::l10n()->t('Group is empty'));
}
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
- '$title' => L10n::t('Group: %s', $group['name'])
+ '$title' => DI::l10n()->t('Group: %s', $group['name'])
]) . $o;
} elseif ($cid) {
$fields = ['id', 'name', 'network', 'writable', 'nurl',
$entries[0] = [
'id' => 'network',
'name' => $contact['name'],
- 'itemurl' => defaults($contact, 'addr', $contact['nurl']),
+ 'itemurl' => ($contact['addr'] ?? '') ?: $contact['nurl'],
'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
'details' => $contact['location'],
];
'contacts' => $entries,
'id' => 'network',
]) . $o;
-
- if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
- notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL);
- }
} else {
- notice(L10n::t('Invalid contact.') . EOL);
- $a->internalRedirect('network');
+ notice(DI::l10n()->t('Invalid contact.') . EOL);
+ DI::baseUrl()->redirect('network');
// NOTREACHED
}
}
- if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
+ if (!$gid && !$cid && !$update && !DI::config()->get('theme', 'hide_eventlist')) {
$o .= Profile::getBirthdays();
$o .= Profile::getEventsReminderHTML();
}
if ($datequery) {
- $sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.created <= '%s' ",
+ $sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.received <= '%s' ",
DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
}
if ($datequery2) {
- $sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.created >= '%s' ",
+ $sql_extra3 .= Strings::protectSprintf(sprintf(" AND $sql_table.received >= '%s' ",
DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
}
// Normal conversation view
if ($order === 'post') {
- $ordering = '`created`';
- $order_mode = 'created';
+ $ordering = '`received`';
+ $order_mode = 'received';
} else {
$ordering = '`commented`';
$order_mode = 'commented';
$sql_range = '';
}
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
$pager_sql = networkPager($a, $pager, $update);
} else {
// Load all unseen items
$sql_extra4 = "`item`.`unseen`";
- if (Config::get("system", "like_no_comment")) {
+ if (DI::config()->get("system", "like_no_comment")) {
$sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
}
if ($order === 'post') {
// Only show toplevel posts when updating posts in this order mode
- $sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
+ $sql_extra4 .= " AND `item`.`gravity` = " . GRAVITY_PARENT;
}
}
// When checking for updates we need to fetch from the newest date to the newest date before
// Only do this, when the last stored date isn't too long ago (10 times the update interval)
- $browser_update = PConfig::get(local_user(), 'system', 'update_interval', 40000) / 1000;
+ $browser_update = DI::pConfig()->get(local_user(), 'system', 'update_interval', 40000) / 1000;
if (($browser_update > 0) && $update && !empty($_SESSION['network_last_date']) &&
(($bottom_limit < $_SESSION['network_last_date']) || ($top_limit == $bottom_limit)) &&
((time() - $_SESSION['network_last_date_timestamp']) < ($browser_update * 10))) {
$bottom_limit = $_SESSION['network_last_date'];
}
- $_SESSION['network_last_date'] = defaults($_SESSION, 'network_last_top_limit', $top_limit);
+ $_SESSION['network_last_date'] = Session::get('network_last_top_limit', $top_limit);
$_SESSION['network_last_date_timestamp'] = time();
if ($last_date > $top_limit) {
$top_limit = DateTimeFormat::utcNow();
}
+ // Handle bad performance situations when the distance between top and bottom is too high
+ // See issue https://github.com/friendica/friendica/issues/8619
+ if (strtotime($top_limit) - strtotime($bottom_limit) > 86400) {
+ // Set the bottom limit to one day in the past at maximum
+ $bottom_limit = DateTimeFormat::utc(date('c', strtotime($top_limit) - 86400));
+ }
+
$items = DBA::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
- STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
- (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
- ON `item`.`id` = `term`.`oid`
+ STRAIGHT_JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` IN
+ (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `uid` = 0) AS `tag-search`
+ ON `item`.`uri-id` = `tag-search`.`uri-id`
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
- WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
+ WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND `item`.`gravity` = ?
AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
- local_user(), TERM_OBJ_POST, TERM_HASHTAG,
- $top_limit, $bottom_limit);
+ local_user(), $top_limit, $bottom_limit, GRAVITY_PARENT);
$data = DBA::toArray($items);
$date_offset = $_GET['offset'];
}
- $query_string = $a->query_string;
+ $query_string = DI::args()->getQueryString();
if ($date_offset && !preg_match('/[?&].offset=/', $query_string)) {
$query_string .= '&offset=' . urlencode($date_offset);
}
}
/**
- * @brief Get the network tabs menu
+ * Get the network tabs menu
*
* @param App $a The global App
* @return string Html of the networktab
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function network_tabs(App $a)
{
// 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) = network_query_get_sel_tab($a);
+ /// DI::page()['content'] .= '<div class="tabs-wrapper">';
+ 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') {
$all_active = 'active';
}
- $cmd = $a->cmd;
+ $cmd = DI::args()->getCommand();
+
+ $def_param = [];
+ if (!empty($_GET['contactid'])) {
+ $def_param['contactid'] = $_GET['contactid'];
+ }
// tabs
$tabs = [
[
- 'label' => L10n::t('Commented Order'),
- 'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
+ 'label' => DI::l10n()->t('Latest Activity'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'activity'])),
'sel' => $all_active,
- 'title' => L10n::t('Sort by Comment Date'),
- 'id' => 'commented-order-tab',
+ 'title' => DI::l10n()->t('Sort by latest activity'),
+ 'id' => 'activity-order-tab',
'accesskey' => 'e',
],
[
- 'label' => L10n::t('Posted Order'),
- 'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
- 'sel' => $postord_active,
- 'title' => L10n::t('Sort by Post Date'),
- 'id' => 'posted-order-tab',
+ 'label' => DI::l10n()->t('Latest Posts'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'post'])),
+ 'sel' => $post_active,
+ 'title' => DI::l10n()->t('Sort by post received date'),
+ 'id' => 'post-order-tab',
'accesskey' => 't',
],
];
$tabs[] = [
- 'label' => L10n::t('Personal'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
+ 'label' => DI::l10n()->t('Personal'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['conv' => true])),
'sel' => $conv_active,
- 'title' => L10n::t('Posts that mention or involve you'),
+ 'title' => DI::l10n()->t('Posts that mention or involve you'),
'id' => 'personal-tab',
'accesskey' => 'r',
];
if (Feature::isEnabled(local_user(), 'new_tab')) {
$tabs[] = [
- 'label' => L10n::t('New'),
- 'url' => 'network/new' . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : ''),
+ 'label' => DI::l10n()->t('New'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['new' => true])),
'sel' => $new_active,
- 'title' => L10n::t('Activity Stream - by date'),
+ 'title' => DI::l10n()->t('Activity Stream - by date'),
'id' => 'activitiy-by-date-tab',
'accesskey' => 'w',
];
if (Feature::isEnabled(local_user(), 'link_tab')) {
$tabs[] = [
- 'label' => L10n::t('Shared Links'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
+ 'label' => DI::l10n()->t('Shared Links'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['bmark' => true])),
'sel' => $bookmarked_active,
- 'title' => L10n::t('Interesting Links'),
+ 'title' => DI::l10n()->t('Interesting Links'),
'id' => 'shared-links-tab',
'accesskey' => 'b',
];
}
$tabs[] = [
- 'label' => L10n::t('Starred'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
+ 'label' => DI::l10n()->t('Starred'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['star' => true])),
'sel' => $starred_active,
- 'title' => L10n::t('Favourite Posts'),
+ 'title' => DI::l10n()->t('Favourite Posts'),
'id' => 'starred-posts-tab',
'accesskey' => 'm',
];
// save selected tab, but only if not in file mode
if (empty($_GET['file'])) {
- PConfig::set(local_user(), 'network.view', 'tab.selected', [
- $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active
+ DI::pConfig()->set(local_user(), 'network.view', 'tab.selected', [
+ $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active
]);
}
$arr = ['tabs' => $tabs];
- Addon::callHooks('network_tabs', $arr);
+ Hook::callAll('network_tabs', $arr);
$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
* of the page to make the correct asynchronous call. This is obtained through the Pager that was instantiated in
* networkThreadedView or networkFlatView.
*
- * @global Pager $pager
- * @param App $a
+ * @param App $a
* @param string $htmlhead The head tag HTML string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @global Pager $pager
*/
function network_infinite_scroll_head(App $a, &$htmlhead)
{
/// @TODO this will have to be converted to a static property of the converted Module\Network class
+ /**
+ * @var $pager Pager
+ */
global $pager;
- if (PConfig::get(local_user(), 'system', 'infinite_scroll')
- && defaults($_GET, 'mode', '') != 'minimal'
+ if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')
+ && ($_GET['mode'] ?? '') != 'minimal'
) {
$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
$htmlhead .= Renderer::replaceMacros($tpl, [