replace GPL diff lib with MIT lib

[bookstack] / app / User.php

diff --git a/app/User.php b/app/User.php
index b062aa78f20dc11a05409132c82547c2ba57b12a..74aec7e3a734fdf56394e98cb4451039e281ae35 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -1,9 +1,6 @@
-<?php
-
-namespace BookStack;
+<?php namespace BookStack;

 
 use Illuminate\Auth\Authenticatable;
 
 use Illuminate\Auth\Authenticatable;

-use Illuminate\Database\Eloquent\Model;

 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;


@@ -52,7 +49,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function roles()
     {
      */
     public function roles()
     {

-        return $this->belongsToMany('BookStack\Role');
+        return $this->belongsToMany(Role::class);

     }
 
     /**
     }
 
     /**


@@ -67,11 +64,12 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * Get all permissions belonging to a the current user.
 
     /**
      * Get all permissions belonging to a the current user.

+     * @param bool $cache

      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */

-    public function permissions()
+    public function permissions($cache = true)

     {
     {

-        if(isset($this->permissions)) return $this->permissions;
+        if(isset($this->permissions) && $cache) return $this->permissions;

         $this->load('roles.permissions');
         $permissions = $this->roles->map(function($role) {
             return $role->permissions;
         $this->load('roles.permissions');
         $permissions = $this->roles->map(function($role) {
             return $role->permissions;


@@ -106,7 +104,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function attachRoleId($id)
     {
      */
     public function attachRoleId($id)
     {

-        $this->roles()->sync([$id]);
+        $this->roles()->attach($id);

     }
 
     /**
     }
 
     /**


@@ -115,7 +113,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function socialAccounts()
     {
      */
     public function socialAccounts()
     {

-        return $this->hasMany('BookStack\SocialAccount');
+        return $this->hasMany(SocialAccount::class);

     }
 
     /**
     }
 
     /**


@@ -150,7 +148,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function avatar()
     {
      */
     public function avatar()
     {

-        return $this->belongsTo('BookStack\Image', 'image_id');
+        return $this->belongsTo(Image::class, 'image_id');

     }
 
     /**
     }
 
     /**


@@ -161,4 +159,19 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     {
         return '/settings/users/' . $this->id;
     }
     {
         return '/settings/users/' . $this->id;
     }

+
+    /**
+     * Get a shortened version of the user's name.
+     * @param int $chars
+     * @return string
+     */
+    public function getShortName($chars = 8)
+    {
+        if (strlen($this->name) <= $chars) return $this->name;
+
+        $splitName = explode(' ', $this->name);
+        if (strlen($splitName[0]) <= $chars) return $splitName[0];
+
+        return '';
+    }

 }
 }