From 07a0a7e428b3f3c3a240ddc06d95cfbc7e86c11a Mon Sep 17 00:00:00 2001 From: Stefan Talen Date: Sat, 11 Oct 2014 00:04:51 +0200 Subject: [PATCH] Updating modules/backend/models --- modules/backend/models/AccessLog.php | 3 +-- modules/backend/models/EditorPreferences.php | 2 +- modules/backend/models/User.php | 20 ++++++++++++-------- modules/backend/models/UserPreferences.php | 3 ++- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/backend/models/AccessLog.php b/modules/backend/models/AccessLog.php index 1399988b3..060530b99 100644 --- a/modules/backend/models/AccessLog.php +++ b/modules/backend/models/AccessLog.php @@ -37,5 +37,4 @@ class AccessLog extends Model return $record; } - -} \ No newline at end of file +} diff --git a/modules/backend/models/EditorPreferences.php b/modules/backend/models/EditorPreferences.php index 695aa9d63..6ba12eafe 100644 --- a/modules/backend/models/EditorPreferences.php +++ b/modules/backend/models/EditorPreferences.php @@ -73,4 +73,4 @@ class EditorPreferences extends Model asort($themes); return [static::DEFAULT_THEME => ucwords(static::DEFAULT_THEME)] + $themes; } -} \ No newline at end of file +} diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php index 30af0514f..219a24580 100644 --- a/modules/backend/models/User.php +++ b/modules/backend/models/User.php @@ -66,8 +66,9 @@ class User extends UserBase // return parent::getPersistCode(); // Option B: - if (!$this->persist_code) + if (!$this->persist_code) { return parent::getPersistCode(); + } return $this->persist_code; } @@ -77,18 +78,23 @@ class User extends UserBase */ public function getAvatarThumb($size = 25, $default = null) { - if ($this->avatar) + if ($this->avatar) { return $this->avatar->getThumb($size, $size); - else - return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s='.$size.'&d='.urlencode($default); + } else { + return '//www.gravatar.com/avatar/'. + md5(strtolower(trim($this->email))) . + '?s='. $size . + '&d='. urlencode($default); + } } public function afterCreate() { $this->restorePurgedValues(); - if ($this->send_invite) + if ($this->send_invite) { $this->sendInvitation(); + } } public function sendInvitation() @@ -100,10 +106,8 @@ class User extends UserBase 'link' => Backend::url('backend'), ]; - Mail::send('backend::mail.invite', $data, function($message) - { + Mail::send('backend::mail.invite', $data, function ($message) { $message->to($this->email, $this->full_name); }); } - } diff --git a/modules/backend/models/UserPreferences.php b/modules/backend/models/UserPreferences.php index 181e267ff..3e812deca 100644 --- a/modules/backend/models/UserPreferences.php +++ b/modules/backend/models/UserPreferences.php @@ -31,8 +31,9 @@ class UserPreferences extends PreferencesBase public function resolveUser($user) { $user = BackendAuth::getUser(); - if (!$user) + if (!$user) { throw new SystemException(trans('backend::lang.user.preferences.not_authenticated')); + } return $user; }