From e806ef0663eab4d236af897ca76dd2644ab4ef01 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 21 Nov 2015 22:25:48 +0000
Subject: [PATCH] Move $app_name into View composer

---
 app/Composers/AppComposer.php                             | 2 ++
 resources/views/dashboard/settings/app-setup.blade.php    | 6 +++---
 .../views/emails/incidents/maintenance-html.blade.php     | 8 ++++----
 .../views/emails/incidents/maintenance-text.blade.php     | 6 +++---
 resources/views/emails/incidents/new-html.blade.php       | 8 ++++----
 resources/views/emails/incidents/new-text.blade.php       | 6 +++---
 resources/views/emails/subscribers/verify-html.blade.php  | 8 ++++----
 resources/views/emails/subscribers/verify-text.blade.php  | 6 +++---
 resources/views/emails/users/invite-html.blade.php        | 8 ++++----
 resources/views/emails/users/invite-text.blade.php        | 6 +++---
 resources/views/layout/emails.blade.php                   | 4 ++--
 resources/views/layout/error.blade.php                    | 6 +++---
 resources/views/partials/footer.blade.php                 | 4 ++--
 13 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index da5e3e95..2f1d14ef 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -31,6 +31,8 @@ class AppComposer
         $mailFrom = env('MAIL_NAME', false);
 
         $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
+        $view->withAppName(Setting::get('app_name'));
         $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
+        $view->withShowSupport(Setting::get('show_support'));
     }
 }
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 2734a561..456cd038 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -21,7 +21,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.site-name') }}</label>
-                                        <input type="text" class="form-control" name="app_name" value="{{ Setting::get('app_name') }}" required>
+                                        <input type="text" class="form-control" name="app_name" value="{{ $app_name }}" required>
                                     </div>
                                 </div>
                             </div>
@@ -38,7 +38,7 @@
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.about-this-page') }}</label>
                                         <div class='markdown-control'>
-                                            <textarea name="app_about" class="form-control autosize" rows="4">{{ Setting::get('app_about') }}</textarea>
+                                            <textarea name="app_about" class="form-control autosize" rows="4">{{ $app_about }}</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -78,7 +78,7 @@
                                     <div class="checkbox">
                                         <label>
                                             <input type="hidden" value="0" name="show_support">
-                                            <input type="checkbox" value="1" name="show_support" {{ Setting::get('show_support') ? 'checked' : null }}>
+                                            <input type="checkbox" value="1" name="show_support" {{ $show_support ? 'checked' : null }}>
                                             {{ trans('setup.show_support') }}
                                         </label>
                                     </div>
diff --git a/resources/views/emails/incidents/maintenance-html.blade.php b/resources/views/emails/incidents/maintenance-html.blade.php
index b7d7442f..b734a634 100644
--- a/resources/views/emails/incidents/maintenance-html.blade.php
+++ b/resources/views/emails/incidents/maintenance-html.blade.php
@@ -1,11 +1,11 @@
 @extends('layout.emails')
 
 @section('preheader')
-{!! trans('cachet.subscriber.email.maintenance.html-preheader', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.subscriber.email.maintenance.html-preheader', ['app_name' => $app_name]) !!}
 @stop
 
 @section('content')
-    {!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => Setting::get('app_name')]) !!}
+    {!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => $app_name]) !!}
 
     <p>{{ $scheduled_at }}</p>
 
@@ -17,8 +17,8 @@
         {!! $html_content !!}
     </p>
 
-    @if(Setting::get('show_support'))
-    <p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
+    @if($show_support)
+    <p>{!! trans('cachet.powered_by', ['app' => $app_name]) !!}</p>
     @endif
     <p>
         <small><a href="{{ $unsubscribe_link }}">{!! trans('cachet.subscriber.email.unsubscribe') !!}</a></small>
