FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix APP_URL being called SITE_URL

Browse Source
This commit is contained in:
Nabeel Shahzad
2021-04-20 23:28:57 -04:00
parent 61739ce266
commit 2545328233
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/System/InstallerController.php
+1 -1
View File
@@ -210,7 +210,7 @@ class InstallerController extends Controller
// Now write out the env file // Now write out the env file
$attrs = [ $attrs = [
'SITE_NAME' => $request->post('site_name'), 'SITE_NAME' => $request->post('site_name'),
'SITE_URL' => $request->post('site_url'), 'APP_URL' => $request->post('app_url'),
'DB_CONNECTION' => $request->post('db_conn'), 'DB_CONNECTION' => $request->post('db_conn'),
'DB_HOST' => $request->post('db_host'), 'DB_HOST' => $request->post('db_host'),
'DB_PORT' => $request->post('db_port'), 'DB_PORT' => $request->post('db_port'),
app/Services/Installer/ConfigService.php
+2 -2
View File
@@ -22,7 +22,7 @@ class ConfigService extends Service
'APP_LOCALE' => 'en', 'APP_LOCALE' => 'en',
'DEBUG_TOOLBAR' => false, 'DEBUG_TOOLBAR' => false,
'SITE_NAME' => '', 'SITE_NAME' => '',
'SITE_URL' => 'http://phpvms.test', 'APP_URL' => 'http://phpvms.test',
'DB_CONNECTION' => '', 'DB_CONNECTION' => '',
'DB_HOST' => '', 'DB_HOST' => '',
'DB_PORT' => 3306, 'DB_PORT' => 3306,
@@ -93,7 +93,7 @@ class ConfigService extends Service
'APP_LOCALE' => config('app.locale'), 'APP_LOCALE' => config('app.locale'),
'DEBUG_TOOLBAR' => config('app.debug_toolbar') ? 'true' : 'false', 'DEBUG_TOOLBAR' => config('app.debug_toolbar') ? 'true' : 'false',
'SITE_NAME' => config('app.name'), 'SITE_NAME' => config('app.name'),
'SITE_URL' => config('app.url'), 'APP_URL' => config('app.url'),
'DB_CONNECTION' => config('database.default'), 'DB_CONNECTION' => config('database.default'),
'DB_HOST' => config('database.connections.mysql.host'), 'DB_HOST' => config('database.connections.mysql.host'),
'DB_PORT' => config('database.connections.mysql.port'), 'DB_PORT' => config('database.connections.mysql.port'),
resources/stubs/installer/config.stub
+1 -1
View File
@@ -10,7 +10,7 @@ return [
// Overrides config/app.php // Overrides config/app.php
'app' => [ 'app' => [
'name' => '$SITE_NAME$', 'name' => '$SITE_NAME$',
'url' => '$SITE_URL$', 'url' => '$APP_URL$',
// When live, 'env' should be 'prod' // When live, 'env' should be 'prod'
'env' => 'prod', 'env' => 'prod',
resources/stubs/installer/env.stub
+1 -1
View File
@@ -15,7 +15,7 @@
APP_KEY='$APP_KEY$' APP_KEY='$APP_KEY$'
APP_NAME='$SITE_NAME$' APP_NAME='$SITE_NAME$'
SITE_NAME='$SITE_NAME$' SITE_NAME='$SITE_NAME$'
SITE_URL='$SITE_URL$' APP_URL='$APP_URL$'
APP_ENV=$APP_ENV$ APP_ENV=$APP_ENV$
APP_LOCALE=$APP_LOCALE$ APP_LOCALE=$APP_LOCALE$
LOG_LEVEL=debug LOG_LEVEL=debug
resources/views/system/installer/install/steps/step2-db.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
<td>Site URL</td> <td>Site URL</td>
<td style="text-align:center;"> <td style="text-align:center;">
<div class="form-group"> <div class="form-group">
{{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }} {{ Form::input('text', 'app_url', Request::root(), ['class' => 'form-control']) }}
</div> </div>
</td> </td>
</tr> </tr>