From 25453282330dcd11af5d41fb5d938351a7794a3c Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@live.com>
Date: Tue, 20 Apr 2021 23:28:57 -0400
Subject: [PATCH] Fix APP_URL being called SITE_URL

---
 app/Http/Controllers/System/InstallerController.php           | 2 +-
 app/Services/Installer/ConfigService.php                      | 4 ++--
 resources/stubs/installer/config.stub                         | 2 +-
 resources/stubs/installer/env.stub                            | 2 +-
 .../views/system/installer/install/steps/step2-db.blade.php   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/System/InstallerController.php b/app/Http/Controllers/System/InstallerController.php
index ea73a25b..c9c34032 100644
--- a/app/Http/Controllers/System/InstallerController.php
+++ b/app/Http/Controllers/System/InstallerController.php
@@ -210,7 +210,7 @@ class InstallerController extends Controller
         // Now write out the env file
         $attrs = [
             '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_HOST'       => $request->post('db_host'),
             'DB_PORT'       => $request->post('db_port'),
diff --git a/app/Services/Installer/ConfigService.php b/app/Services/Installer/ConfigService.php
index caa4cef9..36fac416 100644
--- a/app/Services/Installer/ConfigService.php
+++ b/app/Services/Installer/ConfigService.php
@@ -22,7 +22,7 @@ class ConfigService extends Service
         'APP_LOCALE'          => 'en',
         'DEBUG_TOOLBAR'       => false,
         'SITE_NAME'           => '',
-        'SITE_URL'            => 'http://phpvms.test',
+        'APP_URL'             => 'http://phpvms.test',
         'DB_CONNECTION'       => '',
         'DB_HOST'             => '',
         'DB_PORT'             => 3306,
@@ -93,7 +93,7 @@ class ConfigService extends Service
             'APP_LOCALE'          => config('app.locale'),
             'DEBUG_TOOLBAR'       => config('app.debug_toolbar') ? 'true' : 'false',
             'SITE_NAME'           => config('app.name'),
-            'SITE_URL'            => config('app.url'),
+            'APP_URL'             => config('app.url'),
             'DB_CONNECTION'       => config('database.default'),
             'DB_HOST'             => config('database.connections.mysql.host'),
             'DB_PORT'             => config('database.connections.mysql.port'),
diff --git a/resources/stubs/installer/config.stub b/resources/stubs/installer/config.stub
index 1d96bc71..ca6d5923 100644
--- a/resources/stubs/installer/config.stub
+++ b/resources/stubs/installer/config.stub
@@ -10,7 +10,7 @@ return [
     // Overrides config/app.php
     'app' => [
         'name' => '$SITE_NAME$',
-        'url'  => '$SITE_URL$',
+        'url'  => '$APP_URL$',
 
         // When live, 'env' should be 'prod'
         'env'   => 'prod',
diff --git a/resources/stubs/installer/env.stub b/resources/stubs/installer/env.stub
index e7aa4df8..3b3b31ff 100644
--- a/resources/stubs/installer/env.stub
+++ b/resources/stubs/installer/env.stub
@@ -15,7 +15,7 @@
 APP_KEY='$APP_KEY$'
 APP_NAME='$SITE_NAME$'
 SITE_NAME='$SITE_NAME$'
-SITE_URL='$SITE_URL$'
+APP_URL='$APP_URL$'
 APP_ENV=$APP_ENV$
 APP_LOCALE=$APP_LOCALE$
 LOG_LEVEL=debug
diff --git a/resources/views/system/installer/install/steps/step2-db.blade.php b/resources/views/system/installer/install/steps/step2-db.blade.php
index 784d3066..ff28c567 100644
--- a/resources/views/system/installer/install/steps/step2-db.blade.php
+++ b/resources/views/system/installer/install/steps/step2-db.blade.php
@@ -22,7 +22,7 @@
         <td>Site URL</td>
         <td style="text-align:center;">
           <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>
         </td>
       </tr>