github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 04:33:47 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Enforce forum.view permission

Browse Source
This commit is contained in:
Toby Zerner 2015-08-05 18:08:31 +09:30
parent 3f0089e8bb
commit ff8dc5ef25
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Actions/Forum/ShowAction.php
View File

@ -56,7 +56,7 @@ class ShowAction extends SerializeResourceAction
{ {
$forum = app('flarum.forum'); $forum = app('flarum.forum');
$forum->groups = Group::all(); $forum->groups = Group::whereVisibleTo($request->actor)->get();
return $forum; return $forum;
} }

1
src/Api/Serializers/ForumSerializer.php
View File

@ -29,6 +29,7 @@ class ForumSerializer extends Serializer
'welcomeTitle' => Core::config('welcome_title'), 'welcomeTitle' => Core::config('welcome_title'),
'welcomeMessage' => Core::config('welcome_message'), 'welcomeMessage' => Core::config('welcome_message'),
'themePrimaryColor' => Core::config('theme_primary_color'), 'themePrimaryColor' => Core::config('theme_primary_color'),
'canView' => $forum->can($this->actor, 'view'),
'canStartDiscussion' => $forum->can($this->actor, 'startDiscussion') 'canStartDiscussion' => $forum->can($this->actor, 'startDiscussion')
]; ];

6
src/Core/Support/VisibleScope.php
View File

@ -14,6 +14,10 @@ trait VisibleScope
*/ */
public function scopeWhereVisibleTo(Builder $query, User $actor) public function scopeWhereVisibleTo(Builder $query, User $actor)
{ {
event(new ScopeModelVisibility($this, $query, $actor)); if (! app('flarum.forum')->can($actor, 'view')) {
$query->whereRaw('FALSE');
} else {
event(new ScopeModelVisibility($this, $query, $actor));
}
} }
} }