From cb0a555312bd8968105454647a980b53771852dd Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 22 Sep 2023 14:30:28 +0200 Subject: [PATCH] wait #6269 @1 --- .docker/config/cron/crontab | 1 + app/Models/User.php | 6 +++++- app/Notifications/ToolboxNotification.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.docker/config/cron/crontab b/.docker/config/cron/crontab index 4acd6f4ad..5fc614e99 100644 --- a/.docker/config/cron/crontab +++ b/.docker/config/cron/crontab @@ -4,3 +4,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin * * * * * runuser -l toolbox -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2 20 5 * * * /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2 + diff --git a/app/Models/User.php b/app/Models/User.php index 86b22c84e..7d666b47f 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -27,7 +27,11 @@ class User extends \Cubedesigners\UserDatabase\Models\User public function avatar() { - $res = Gravatar::get($this->email); + try { + $res = Gravatar::get($this->email); + } catch (\Exception $e) { + $res = Gravatar::get(md5($this->email) . '@cubedesigners.com'); + } return str_replace('.jpg', '', $res); } } diff --git a/app/Notifications/ToolboxNotification.php b/app/Notifications/ToolboxNotification.php index ac9f520fe..11f90ef1d 100644 --- a/app/Notifications/ToolboxNotification.php +++ b/app/Notifications/ToolboxNotification.php @@ -65,7 +65,7 @@ class ToolboxNotification extends Notification foreach ($this->actions as $label => $url) { $m->line(new HtmlString($label . __(': ') . ' ' . $url . '')); } - $m->salutation(new HtmlString(__('Cordialement,') . "
" . __('L\'équipe :teamname',['team_name'=>env('MAIL_TEAM_NAME')]))); + $m->salutation(new HtmlString(__('Cordialement,') . "
" . __('L\'équipe :teamname', ['teamname' => env('MAIL_TEAM_NAME')]))); return $m; } -- 2.39.5