]>
BookStack Code Mirror - bookstack/blobdiff - app/User.php
projects
/
bookstack
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spanish translation
[bookstack]
/
app
/
User.php
diff --git
a/app/User.php
b/app/User.php
index 703322cbd269c5dfb80fcf164e5900f10be60d6d..d1e9b38a775e5c2e292bd56a5049fabae9823706 100644
(file)
--- a/
app/User.php
+++ b/
app/User.php
@@
-22,7
+22,7
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
* The attributes that are mass assignable.
* @var array
*/
* The attributes that are mass assignable.
* @var array
*/
- protected $fillable = ['name', 'email', 'image_id'
, 'books_display'
];
+ protected $fillable = ['name', 'email', 'image_id'];
/**
* The attributes excluded from the model's JSON form.
/**
* The attributes excluded from the model's JSON form.
@@
-60,7
+60,9
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function roles()
{
*/
public function roles()
{
- if ($this->id === 0) return ;
+ if ($this->id === 0) {
+ return ;
+ }
return $this->belongsToMany(Role::class);
}
return $this->belongsToMany(Role::class);
}
@@
-81,7
+83,7
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function hasSystemRole($role)
{
*/
public function hasSystemRole($role)
{
- return $this->roles->pluck('system_name')->contains(
'admin'
);
+ return $this->roles->pluck('system_name')->contains(
$role
);
}
/**
}
/**
@@
-91,9
+93,11
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function permissions($cache = true)
{
*/
public function permissions($cache = true)
{
- if(isset($this->permissions) && $cache) return $this->permissions;
+ if (isset($this->permissions) && $cache) {
+ return $this->permissions;
+ }
$this->load('roles.permissions');
$this->load('roles.permissions');
- $permissions = $this->roles->map(function($role) {
+ $permissions = $this->roles->map(function
($role) {
return $role->permissions;
})->flatten()->unique();
$this->permissions = $permissions;
return $role->permissions;
})->flatten()->unique();
$this->permissions = $permissions;
@@
-107,7
+111,9
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function can($permissionName)
{
*/
public function can($permissionName)
{
- if ($this->email === 'guest') return false;
+ if ($this->email === 'guest') {
+ return false;
+ }
return $this->permissions()->pluck('name')->contains($permissionName);
}
return $this->permissions()->pluck('name')->contains($permissionName);
}
@@
-162,7
+168,9
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
{
$default = baseUrl('/user_avatar.png');
$imageId = $this->image_id;
{
$default = baseUrl('/user_avatar.png');
$imageId = $this->image_id;
- if ($imageId === 0 || $imageId === '0' || $imageId === null) return $default;
+ if ($imageId === 0 || $imageId === '0' || $imageId === null) {
+ return $default;
+ }
try {
$avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default;
try {
$avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default;
@@
-206,10
+214,14
@@
class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function getShortName($chars = 8)
{
*/
public function getShortName($chars = 8)
{
- if (strlen($this->name) <= $chars) return $this->name;
+ if (strlen($this->name) <= $chars) {
+ return $this->name;
+ }
$splitName = explode(' ', $this->name);
$splitName = explode(' ', $this->name);
- if (strlen($splitName[0]) <= $chars) return $splitName[0];
+ if (strlen($splitName[0]) <= $chars) {
+ return $splitName[0];
+ }
return '';
}
return '';
}