aheathershaw
/
blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

#17: Fixed a crash in the installer when the app is not configured

This commit is contained in:
Andy Heathershaw 2017-08-30 20:42:35 +01:00
parent f3e69512e2
commit 6b704e67fd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/webServers.xml
View File

@ -3,7 +3,7 @@
<component name="WebServers"> <component name="WebServers">
<option name="servers"> <option name="servers">
<webServer id="b14a34b0-0127-4886-964a-7be75a2281ac" name="Development" url="http://blue-twilight-dev.andys.eu"> <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>
<advancedOptions dataProtectionLevel="Private" /> <advancedOptions dataProtectionLevel="Private" />
</advancedOptions> </advancedOptions>

11
app/Helpers/MiscHelper.php
View File

@ -60,6 +60,12 @@ class MiscHelper
public static function getEnvironmentSetting($settingName) public static function getEnvironmentSetting($settingName)
{ {
$envFile = MiscHelper::getEnvironmentFilePath(); $envFile = MiscHelper::getEnvironmentFilePath();
if (!file_exists($envFile))
{
return null;
}
$matches = null; $matches = null;
if (preg_match(sprintf('/^\s*%s\s*=\s*(.+)$/im', preg_quote($settingName)), file_get_contents($envFile), $matches)) 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; 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.) * Tests whether the provided URL belongs to the current application (i.e. both scheme and hostname match.)
* @param $url * @param $url

6
app/Providers/AppServiceProvider.php
View File

@ -5,6 +5,7 @@ namespace App\Providers;
use App\Album; use App\Album;
use App\Helpers\ConfigHelper; use App\Helpers\ConfigHelper;
use App\Helpers\ImageHelper; use App\Helpers\ImageHelper;
use App\Helpers\MiscHelper;
use App\Helpers\ThemeHelper; use App\Helpers\ThemeHelper;
use App\Helpers\ValidationHelper; use App\Helpers\ValidationHelper;
use App\ModelObservers\AlbumObserver; use App\ModelObservers\AlbumObserver;
@ -48,7 +49,10 @@ class AppServiceProvider extends ServiceProvider
Album::observe(AlbumObserver::class); Album::observe(AlbumObserver::class);
// Configure our default pager // Configure our default pager
LengthAwarePaginator::defaultView($themeHelper->viewName('partials.pager_links')); if (MiscHelper::isAppInstalled())
{
LengthAwarePaginator::defaultView($themeHelper->viewName('partials.pager_links'));
}
} }
/** /**