diff options
| author | 2024-02-26 09:01:03 +0100 | |
|---|---|---|
| committer | 2024-02-26 09:01:03 +0100 | |
| commit | 39cc1c11ec596176e842cc98e6a54337e3c04d7e (patch) | |
| tree | dab89beb80268acb5e4bd58dfc55297bd30a8486 /app/layout/nav_menu.phtml | |
| parent | 25166c218be4e1ce1cb098de274a231b623d527e (diff) | |
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
Diffstat (limited to 'app/layout/nav_menu.phtml')
| -rw-r--r-- | app/layout/nav_menu.phtml | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 3d0027f17..f8b687f74 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -41,26 +41,15 @@ <li class="item"> <span> <form action="<?= _url('index', 'index') ?>" method="get"> - <?php $param_a = Minz_Request::actionName(); ?> - <?php if (in_array($param_a, ['normal', 'global', 'reader'], true)) { ?> - <input type="hidden" name="a" value="<?= $param_a ?>" /> + <?php if (in_array(Minz_Request::actionName(), ['normal', 'global', 'reader'], true)) { ?> + <input type="hidden" name="a" value="<?= Minz_Request::actionName() ?>" /> + <?php } if (Minz_Request::paramString('get') !== '') { ?> + <input type="hidden" name="get" value="<?= FreshRSS_Context::currentGet() ?>" /> + <?php } if (ctype_upper(Minz_Request::paramString('order'))) { ?> + <input type="hidden" name="order" value="<?= FreshRSS_Context::$order ?>" /> + <?php } if (Minz_Request::paramInt('state') !== 0) { ?> + <input type="hidden" name="state" value="<?= FreshRSS_Context::$state ?>" /> <?php } ?> - - <?php $get = Minz_Request::paramString('get'); ?> - <?php if ($get !== '') { ?> - <input type="hidden" name="get" value="<?= $get ?>" /> - <?php } ?> - - <?php $order = Minz_Request::paramString('order'); ?> - <?php if ($order !== '') { ?> - <input type="hidden" name="order" value="<?= $order ?>" /> - <?php } ?> - - <?php $state = Minz_Request::paramString('state'); ?> - <?php if ($state !== '') { ?> - <input type="hidden" name="state" value="<?= $state ?>" /> - <?php } ?> - <div class="stick search"> <input type="search" name="search" value="<?= htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" @@ -89,7 +78,7 @@ <?php if (!empty($raw_query['url'])): ?> <a href="<?= $raw_query['url'] ?>"><?= $raw_query['name'] ?? $raw_query['url'] ?></a> <?php else: ?> - <?php $query = new FreshRSS_UserQuery($raw_query); ?> + <?php $query = new FreshRSS_UserQuery($raw_query, FreshRSS_Context::categories(), FreshRSS_Context::labels()); ?> <a href="<?= $query->getUrl() ?>"><?= $query->getName() ?></a> <?php endif; ?> </li> @@ -210,20 +199,6 @@ <?php } ?> - - <?php - $url_output['a'] = 'rss'; - if (FreshRSS_Context::userConf()->token) { - $url_output['params']['user'] = Minz_User::name(); - $url_output['params']['token'] = FreshRSS_Context::userConf()->token; - } - if (FreshRSS_Context::userConf()->since_hours_posts_per_rss) { - $url_output['params']['hours'] = FreshRSS_Context::userConf()->since_hours_posts_per_rss; - } - ?> - <a class="view-rss btn" target="_blank" rel="noreferrer" title="<?= _t('index.menu.rss_view') ?>" href="<?= Minz_Url::display($url_output) ?>"> - <?= _i('rss') ?> - </a> </div> <?php $nav_menu_hooks = Minz_ExtensionManager::callHookString('nav_menu'); ?> |
