diff options
| -rw-r--r-- | app/Models/CategoryDAO.php | 6 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 4 | ||||
| -rw-r--r-- | docs/en/users/user_queries.md | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php index 90c3db30d..da770ade7 100644 --- a/app/Models/CategoryDAO.php +++ b/app/Models/CategoryDAO.php @@ -281,7 +281,7 @@ SQL; public function listCategories(bool $prePopulateFeeds = true, bool $details = false): array { if ($prePopulateFeeds) { $sql = 'SELECT c.id AS c_id, c.name AS c_name, c.kind AS c_kind, c.`lastUpdate` AS c_last_update, c.error AS c_error, c.attributes AS c_attributes, ' - . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.kind, f.website, f.priority, f.error, f.`cache_nbEntries`, f.`cache_nbUnreads`, f.ttl ') + . ($details ? 'f.* ' : 'f.id, f.name, f.url, f.kind, f.website, f.priority, f.error, f.attributes, f.`cache_nbEntries`, f.`cache_nbUnreads`, f.ttl ') . 'FROM `_category` c ' . 'LEFT OUTER JOIN `_feed` f ON f.category=c.id ' . 'WHERE f.priority >= :priority ' @@ -292,7 +292,7 @@ SQL; if ($stm !== false && $stm->execute($values)) { $res = $stm->fetchAll(PDO::FETCH_ASSOC) ?: []; /** @var array<array{'c_name':string,'c_id':int,'c_kind':int,'c_last_update':int,'c_error':int|bool,'c_attributes'?:string, - * 'id'?:int,'name'?:string,'url'?:string,'kind'?:int,'category'?:int,'website'?:string,'priority'?:int,'error'?:int|bool,'cache_nbEntries'?:int,'cache_nbUnreads'?:int,'ttl'?:int}> $res */ + * 'id'?:int,'name'?:string,'url'?:string,'kind'?:int,'category'?:int,'website'?:string,'priority'?:int,'error'?:int|bool,'attributes'?:string,'cache_nbEntries'?:int,'cache_nbUnreads'?:int,'ttl'?:int}> $res */ return self::daoToCategoriesPrepopulated($res); } else { $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); @@ -397,7 +397,7 @@ SQL; /** * @param array<array{'c_name':string,'c_id':int,'c_kind':int,'c_last_update':int,'c_error':int|bool,'c_attributes'?:string, * 'id'?:int,'name'?:string,'url'?:string,'kind'?:int,'website'?:string,'priority'?:int, - * 'error'?:int|bool,'cache_nbEntries'?:int,'cache_nbUnreads'?:int,'ttl'?:int}> $listDAO + * 'error'?:int|bool,'attributes'?:string,'cache_nbEntries'?:int,'cache_nbUnreads'?:int,'ttl'?:int}> $listDAO * @return array<int,FreshRSS_Category> */ private static function daoToCategoriesPrepopulated(array $listDAO): array { diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 2183f9804..b6ed99724 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -40,6 +40,8 @@ if ($this->rss_title != '') { $url_rss = $url_base; $url_rss['a'] = 'rss'; + $url_rss['params']['user'] = Minz_User::name(); + $url_rss['params']['token'] = FreshRSS_Context::userConf()->token ?: null; unset($url_rss['params']['rid']); if (FreshRSS_Context::userConf()->since_hours_posts_per_rss) { $url_rss['params']['hours'] = FreshRSS_Context::userConf()->since_hours_posts_per_rss; @@ -49,6 +51,8 @@ <?php } if (FreshRSS_Context::isAll() || FreshRSS_Context::isCategory() || FreshRSS_Context::isFeed()) { $opml_rss = $url_base; $opml_rss['a'] = 'opml'; + $opml_rss['params']['user'] = Minz_User::name(); + $opml_rss['params']['token'] = FreshRSS_Context::userConf()->token ?: null; unset($opml_rss['params']['rid']); ?> <link rel="outline" type="text/x-opml" title="OPML" href="<?= Minz_Url::display($opml_rss) ?>" /> diff --git a/docs/en/users/user_queries.md b/docs/en/users/user_queries.md index 68f0898df..d202c52a1 100644 --- a/docs/en/users/user_queries.md +++ b/docs/en/users/user_queries.md @@ -53,7 +53,7 @@ Some parameters can be manually added to the URL: ## Sharing with a master token (deprecated) Before FreshRSS 1.24, the only option to reshare an RSS output was by using a master token, -like `https://freshrss.example.net/?a=rss&user=alice&token1234` +like `https://freshrss.example.net/?a=rss&user=alice&token=abc123` This was mostly intended for sharing between systems controlled by the same user, and not for sharing publicly. |