From 6b704e67fd9c86842f970bec4967addc9f00a37c Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andys.eu>
Date: Wed, 30 Aug 2017 20:42:35 +0100
Subject: [PATCH] #17: Fixed a crash in the installer when the app is not
 configured

---
 .idea/webServers.xml                 |  2 +-
 app/Helpers/MiscHelper.php           | 11 +++++++++++
 app/Providers/AppServiceProvider.php |  6 +++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index fef8fa9..8b201d0 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="b14a34b0-0127-4886-964a-7be75a2281ac" name="Development" url="http://blue-twilight-dev.andys.eu">
-        <fileTransfer host="scar.andys.eu" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
+        <fileTransfer host="orlando.andys.eu" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" rootFolder="/srv/www/blue-twilight-dev" accessType="SFTP" keyPair="true">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>
diff --git a/app/Helpers/MiscHelper.php b/app/Helpers/MiscHelper.php
index f74af77..4ae022a 100644
--- a/app/Helpers/MiscHelper.php
+++ b/app/Helpers/MiscHelper.php
@@ -60,6 +60,12 @@ class MiscHelper
     public static function getEnvironmentSetting($settingName)
     {
         $envFile = MiscHelper::getEnvironmentFilePath();
+
+        if (!file_exists($envFile))
+        {
+            return null;
+        }
+
         $matches = null;
         if (preg_match(sprintf('/^\s*%s\s*=\s*(.+)$/im', preg_quote($settingName)), file_get_contents($envFile), $matches))
         {
@@ -69,6 +75,11 @@ class MiscHelper
         return null;
     }
 
+    public static function isAppInstalled()
+    {
+        return MiscHelper::getEnvironmentSetting('APP_INSTALLED');
+    }
+
     /**
      * Tests whether the provided URL belongs to the current application (i.e. both scheme and hostname match.)
      * @param $url
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 6f7e365..4d78745 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,6 +5,7 @@ namespace App\Providers;
 use App\Album;
 use App\Helpers\ConfigHelper;
 use App\Helpers\ImageHelper;
+use App\Helpers\MiscHelper;
 use App\Helpers\ThemeHelper;
 use App\Helpers\ValidationHelper;
 use App\ModelObservers\AlbumObserver;
@@ -48,7 +49,10 @@ class AppServiceProvider extends ServiceProvider
         Album::observe(AlbumObserver::class);
 
         // Configure our default pager
-        LengthAwarePaginator::defaultView($themeHelper->viewName('partials.pager_links'));
+        if (MiscHelper::isAppInstalled())
+        {
+            LengthAwarePaginator::defaultView($themeHelper->viewName('partials.pager_links'));
+        }
     }
 
     /**