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\Core\Session;
function network_init(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
- if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
+ if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
$is_a_date_query = true;
break;
}
$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');
// 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 = [
'order=activity', //all
'order=post', //postord
'conv=1', //conv
- '', //new
+ '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];
* '/network?order=activity' => $activity_active = 'active'
* '/network?order=post' => $postord_active = 'active'
* '/network?conv=1', => $conv_active = 'active'
- * '/network/new', => $new_active = 'active'
+ * '/network?new=1', => $new_active = 'active'
* '/network?star=1', => $starred_active = 'active'
* '/network?bmark=1', => $bookmarked_active = 'active'
*
$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';
}
}
/**
- * @brief Sets the pager data and returns SQL
+ * Sets the pager data and returns SQL
*
* @param App $a The global App
* @param Pager $pager
// check if we serve a mobile device and get the user settings
// accordingly
if (DI::mode()->isMobile()) {
- $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network');
+ $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network');
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
} else {
- $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network');
+ $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network');
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
}
}
/**
- * @brief Sets items as seen
+ * Sets items as seen
*
* @param array $condition The array with the SQL condition
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
}
/**
- * @brief Create the conversation HTML
+ * Create the conversation HTML
*
* @param App $a The global App
* @param array $items Items of the conversation
$o = conversation($a, $items, $pager, $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));
$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 App $a The global App
* @param integer $update Used for the automatic reloading
$o .= status_editor($a, $x);
- if (!Config::get('theme', 'hide_eventlist')) {
+ if (!DI::config()->get('theme', 'hide_eventlist')) {
$o .= Profile::getBirthdays();
$o .= Profile::getEventsReminderHTML();
}
}
/**
- * @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
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
- if (DI::dtFormat()->isYearMonth($a->argv[$x])) {
+ if (DI::dtFormat()->isYearMonthDay($a->argv[$x])) {
if ($datequery) {
$datequery2 = Strings::escapeHtml($a->argv[$x]);
} else {
$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.",
+ if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure')) {
+ notice(DI::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);
+ notice(DI::l10n()->t("Messages in this group won't be send to these receivers.").EOL);
}
Nav::setSelected('network');
if ($update) {
exit();
}
- notice(L10n::t('No such group') . EOL);
+ notice(DI::l10n()->t('No such group') . EOL);
DI::baseUrl()->redirect('network/0');
// NOTREACHED
}
$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',
'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);
+ if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !DI::pConfig()->get(local_user(),'system','nowarn_insecure')) {
+ notice(DI::l10n()->t('Private messages to this person are at risk of public disclosure.') . EOL);
}
} else {
- notice(L10n::t('Invalid contact.') . EOL);
+ 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();
}
} 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') {
// 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)) &&
}
/**
- * @brief Get the network tabs menu
+ * Get the network tabs menu
*
* @param App $a The global App
* @return string Html of the networktab
{
// item filter tabs
/// @TODO fix this logic, reduce duplication
- /// $a->page['content'] .= '<div class="tabs-wrapper">';
+ /// 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 activitys
$cmd = DI::args()->getCommand();
+ $def_param = [];
+ if (!empty($_GET['cid'])) {
+ $def_param['cid'] = $_GET['cid'];
+ }
+
// tabs
$tabs = [
[
- 'label' => L10n::t('Latest Activity'),
- 'url' => str_replace('/new', '', $cmd) . '?order=activity' . (!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 latest activity'),
+ 'title' => DI::l10n()->t('Sort by latest activity'),
'id' => 'activity-order-tab',
'accesskey' => 'e',
],
[
- 'label' => L10n::t('Latest Posts'),
- 'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
+ 'label' => DI::l10n()->t('Latest Posts'),
+ 'url' => $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'post'])),
'sel' => $post_active,
- 'title' => L10n::t('Sort by post received date'),
+ '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']) ? '/?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']) ? '/?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']) ? '/?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']) ? '/?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', [
+ DI::pConfig()->set(local_user(), 'network.view', 'tab.selected', [
$all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active
]);
}
*/
global $pager;
- if (PConfig::get(local_user(), 'system', 'infinite_scroll')
+ if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')
&& ($_GET['mode'] ?? '') != 'minimal'
) {
$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');