From faace4bfb6108723dd5d5708352e810baacb6119 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 18 Mar 2017 08:50:18 +0000
Subject: [PATCH] Add a setting helper and fix email name. Closes #2410

---
 app/helpers.php                                   | 15 +++++++++++++++
 .../views/vendor/notifications/email.blade.php    |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index dce60191..94c1362a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -9,10 +9,25 @@
  * file that was distributed with this source code.
  */
 
+use CachetHQ\Cachet\Settings\Repository;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Request;
 use Jenssegers\Date\Date;
 
+if (!function_exists('setting')) {
+    /**
+     * Get a setting, or the default value.
+     *
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    function setting($name, $default = null) {
+        return app(Repository::class)->get($name, $default);
+    }
+}
+
 if (!function_exists('set_active')) {
     /**
      * Set active class if request is in path.
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 67f49c2f..5623cfa0 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -71,7 +71,7 @@ $style = [
                     <tr>
                         <td style="{{ $style['email-masthead'] }}">
                             <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
-                                {{ config('app.name') }}
+                                {{ setting('app_name') }}
                             </a>
                         </td>
                     </tr>
@@ -140,7 +140,7 @@ $style = [
 
                                         <!-- Salutation -->
                                         <p style="{{ $style['paragraph'] }}">
-                                            Regards,<br>{{ config('app.name') }}
+                                            Regards,<br>{{ setting('app_name') }}
                                         </p>
 
                                         <!-- Sub Copy -->
@@ -176,7 +176,7 @@ $style = [
                                     <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
                                         <p style="{{ $style['paragraph-sub'] }}">
                                             &copy; {{ date('Y') }}
-                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
+                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ setting('app_name') }}</a>.
                                             All rights reserved.
                                         </p>
                                     </td>