From 44fea779df79c44916d32ad88a5aeec23d3832b5 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 21 Nov 2015 22:36:09 +0000
Subject: [PATCH] Remove $app_url in favour of AppComposer usage

---
 app/Composers/AppComposer.php                 |  1 +
 .../dashboard/settings/app-setup.blade.php    |  2 +-
 resources/views/layout/emails.blade.php       |  2 +-
 resources/views/partials/banner.blade.php     | 24 +++++++++----------
 resources/views/signup.blade.php              |  4 ++--
 resources/views/subscribe.blade.php           |  4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index 2f1d14ef..b01546ab 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -33,6 +33,7 @@ class AppComposer
         $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
         $view->withAppName(Setting::get('app_name'));
         $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
+        $view->withAppDomain(Setting::get('app_domain'));
         $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 456cd038..787494d4 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -29,7 +29,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.app-setup.site-url') }}</label>
-                                        <input type="text" class="form-control" name="app_domain" value="{{ Setting::get('app_domain') }}" required>
+                                        <input type="text" class="form-control" name="app_domain" value="{{ $app_domain }}" required>
                                     </div>
                                 </div>
                             </div>
diff --git a/resources/views/layout/emails.blade.php b/resources/views/layout/emails.blade.php
index 04a6901c..a973caaf 100644
--- a/resources/views/layout/emails.blade.php
+++ b/resources/views/layout/emails.blade.php
@@ -19,7 +19,7 @@
                             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                                 <tr>
                                     <td class="header-logo">
-                                       <a href="{{ $app_url }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
+                                       <a href="{{ $app_domain }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/resources/views/partials/banner.blade.php b/resources/views/partials/banner.blade.php
index 086287e1..9e800b3e 100644
--- a/resources/views/partials/banner.blade.php
+++ b/resources/views/partials/banner.blade.php
@@ -1,16 +1,16 @@
 @if($bannerImage = Setting::get('app_banner'))
-    <div @if(Setting::get('style_fullwidth_header'))class="app-banner"@endif>
-        <div class="container">
-            <div class="row app-banner-padding  @if(!Setting::get('style_fullwidth_header')) app-banner @endif">
-                <div class="col-md-12 text-center">
-                    <?php $bannerType = Setting::get('app_banner_type') ?>
-                    @if($app_url = Setting::get('app_domain'))
-                        <a href="{{ $app_url }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
-                    @else
-                        <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
-                    @endif
-                </div>
+<div @if(Setting::get('style_fullwidth_header'))class="app-banner"@endif>
+    <div class="container">
+        <div class="row app-banner-padding  @if(!Setting::get('style_fullwidth_header')) app-banner @endif">
+            <div class="col-md-12 text-center">
+                <?php $bannerType = Setting::get('app_banner_type') ?>
+                @if(isset($app_domain))
+                    <a href="{{ $app_domain }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+                @else
+                    <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
+                @endif
             </div>
         </div>
     </div>
-@endif
\ No newline at end of file
+</div>
+@endif
diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php
index 48f6b121..e74349c1 100644
--- a/resources/views/signup.blade.php
+++ b/resources/views/signup.blade.php
@@ -11,8 +11,8 @@
     <div class="row app-banner">
         <div class="col-md-12 text-center">
             <?php $bannerType = Setting::get('app_banner_type') ?>
-            @if($app_url = Setting::get('app_domain'))
-            <a href="{{ $app_url }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+            @if(isset($app_domain))
+            <a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
             @else
             <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
             @endif
diff --git a/resources/views/subscribe.blade.php b/resources/views/subscribe.blade.php
index 43b91130..39522be8 100644
--- a/resources/views/subscribe.blade.php
+++ b/resources/views/subscribe.blade.php
@@ -11,8 +11,8 @@
     <div class="row app-banner">
         <div class="col-md-12 text-center">
             <?php $bannerType = Setting::get('app_banner_type') ?>
-            @if($app_url = Setting::get('app_domain'))
-            <a href="{{ $app_url }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+            @if(isset($app_domain))
+            <a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
             @else
             <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
             @endif