Implement sort order per feed (#8234)

* added local feed sorting

Addresses https://github.com/FreshRSS/FreshRSS/issues/4761

- Added number of sorted feeds and associative array for feed sorting option in Context.
- Number of sorted feeds and local sorting option by its index saved into Minz Request Parameters.
- Number of sorted feeds and local sorting options deleted when choosing another Option Of Global Sorting.
- Added option of allowing sorting by feed in configuration.
- Added variable for allowing local sorting in userConf.
- Added function to get feeds by current get in context.
- Added menu button for all individual feed sorting.
- New database options for individual feed sorting in EntryDAO.
- Considered choosing new entries based on chosen load limit.
- Local sorting parameter saved into continuation value in Index Controller.

How to test the feature manually:

1. At the bottom of Reading Configuration menu turn on individual sorting option menu 
2. Choose Sorting by feed option
3. Choose feed at next sorting menu and choose sorting option for that feed

* added feed sorting option

* added sort feeds display

* added template for sort feed name

* added title to feed sorting button

* added comments

* added local sorting option

* Added Docs

* css reset

* added getter and seter for local sort

* added getter and seter for local sort

* allowed sorting per feed

* allowed sorting per feed

* added sorting option for category

* deleted changes from NetryDAO

* add setting up sorting for category

* docs reset

* i18 reset

* updated i18 for category

* added i18 for categories

* added i18 for category

* added setting sorting for feeds and category

* removing userConf.allow-local-sort

* removing userConf.allow-local-sort

* removing white space

* added credits

* removed feeds_by_get

* removed whitespace

* changed escaping for values

* added escaping to user set values

* added in_array

* added secondary sort and order

* added secondary sort and order

* fixed readme

* removed whitespace change

* reseted i18n

* added translations

* added feed setting translations

* fixed i18n

* fixed i18n

* changes in sort order per feed

* changes in sort order per feed

* added secondary sort order

* primary sort

* changed to preferred sort order

* i18n

* Revert wrong whitespace changes

* Re-order new options

* added blank option

* fixed escaping

* fixed default sort in feed

* fixed default sort recovery

* siplyfied option

* added rand option

* Revert unrelated change

* Minor plaintext

* Whitespace and formatting fixes

* Avoid unneeded SQL requests and processing

* Improve syntax

* Improve logic

* Reuse existing translations as much as possible

* i18n

* Remove some options that make little sense

* Separators

* Fix old transation key

* Add help messages

* Progress on secondary sort

* raw name

* Pass parameters. Add TODO

* Progress

* Minor ordering

* Fix parenthesis

---------

Co-authored-by: root <root@LAPTOP-C8TCHHPN.localdomain>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

5 files changed, 16 insertions, 14 deletions

diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 76428bd67..87acd07ba 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -31,7 +31,7 @@ return array(
 		'empty_list' => 'There are no installed extensions',
 		'empty_list_help' => 'Check the logs to determine the reason behind the empty extension list.',
 		'enabled' => 'Enabled',
-		'is_compatible' => 'Is compatible',	// TODO
+		'is_compatible' => 'Is compatible',
 		'latest' => 'Installed',
 		'name' => 'Name',
 		'no_configure_view' => 'This extension cannot be configured.',
diff --git a/app/i18n/en/api.php b/app/i18n/en/api.php
index f630eb1be..1350a0bde 100644
--- a/app/i18n/en/api.php
+++ b/app/i18n/en/api.php
@@ -14,10 +14,10 @@ return array(
 	'information' => array(
 		'address' => 'Your API address:',
 		'output' => array(
-			'encoding-support' => '⚠️ WARN: no <code>%2F</code> support, some clients might not work!',	// TODO
-			'invalid-configuration' => '⚠️ WARN: Probable invalid base URL in ./data/config.php',	// TODO
-			'pass' => '✔️ PASS',	// TODO
-			'unknown-error' => '❌ ',	// TODO
+			'encoding-support' => '⚠️ WARN: no <code>%2F</code> support, some clients might not work!',
+			'invalid-configuration' => '⚠️ WARN: Probable invalid base URL in ./data/config.php',
+			'pass' => '✔️ PASS',
+			'unknown-error' => '❌ ',
 		),
 		'test' => array(
 			'fever' => 'Fever API configuration test:',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index bfc32ec3a..c85a5e0c2 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -294,11 +294,6 @@ return array(
 		),
 		'show_fav_unread_help' => 'Applies also on labels',
 		'sides_close_article' => 'Clicking outside of article text area closes the article',
-		'sort' => array(
-			'_' => 'Sort order',
-			'newer_first' => 'Newest first',
-			'older_first' => 'Oldest first',
-		),
 		'star' => array(
 			'when' => 'Mark an article as favourite…',
 		),
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index fed6491f7..0506854fa 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -77,23 +77,22 @@ return array(
 		'mark_feed_read' => 'Mark feed as read',
 		'mark_selection_unread' => 'Mark selection as unread',
 		'mylabels' => 'My labels',
-		'newer_first' => 'Newer first',
 		'non-starred' => 'Show non-favourites',
 		'normal_view' => 'Normal view',
-		'older_first' => 'Oldest first',
 		'queries' => 'User queries',
 		'read' => 'Show read',
 		'reader_view' => 'Reading view',
 		'rss_view' => 'RSS feed',
 		'search_short' => 'Search',
 		'sort' => array(
-			'_' => 'Sorting criteria',
+			'asc' => 'Ascending',
 			'c' => array(
 				'name_asc' => 'Category, feed titles A→Z',
 				'name_desc' => 'Category, feed titles Z→A',
 			),
 			'date_asc' => 'Publication date 1→9',
 			'date_desc' => 'Publication date 9→1',
+			'desc' => 'Descending',
 			'f' => array(
 				'name_asc' => 'Feed title A→Z',
 				'name_desc' => 'Feed title Z→A',
@@ -104,7 +103,15 @@ return array(
 			'length_desc' => 'Content length 9→1',
 			'link_asc' => 'Link A→Z',
 			'link_desc' => 'Link Z→A',
+			'primary' => array(
+				'_' => 'Sorting criterion',
+				'help' => 'Sorting by <em>received</em> date is recommended in most cases, for consistency and performance',
+			),
 			'rand' => 'Random order',
+			'secondary' => array(
+				'_' => 'Secondary sorting criterion',
+				'help' => 'Only relevant when the primary sorting criterion is categories or feeds titles',
+			),
 			'title_asc' => 'Title A→Z',
 			'title_desc' => 'Title Z→A',
 			'user_modified_asc' => 'User modified 1→9',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 7560dc90c..0d930534b 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -211,7 +211,7 @@ return array(
 		'priority' => array(
 			'_' => 'Visibility',
 			'category' => 'Show in its category',
-			'feed' => 'Show in its feed',	// TODO
+			'feed' => 'Show in its feed',
 			'hidden' => 'Do not show',
 			'important' => 'Show in important feeds',
 			'main_stream' => 'Show in main stream',