Adds overflow:auto to popup content to allow it to scroll in lower res.

[bookstack] / app / User.php

diff --git a/app/User.php b/app/User.php
index e1b7c143b267d6fe24d28a1ae8b1f2324c840594..fd6879ba007dc1d551b7385c6a93c043aebc98db 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -1,16 +1,16 @@
-<?php
-
-namespace BookStack;
+<?php namespace BookStack;

 
 

+use BookStack\Notifications\ResetPassword;

 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;

+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Notifications\Notifiable;

 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {

-    use Authenticatable, CanResetPassword;
+    use Authenticatable, CanResetPassword, Notifiable;

 
     /**
      * The database table used by the model.
 
     /**
      * The database table used by the model.


@@ -37,22 +37,31 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     protected $permissions;
 
     /**
     protected $permissions;
 
     /**

-     * Returns a default guest user.
+     * Returns the default public user.
+     * @return User

      */
     public static function getDefault()
     {
      */
     public static function getDefault()
     {

-        return new static([
-            'email' => 'guest',
-            'name' => 'Guest'
-        ]);
+        return static::where('system_name', '=', 'public')->first();
+    }
+
+    /**
+     * Check if the user is the default public user.
+     * @return bool
+     */
+    public function isDefault()
+    {
+        return $this->system_name === 'public';

     }
 
     /**
      * The roles that belong to the user.
     }
 
     /**
      * The roles that belong to the user.

+     * @return BelongsToMany

      */
     public function roles()
     {
      */
     public function roles()
     {

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

     }
 
     /**
     }
 
     /**


@@ -65,6 +74,16 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->roles->pluck('name')->contains($role);
     }
 
         return $this->roles->pluck('name')->contains($role);
     }
 

+    /**
+     * Check if the user has a role.
+     * @param $role
+     * @return mixed
+     */
+    public function hasSystemRole($role)
+    {
+        return $this->roles->pluck('system_name')->contains($role);
+    }
+

     /**
      * Get all permissions belonging to a the current user.
      * @param bool $cache
     /**
      * Get all permissions belonging to a the current user.
      * @param bool $cache


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

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

     }
 
     /**
     }
 
     /**


@@ -141,8 +160,16 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getAvatar($size = 50)
     {
      */
     public function getAvatar($size = 50)
     {

-        if ($this->image_id === 0 || $this->image_id === '0' || $this->image_id === null) return '/user_avatar.png';
-        return $this->avatar->getThumb($size, $size, false);
+        $default = baseUrl('/user_avatar.png');
+        $imageId = $this->image_id;
+        if ($imageId === 0 || $imageId === '0' || $imageId === null) return $default;
+
+        try {
+            $avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default;
+        } catch (\Exception $err) {
+            $avatar = $default;
+        }
+        return $avatar;

     }
 
     /**
     }
 
     /**


@@ -151,7 +178,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');

     }
 
     /**
     }
 
     /**


@@ -160,6 +187,40 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getEditUrl()
     {
      */
     public function getEditUrl()
     {

-        return '/settings/users/' . $this->id;
+        return baseUrl('/settings/users/' . $this->id);
+    }
+
+    /**
+     * Get the url that links to this user's profile.
+     * @return mixed
+     */
+    public function getProfileUrl()
+    {
+        return baseUrl('/user/' . $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 '';
+    }
+
+    /**
+     * Send the password reset notification.
+     * @param  string  $token
+     * @return void
+     */
+    public function sendPasswordResetNotification($token)
+    {
+        $this->notify(new ResetPassword($token));

     }
 }
     }
 }