mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

Simplify permissions and add API to register configurable ones

Browse Source 
Lots of thought has gone into this; it will show up later when I do the
admin permissions interface / category permissions :)
This commit is contained in:
Toby Zerner
2015-05-15 17:05:46 +09:30
parent 15d35fa5db
commit b4e5f0e6e5
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Core/Models/User.php
View File

@@ -307,24 +307,6 @@ class User extends Model
return $this;
}
/**
* Get a list of the user's grantees according to their ID and groups.
*
* @return array
*/
public function getGrantees()
{
$grantees = ['group.'.GROUP::GUEST_ID]; // guests
if ($this->id) {
$grantees[] = 'user.'.$this->id;
}
foreach ($this->groups as $group) {
$grantees[] = 'group.'.$group->id;
}
return $grantees;
}
/**
* Check whether the user has a certain permission based on their groups.
*
@@ -332,13 +314,13 @@ class User extends Model
* @param string $entity
* @return boolean
*/
public function hasPermission($permission, $entity)
public function hasPermission($permission)
{
if ($this->isAdmin()) {
return true;
}
$count = $this->permissions()->where('entity', $entity)->where('permission', $permission)->count();
$count = $this->permissions()->where('permission', $permission)->count();
return (bool) $count;
}
@@ -468,7 +450,7 @@ class User extends Model
*/
public function permissions()
{
return Permission::whereIn('grantee', $this->getGrantees());
return Permission::whereIn('group_id', $this->groups()->lists('id'));
}
/**