Skip to content

Simplify usage of the access token #6385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BurntimeX merged 1 commit into from
Jul 17, 2025
Merged

Simplify usage of the access token #6385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/articleList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{/if}

{if $__wcf->user->userID}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed'}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}">
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed' at=$__wcf->user->getAccessToken()}{/link}">
{else}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed'}{/link}">
{/if}
Expand All @@ -31,7 +31,7 @@

{capture assign='contentInteractionDropdownItems'}
{if $__wcf->user->userID}
<li><a rel="alternate" href="{link controller='ArticleRssFeed'}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
<li><a rel="alternate" href="{link controller='ArticleRssFeed' at=$__wcf->user->getAccessToken()}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{else}
<li><a rel="alternate" href="{link controller='ArticleRssFeed'}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/categoryArticleList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{/if}

{if $__wcf->user->userID}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed' id=$categoryID}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}">
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed' id=$categoryID at=$__wcf->user->getAccessToken()}{/link}">
{else}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleRssFeed' id=$categoryID}{/link}">
{/if}
Expand All @@ -38,7 +38,7 @@

{capture assign='contentInteractionDropdownItems'}
{if $__wcf->user->userID}
<li><a rel="alternate" href="{link controller='ArticleRssFeed' id=$categoryID}at={$__wcf->user->userID}-{$__wcf->user->accessToken}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
<li><a rel="alternate" href="{link controller='ArticleRssFeed' id=$categoryID at=$__wcf->user->getAccessToken()}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{else}
<li><a rel="alternate" href="{link controller='ArticleRssFeed' id=$categoryID}{/link}" class="rssFeed">{lang}wcf.global.button.rss{/lang}</a></li>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions com.woltlab.wcf/templates/notificationList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{capture assign='contentTitleBadge'}<span class="badge jsNotificationsBadge">{#$__wcf->getUserNotificationHandler()->countAllNotifications()}</span>{/capture}

{capture assign='headContent'}
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationRssFeed'}at={$__wcf->getUser()->userID}-{$__wcf->getUser()->accessToken}{/link}">
<link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationRssFeed' at=$__wcf->user->getAccessToken()}{/link}">
{/capture}

{capture assign='contentInteractionPagination'}
Expand All @@ -17,7 +17,7 @@
{/capture}

{capture assign='contentInteractionDropdownItems'}
<li><a rel="alternate" href="{link controller='NotificationRssFeed'}at={$__wcf->getUser()->userID}-{$__wcf->getUser()->accessToken}{/link}">{lang}wcf.global.button.rss{/lang}</a></li>
<li><a rel="alternate" href="{link controller='NotificationRssFeed' at=$__wcf->user->getAccessToken()}{/link}">{lang}wcf.global.button.rss{/lang}</a></li>
{/capture}

{include file='header'}
Expand Down
10 changes: 10 additions & 0 deletions wcfsetup/install/files/lib/data/user/User.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,4 +758,14 @@ public function getPopoverLinkClass()
{
return 'userLink';
}

/**
* Returns the value for the access token link parameter.
*
* @since 6.2
*/
public function getAccessToken(): string
{
return \sprintf('%d-%s', $this->userID, $this->accessToken);
}
}