From f745f488600b9abe941dfd63d9ed8b84cf8b831d Mon Sep 17 00:00:00 2001
From: ghermans <glhermans@gmail.com>
Date: Thu, 31 Dec 2020 18:44:36 +0100
Subject: [PATCH] Added admin url suffix

---
 public/installer/EnvConfig.php               | 7 +++++++
 public/installer/Views/environment.blade.php | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php
index f9c691b35..bf827f70c 100755
--- a/public/installer/EnvConfig.php
+++ b/public/installer/EnvConfig.php
@@ -14,6 +14,9 @@ $data    = array();
     
     if (empty($_POST['app_url']))
         $errors['app_url'] = 'App Url is required.';
+    
+    if (empty($_POST['app_admin_url']))
+        $errors['app_admin'] = 'The admin suffix is required.';
 
     if (empty($_POST['app_currency']))
         $errors['app_currency'] = 'The application currency is required.';
@@ -38,6 +41,9 @@ $data    = array();
 
     if (preg_match('/\s/', $_POST['app_url']))
         $errors['app_url_space'] = 'There should be no space in App URL ';
+    
+        if (preg_match('/\s/', $_POST['app_admin_url']))
+        $errors['app_admin_space'] = 'There should be no space in the admin suffix.';
 
     if (preg_match('/\s/', $_POST['app_name']))
         $errors['app_name_space'] = 'There should be no space in App Name.';
@@ -110,6 +116,7 @@ $data    = array();
         $keyValueData['DB_PASSWORD'] = $_POST["user_password"];
         $keyValueData['APP_NAME'] = $_POST["app_name"];
         $keyValueData['APP_URL'] = $_POST["app_url"];
+        $keyValueData['APP_ADMIN_URL'] = $_POST["app_admin_url"];
         $keyValueData['APP_CURRENCY'] = $_POST["app_currency"];
         $keyValueData['APP_LOCALE'] = $_POST["app_locale"];
         $keyValueData['APP_TIMEZONE'] = $_POST["app_timezone"];
diff --git a/public/installer/Views/environment.blade.php b/public/installer/Views/environment.blade.php
index 77a427a89..1744a804f 100644
--- a/public/installer/Views/environment.blade.php
+++ b/public/installer/Views/environment.blade.php
@@ -18,7 +18,12 @@
                             <div class="form-group" id="app_url">
                                 <label for="application_url" class="required">Default URL</label>
                                 <input type="text" name="app_url" id="application_url" class="form-control" value="https://<?php echo $_SERVER['HTTP_HOST']; ?>" 
-                                    data-validation="required length" data-validation-length="max50">
+                                    data-validation="required">
+                            </div>
+
+                            <div class="form-group" id="app_url">
+                                <label for="application_admin" class="required">Default admin suffix</label>
+                                <input type="text" name="app_admin_url" id="application_admin" class="form-control" value="admin" data-validation="required">
                             </div>
                             
                             <div class="form-group" id="app_currency">