From 39cc1c11ec596176e842cc98e6a54337e3c04d7e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 26 Feb 2024 09:01:03 +0100 Subject: New feature: shareable user query (#6052) * New feature: shareable user query Share the output of a user query by RSS / HTML / OPML with other people through unique URLs. Replaces the global admin token, which was the only option (but unsafe) to share RSS outputs with other people. Also add a new HTML output for people without an RSS reader. fix https://github.com/FreshRSS/FreshRSS/issues/3066#issuecomment-648977890 fix https://github.com/FreshRSS/FreshRSS/issues/3178#issuecomment-769435504 * Remove unused method * Fix token saving * Implement HTML view * Update i18n for master token * Revert i18n get_favorite * Fix missing i18n for user queries from before this PR * Remove irrelevant tests * Add link to RSS version * Fix getGet * Fix getState * Fix getSearch * Alternative getSearch * Default getOrder * Explicit default state * Fix test * Add OPML sharing * Remove many redundant SQL queries from original implementation of user queries * Fix article tags * Use default user settings * Prepare public search * Fixes * Allow user search on article tags * Implement user search * Revert filter bug * Revert wrong SQL left outer join change * Implement checkboxes * Safe check of OPML * Fix label * Remove RSS button to favour new sharing method That sharing button was using a global admin token * First version of HTTP 304 * Disallow some recusrivity fix https://github.com/FreshRSS/FreshRSS/issues/6086 * Draft of nav * Minor httpConditional * Add support for offset for pagination * Fix offset pagination * Fix explicit order ASC * Add documentation * Help links i18n * Note about deprecated master token * Typo * Doc about format --- app/i18n/en/admin.php | 4 ++-- app/i18n/en/conf.php | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'app/i18n/en') diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 20fa0e6c6..4ce82a3ff 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -19,8 +19,8 @@ return array( 'http' => 'HTTP (for advanced users with HTTPS)', 'none' => 'None (dangerous)', 'title' => 'Authentication', - 'token' => 'Authentication token', - 'token_help' => 'Allows access to RSS output of the default user without authentication:', + 'token' => 'Master authentication token', + 'token_help' => 'Allows access to all RSS outputs of the user as well as refreshing feeds without authentication:', 'type' => 'Authentication method', 'unsafe_autologin' => 'Allow unsafe automatic login using the format: ', ), diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 1b3c14391..dfe8fca51 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -120,20 +120,33 @@ return array( 'feeds' => 'Display by feed', 'order' => 'Sort by date', 'search' => 'Expression', + 'shareOpml' => 'Enable sharing by OPML of corresponding categories and feeds', + 'shareRss' => 'Enable sharing by HTML & RSS', 'state' => 'State', 'tags' => 'Display by label', 'type' => 'Type', ), 'get_all' => 'Display all articles', + 'get_all_labels' => 'Display articles with any label', 'get_category' => 'Display “%s” category', 'get_favorite' => 'Display favourite articles', 'get_feed' => 'Display “%s” feed', + 'get_important' => 'Display articles from important feeds', + 'get_label' => 'Display articles with “%s” label', + 'help' => 'See the documentation for user queries and resharing by HTML / RSS / OPML.', 'name' => 'Name', 'no_filter' => 'No filter', 'number' => 'Query n°%d', 'order_asc' => 'Display oldest articles first', 'order_desc' => 'Display newest articles first', 'search' => 'Search for “%s”', + 'share' => array( + '_' => 'Share this query by link', + 'help' => 'Give this link if you want to share this query with anyone', + 'html' => 'Shareable link to the HTML page', + 'opml' => 'Shareable link to the OPML list of feeds', + 'rss' => 'Shareable link to the RSS feed', + ), 'state_0' => 'Display all articles', 'state_1' => 'Display read articles', 'state_2' => 'Display unread articles', -- cgit v1.2.3