Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 05:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove "f=&" nonsense from network module

Browse source 
- Fixes wrong redirect when using the sidebar filters
This commit is contained in:
Hypolite Petovan 2019-05-27 17:19:38 -04:00
parent cd05d15b04
commit ed768c71ee
8 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mod/network.php
View file

@ -77,9 +77,7 @@ 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); parse_str(parse_url($a->query_string, PHP_URL_QUERY), $query_array);
parse_str($query_string, $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) {
@ -99,7 +97,7 @@ function network_init(App $a)
if ($remember_tab) { if ($remember_tab) {
// redirect if current selected tab is '/network' and // redirect if current selected tab is '/network' and
// last selected tab is _not_ '/network?f=&order=comment'. // last selected tab is _not_ '/network?order=comment'.
// and this isn't a date query // and this isn't a date query
$tab_baseurls = [ $tab_baseurls = [
@ -111,12 +109,12 @@ function network_init(App $a)
'', //bookmarked '', //bookmarked
]; ];
$tab_args = [ $tab_args = [
'f=&order=comment', //all 'order=comment', //all
'f=&order=post', //postord 'order=post', //postord
'f=&conv=1', //conv 'conv=1', //conv
'', //new '', //new
'f=&star=1', //starred 'star=1', //starred
'f=&bmark=1', //bookmarked 'bmark=1', //bookmarked
]; ];
$k = array_search('active', $last_sel_tabs); $k = array_search('active', $last_sel_tabs);
@ -202,12 +200,12 @@ function saved_searches($search)
* *
* urls -> returns * urls -> returns
* '/network' => $no_active = 'active' * '/network' => $no_active = 'active'
* '/network?f=&order=comment' => $comment_active = 'active' * '/network?order=comment' => $comment_active = 'active'
* '/network?f=&order=post' => $postord_active = 'active' * '/network?order=post' => $postord_active = 'active'
* '/network?f=&conv=1', => $conv_active = 'active' * '/network?conv=1', => $conv_active = 'active'
* '/network/new', => $new_active = 'active' * '/network/new', => $new_active = 'active'
* '/network?f=&star=1', => $starred_active = 'active' * '/network?star=1', => $starred_active = 'active'
* '/network?f=&bmark=1', => $bookmarked_active = 'active' * '/network?bmark=1', => $bookmarked_active = 'active'
* *
* @param App $a * @param App $a
* @return array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active); * @return array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
@ -973,7 +971,7 @@ function network_tabs(App $a)
$tabs = [ $tabs = [
[ [
'label' => L10n::t('Commented Order'), 'label' => L10n::t('Commented Order'),
'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'url' => str_replace('/new', '', $cmd) . '?order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $all_active, 'sel' => $all_active,
'title' => L10n::t('Sort by Comment Date'), 'title' => L10n::t('Sort by Comment Date'),
'id' => 'commented-order-tab', 'id' => 'commented-order-tab',
@ -981,7 +979,7 @@ function network_tabs(App $a)
], ],
[ [
'label' => L10n::t('Posted Order'), 'label' => L10n::t('Posted Order'),
'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''), 'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $postord_active, 'sel' => $postord_active,
'title' => L10n::t('Sort by Post Date'), 'title' => L10n::t('Sort by Post Date'),
'id' => 'posted-order-tab', 'id' => 'posted-order-tab',
@ -991,7 +989,7 @@ function network_tabs(App $a)
$tabs[] = [ $tabs[] = [
'label' => L10n::t('Personal'), 'label' => L10n::t('Personal'),
'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
'sel' => $conv_active, 'sel' => $conv_active,
'title' => L10n::t('Posts that mention or involve you'), 'title' => L10n::t('Posts that mention or involve you'),
'id' => 'personal-tab', 'id' => 'personal-tab',
@ -1001,7 +999,7 @@ function network_tabs(App $a)
if (Feature::isEnabled(local_user(), 'new_tab')) { if (Feature::isEnabled(local_user(), 'new_tab')) {
$tabs[] = [ $tabs[] = [
'label' => L10n::t('New'), 'label' => L10n::t('New'),
'url' => 'network/new' . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : ''), 'url' => 'network/new' . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : ''),
'sel' => $new_active, 'sel' => $new_active,
'title' => L10n::t('Activity Stream - by date'), 'title' => L10n::t('Activity Stream - by date'),
'id' => 'activitiy-by-date-tab', 'id' => 'activitiy-by-date-tab',
@ -1012,7 +1010,7 @@ function network_tabs(App $a)
if (Feature::isEnabled(local_user(), 'link_tab')) { if (Feature::isEnabled(local_user(), 'link_tab')) {
$tabs[] = [ $tabs[] = [
'label' => L10n::t('Shared Links'), 'label' => L10n::t('Shared Links'),
'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
'sel' => $bookmarked_active, 'sel' => $bookmarked_active,
'title' => L10n::t('Interesting Links'), 'title' => L10n::t('Interesting Links'),
'id' => 'shared-links-tab', 'id' => 'shared-links-tab',
@ -1022,7 +1020,7 @@ function network_tabs(App $a)
$tabs[] = [ $tabs[] = [
'label' => L10n::t('Starred'), 'label' => L10n::t('Starred'),
'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&star=1',
'sel' => $starred_active, 'sel' => $starred_active,
'title' => L10n::t('Favourite Posts'), 'title' => L10n::t('Favourite Posts'),
'id' => 'starred-posts-tab', 'id' => 'starred-posts-tab',

8
src/App.php
View file

@ -1104,7 +1104,7 @@ class App
// Compatibility with the Android Diaspora client // Compatibility with the Android Diaspora client
if ($this->module == 'stream') { if ($this->module == 'stream') {
$this->internalRedirect('network?f=&order=post'); $this->internalRedirect('network?order=post');
} }
if ($this->module == 'conversations') { if ($this->module == 'conversations') {
@ -1112,15 +1112,15 @@ class App
} }
if ($this->module == 'commented') { if ($this->module == 'commented') {
$this->internalRedirect('network?f=&order=comment'); $this->internalRedirect('network?order=comment');
} }
if ($this->module == 'liked') { if ($this->module == 'liked') {
$this->internalRedirect('network?f=&order=comment'); $this->internalRedirect('network?order=comment');
} }
if ($this->module == 'activity') { if ($this->module == 'activity') {
$this->internalRedirect('network/?f=&conv=1'); $this->internalRedirect('network?conv=1');
} }
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) { if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {

2
src/Content/ForumManager.php
View file

@ -111,7 +111,7 @@ class ForumManager
$selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [ $entry = [
'url' => 'network?f=&cid=' . $contact['id'], 'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']), 'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'], 'name' => $contact['name'],
'cid' => $contact['id'], 'cid' => $contact['id'],

2
src/Module/Filer/RemoveTag.php
View file

@ -46,6 +46,6 @@ class RemoveTag extends BaseModule
info('Item was not deleted'); info('Item was not deleted');
} }
$app->internalRedirect('/network?f=&file=' . rawurlencode($term)); $app->internalRedirect('network?file=' . rawurlencode($term));
} }
} }

2
view/templates/saved_searches_aside.tpl
View file

@ -6,7 +6,7 @@
<ul role="menu" id="saved-search-ul"> <ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}} {{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear"> <li role="menuitem" class="saved-search-li clear">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a> <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network?remove=1&amp;search={{$search.encodedterm}}"></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>
</li> </li>
{{/foreach}} {{/foreach}}

2
view/theme/frio/templates/saved_searches_aside.tpl
View file

@ -6,7 +6,7 @@
<ul role="menu" id="saved-search-ul"> <ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}} {{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear"> <li role="menuitem" class="saved-search-li clear">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"> <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network?remove=1&amp;search={{$search.encodedterm}}">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</a> </a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>

2
view/theme/quattro/templates/saved_searches_aside.tpl
View file

@ -5,7 +5,7 @@
{{foreach $saved as $search}} {{foreach $saved as $search}}
<li class="tool {{if $search.selected}}selected{{/if}}"> <li class="tool {{if $search.selected}}selected{{/if}}">
<a href="search?search={{$search.encodedterm}}" class="label" >{{$search.term}}</a> <a href="search?search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a> <a href="network?remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
</li> </li>
{{/foreach}} {{/foreach}}
</ul> </ul>

2
view/theme/vier/theme.php
View file

@ -230,7 +230,7 @@ function vier_community_info()
$selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [ $entry = [
'url' => 'network?f=&cid=' . $contact['id'], 'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']), 'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'], 'name' => $contact['name'],
'cid' => $contact['id'], 'cid' => $contact['id'],