diff --git a/resources/views/emails/incidents/maintenance-text.blade.php b/resources/views/emails/incidents/maintenance-text.blade.php
index 6297f660..ea0346a3 100644
--- a/resources/views/emails/incidents/maintenance-text.blade.php
+++ b/resources/views/emails/incidents/maintenance-text.blade.php
@@ -1,4 +1,4 @@
-{!! trans('cachet.subscriber.email.maintenance.text', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.subscriber.email.maintenance.text', ['app_name' => $app_name]) !!}
 
 {{ $scheduled_at }}
 
@@ -6,8 +6,8 @@
 
 {!! $text_content !!}
 
-@if(Setting::get('show_support'))
-{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}
+@if($show_support)
+{!! trans('cachet.powered_by', ['app' => $app_name]) !!}
 @endif
 
 {!! trans('cachet.subscriber.email.unsubscribe') !!} {{ $unsubscribe_link }}
diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php
index b588046c..60d8583c 100644
--- a/resources/views/emails/incidents/new-html.blade.php
+++ b/resources/views/emails/incidents/new-html.blade.php
@@ -1,11 +1,11 @@
 @extends('layout.emails')
 
 @section('preheader')
-{!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!}
 @stop
 
 @section('content')
-    {!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => Setting::get('app_name')]) !!}
+    {!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!}
 
     <p>
         {!! $status !!}
@@ -18,8 +18,8 @@
         {!! $html_content !!}
     </p>
 
-    @if(Setting::get('show_support'))
-    <p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
+    @if($show_support)
+    <p>{!! trans('cachet.powered_by', ['app' => $app_name]) !!}</p>
     @endif
     <p>
         <small><a href="{{ $unsubscribe_link }}">{!! trans('cachet.subscriber.email.unsubscribe') !!}</a></small>
diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php
index 1bb58869..3386519d 100644
--- a/resources/views/emails/incidents/new-text.blade.php
+++ b/resources/views/emails/incidents/new-text.blade.php
@@ -1,4 +1,4 @@
-{!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.subscriber.email.incident.text', ['app_name' => $app_name]) !!}
 
 {!! $status !!}
 @if($has_component)
@@ -7,8 +7,8 @@
 
 {!! $text_content !!}
 
-@if(Setting::get('show_support'))
-{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}
+@if($show_support)
+{!! trans('cachet.powered_by', ['app' => $app_name]) !!}
 @endif
 
 {!! trans('cachet.subscriber.email.unsuscribe') !!} {{ $unsubscribe_link }}
diff --git a/resources/views/emails/subscribers/verify-html.blade.php b/resources/views/emails/subscribers/verify-html.blade.php
index 3575107a..e501fd82 100644
--- a/resources/views/emails/subscribers/verify-html.blade.php
+++ b/resources/views/emails/subscribers/verify-html.blade.php
@@ -1,13 +1,13 @@
 @extends('layout.emails')
 
 @section('preheader')
-{!! trans('cachet.subscriber.email.verify.html-preheader', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.subscriber.email.verify.html-preheader', ['app_name' => $app_name]) !!}
 @stop
 
 @section('content')
-    {!! trans('cachet.subscriber.email.verify.html', ['app_name' => Setting::get('app_name'), 'link' => $link]) !!}
+    {!! trans('cachet.subscriber.email.verify.html', ['app_name' => $app_name, 'link' => $link]) !!}
 
-    @if(Setting::get('show_support'))
-    <p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
+    @if($show_support)
+    <p>{!! trans('cachet.powered_by', ['app' => $app_name]) !!}</p>
     @endif
 @stop
diff --git a/resources/views/emails/subscribers/verify-text.blade.php b/resources/views/emails/subscribers/verify-text.blade.php
index 7aca9f75..b45eb8a6 100644
--- a/resources/views/emails/subscribers/verify-text.blade.php
+++ b/resources/views/emails/subscribers/verify-text.blade.php
@@ -1,5 +1,5 @@
-{{ trans('cachet.subscriber.email.verify.text', ['app_name' => Setting::get('app_name'), 'link' => $link]) }}
+{{ trans('cachet.subscriber.email.verify.text', ['app_name' => $app_name, 'link' => $link]) }}
 
-@if(Setting::get('show_support'))
-{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}
+@if($show_support)
+{!! trans('cachet.powered_by', ['app' => $app_name]) !!}
 @endif
diff --git a/resources/views/emails/users/invite-html.blade.php b/resources/views/emails/users/invite-html.blade.php
index 5b429e6d..3c5e6e0c 100644
--- a/resources/views/emails/users/invite-html.blade.php
+++ b/resources/views/emails/users/invite-html.blade.php
@@ -1,13 +1,13 @@
 @extends('layout.emails')
 
 @section('preheader')
-{!! trans('cachet.users.email.invite.html-preheader', ['app_name' => Setting::get('app_name')]) !!}
+{!! trans('cachet.users.email.invite.html-preheader', ['app_name' => $app_name]) !!}
 @stop
 
 @section('content')
-    {!! trans('cachet.users.email.invite.html', ['app_name' => Setting::get('app_name'), 'link' => $link]) !!}
+    {!! trans('cachet.users.email.invite.html', ['app_name' => $app_name, 'link' => $link]) !!}
 
-    @if(Setting::get('show_support'))
-    <p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
+    @if($show_support)
+    <p>{!! trans('cachet.powered_by', ['app' => $app_name]) !!}</p>
     @endif
 @stop
diff --git a/resources/views/emails/users/invite-text.blade.php b/resources/views/emails/users/invite-text.blade.php
index 04a4b68c..2195b31a 100644
--- a/resources/views/emails/users/invite-text.blade.php
+++ b/resources/views/emails/users/invite-text.blade.php
@@ -1,5 +1,5 @@
-{{ trans('cachet.users.email.invite.text', ['app_name' => Setting::get('app_name'), 'link' => $link]) }}
+{{ trans('cachet.users.email.invite.text', ['app_name' => $app_name, 'link' => $link]) }}
 
-@if(Setting::get('show_support'))
-{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}
+@if($show_support)
+{!! trans('cachet.powered_by', ['app' => $app_name]) !!}
 @endif
diff --git a/resources/views/layout/emails.blade.php b/resources/views/layout/emails.blade.php
index 68c097c3..04a6901c 100644
--- a/resources/views/layout/emails.blade.php
+++ b/resources/views/layout/emails.blade.php
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="viewport" content="width=device-width" />
 <meta name="format-detection" content="address=no;=no;telephone=no" />
-<title>{{ Setting::get('app_name') }}</title>
+<title>{{ $app_name }}</title>
 @include('partials.email-css')
 </head>
 <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
@@ -32,7 +32,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="footer">{{ Setting::get('app_name') }}</td>
+                        <td class="footer">{{ $app_name }}</td>
                     </tr>
                 </table>
             </td>
diff --git a/resources/views/layout/error.blade.php b/resources/views/layout/error.blade.php
index 21a7ef2c..2eba0e3d 100644
--- a/resources/views/layout/error.blade.php
+++ b/resources/views/layout/error.blade.php
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link rel="alternate" type="application/atom+xml" href="/atom" title="{{ isset($page_title) ?: Setting::get('app_name') }} - Atom Feed">
-    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ isset($page_title) ?: Setting::get('app_name') }} - RSS Feed">
+    <link rel="alternate" type="application/atom+xml" href="/atom" title="{{ isset($page_title) ?: $app_name }} - Atom Feed">
+    <link rel="alternate" type="application/rss+xml" href="/rss" title="{{ isset($page_title) ?: $app_name }} - RSS Feed">
 
     <link rel="icon" type="image/png" href="/favicon.ico">
     <link rel="shortcut icon" href="/favicon.png" type="image/x-icon">
@@ -19,7 +19,7 @@
     <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
     <meta http-equiv="cleartype" content="on">
 
-    <title>{{ isset($page_title) ?: Setting::get('app_name') }}</title>
+    <title>{{ isset($page_title) ?: $app_name }}</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index f14552f6..3cbbded2 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -2,8 +2,8 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-5">
-                @if(Setting::get('show_support'))
-                <p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
+                @if($show_support)
+                <p>{!! trans('cachet.powered_by', ['app' => $app_name]) !!}</p>
                 @endif
             </div>
             <div class="col-sm-7">