X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=0308e4a10e121a715eebac3612505a8965e9e6e5;hb=418c2edb50ce948f687400eea01b2dc875c1ab1f;hp=b5c218de24a0a80b550887d11a5b54610190fcd6;hpb=3dede5dbd2120e617e4cf23ca90fa1cbd18c789f;p=friendica.git diff --git a/mod/network.php b/mod/network.php index b5c218de24..d82072754c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -1,73 +1,68 @@ . + * */ use Friendica\App; -use Friendica\Content\Feature; use Friendica\Content\ForumManager; use Friendica\Content\Nav; use Friendica\Content\Pager; use Friendica\Content\Widget; use Friendica\Content\Text\HTML; use Friendica\Core\ACL; -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\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.')); 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; } @@ -76,16 +71,14 @@ function network_init(App $a) // 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'); @@ -98,31 +91,19 @@ function network_init(App $a) 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 + 'star=1', //starred ]; $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]; @@ -139,116 +120,67 @@ function network_init(App $a) 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?star=1', => $starred_active = 'active' * * @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, $starred_active); */ function network_query_get_sel_tab(App $a) { $no_active = ''; $starred_active = ''; - $new_active = ''; - $bookmarked_active = ''; $all_active = ''; $conv_active = ''; $postord_active = ''; - if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) { - $new_active = 'active'; - } - if (!empty($_GET['star'])) { $starred_active = 'active'; } - if (!empty($_GET['bmark'])) { - $bookmarked_active = 'active'; - } - if (!empty($_GET['conv'])) { $conv_active = 'active'; } - if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '')) { + if (($starred_active == '') && ($conv_active == '')) { $no_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; } } - return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active]; + return [$no_active, $all_active, $postord_active, $conv_active, $starred_active]; } function network_query_get_sel_group(App $a) @@ -263,7 +195,7 @@ function network_query_get_sel_group(App $a) } /** - * @brief Sets the pager data and returns SQL + * Sets the pager data and returns SQL * * @param App $a The global App * @param Pager $pager @@ -278,14 +210,12 @@ 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 @@ -300,7 +230,7 @@ function networkPager(App $a, Pager $pager, $update) } /** - * @brief Sets items as seen + * Sets items as seen * * @param array $condition The array with the SQL condition * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -319,7 +249,7 @@ function networkSetSeen($condition) } /** - * @brief Create the conversation HTML + * Create the conversation HTML * * @param App $a The global App * @param array $items Items of the conversation @@ -337,14 +267,14 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde $a->page_contact = $a->contact; if (!is_array($items)) { - Logger::log("Expecting items to be an array. Got " . print_r($items, true)); + Logger::info('Expecting items to be an array.', ['items' => $items]); $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)); @@ -361,38 +291,24 @@ function network_content(App $a, $update = 0, $parent = 0) } /// @TODO Is this really necessary? $a is already available to hooks - $arr = ['query' => $a->query_string]; + $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) { $o = networkFlatView($a, $update); } else { $o = networkThreadedView($a, $update, $parent); } if ($o === '') { - info("No items found"); + notice(DI::l10n()->t("No items found")); } return $o; } /** - * @brief Get the network content in flat view + * Get the network content in flat view * * @param App $a The global App * @param integer $update Used for the automatic reloading @@ -409,7 +325,7 @@ function networkFlatView(App $a, $update = 0) $o = ''; - $file = defaults($_GET, 'file', ''); + $file = $_GET['file'] ?? ''; if (!$update && !$rawmode) { $tabs = network_tabs($a); @@ -426,7 +342,7 @@ function networkFlatView(App $a, $update = 0) (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(), @@ -435,50 +351,50 @@ function networkFlatView(App $a, $update = 0) $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); + 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, $params); + $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 * * @param App $a The global App * @param integer $update Used for the automatic reloading @@ -516,7 +432,7 @@ 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 { @@ -532,40 +448,40 @@ function networkThreadedView(App $a, $update, $parent) $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); + $conv = intval($_GET['conv'] ?? 0); + $order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity'); + $nets = $_GET['nets'] ?? ''; + $allowedCids = []; if ($cid) { - $default_permissions['allow_cid'] = [(int) $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[] = (int) $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 = ''; @@ -592,7 +508,7 @@ function networkThreadedView(App $a, $update, $parent) (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(), @@ -608,7 +524,6 @@ function networkThreadedView(App $a, $update, $parent) $sql_post_table = ''; $sql_options = ($star ? " AND `thread`.`starred` " : ''); - $sql_options .= ($bmark ? sprintf(" AND `thread`.`post-type` = %d ", Item::PT_PAGE) : ''); $sql_extra = $sql_options; $sql_extra2 = ''; $sql_extra3 = ''; @@ -622,7 +537,6 @@ function networkThreadedView(App $a, $update, $parent) } $sql_nets = (($nets) ? sprintf(" AND $sql_table.`network` = '%s' ", DBA::escape($nets)) : ''); - $sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", DBA::escape($nets)) : ''); if ($gid) { $group = DBA::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]); @@ -630,12 +544,12 @@ function networkThreadedView(App $a, $update, $parent) if ($update) { exit(); } - notice(L10n::t('No such group') . EOL); - $a->internalRedirect('network/0'); + notice(DI::l10n()->t('No such group')); + 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 = ''; @@ -651,11 +565,11 @@ function networkThreadedView(App $a, $update, $parent) $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')); + notice(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', @@ -668,8 +582,8 @@ function networkThreadedView(App $a, $update, $parent) $entries[0] = [ 'id' => 'network', 'name' => $contact['name'], - 'itemurl' => defaults($contact, 'addr', $contact['nurl']), - 'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB), + 'itemurl' => ($contact['addr'] ?? '') ?: $contact['nurl'], + 'thumb' => Contact::getThumb($contact), 'details' => $contact['location'], ]; @@ -679,28 +593,24 @@ function networkThreadedView(App $a, $update, $parent) '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.')); + 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())))); } @@ -710,8 +620,8 @@ function networkThreadedView(App $a, $update, $parent) // Normal conversation view if ($order === 'post') { - $ordering = '`created`'; - $order_mode = 'created'; + $ordering = '`received`'; + $order_mode = 'received'; } else { $ordering = '`commented`'; $order_mode = 'commented'; @@ -725,7 +635,7 @@ function networkThreadedView(App $a, $update, $parent) $sql_range = ''; } - $pager = new Pager($a->query_string); + $pager = new Pager(DI::l10n(), DI::args()->getQueryString()); $pager_sql = networkPager($a, $pager, $update); @@ -773,12 +683,12 @@ function networkThreadedView(App $a, $update, $parent) } 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; } } @@ -824,72 +734,6 @@ function networkThreadedView(App $a, $update, $parent) ); } - // Only show it when unfiltered (no groups, no networks, ...) - if (in_array($nets, ['', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) { - if (DBA::isResult($r)) { - $top_limit = current($r)['order_date']; - $bottom_limit = end($r)['order_date']; - if (empty($_SESSION['network_last_top_limit']) || ($_SESSION['network_last_top_limit'] < $top_limit)) { - $_SESSION['network_last_top_limit'] = $top_limit; - } - } else { - $top_limit = $bottom_limit = DateTimeFormat::utcNow(); - } - - // 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; - - 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_timestamp'] = time(); - - if ($last_date > $top_limit) { - $top_limit = $last_date; - } elseif ($pager->getPage() == 1) { - // Highest possible top limit when we are on the first page - $top_limit = DateTimeFormat::utcNow(); - } - - $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 `contact` AS `author` ON `author`.`id` = `item`.`author-id` - WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? - AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets, - local_user(), TERM_OBJ_POST, TERM_HASHTAG, - $top_limit, $bottom_limit); - - $data = DBA::toArray($items); - - if (count($data) > 0) { - $tag_top_limit = current($data)['order_date']; - if ($_SESSION['network_last_date'] < $tag_top_limit) { - $_SESSION['network_last_date'] = $tag_top_limit; - } - - Logger::log('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update); - $s = []; - foreach ($r as $item) { - $s[$item['uri']] = $item; - } - foreach ($data as $item) { - // Don't show hash tag posts from blocked or ignored contacts - $condition = ["`nurl` = ? AND `uid` = ? AND (`blocked` OR `readonly`)", - Strings::normaliseLink($item['author-link']), local_user()]; - if (!DBA::exists('contact', $condition)) { - $s[$item['uri']] = $item; - } - } - $r = $s; - } - } - $parents_str = ''; $date_offset = ''; @@ -913,7 +757,7 @@ function networkThreadedView(App $a, $update, $parent) $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); } @@ -940,7 +784,7 @@ function networkThreadedView(App $a, $update, $parent) } /** - * @brief Get the network tabs menu + * Get the network tabs menu * * @param App $a The global App * @return string Html of the networktab @@ -950,80 +794,63 @@ function network_tabs(App $a) { // item filter tabs /// @TODO fix this logic, reduce duplication - /// $a->page['content'] .= '