merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added admin url suffix

This commit is contained in:
ghermans 2020-12-31 18:44:36 +01:00
parent 73796be56a
commit f745f48860
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/installer/EnvConfig.php
View File

@ -14,6 +14,9 @@ $data = array();
if (empty($_POST['app_url'])) if (empty($_POST['app_url']))
$errors['app_url'] = 'App Url is required.'; $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'])) if (empty($_POST['app_currency']))
$errors['app_currency'] = 'The application currency is required.'; $errors['app_currency'] = 'The application currency is required.';
@ -38,6 +41,9 @@ $data = array();
if (preg_match('/\s/', $_POST['app_url'])) if (preg_match('/\s/', $_POST['app_url']))
$errors['app_url_space'] = 'There should be no space in 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'])) if (preg_match('/\s/', $_POST['app_name']))
$errors['app_name_space'] = 'There should be no space in 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['DB_PASSWORD'] = $_POST["user_password"];
$keyValueData['APP_NAME'] = $_POST["app_name"]; $keyValueData['APP_NAME'] = $_POST["app_name"];
$keyValueData['APP_URL'] = $_POST["app_url"]; $keyValueData['APP_URL'] = $_POST["app_url"];
$keyValueData['APP_ADMIN_URL'] = $_POST["app_admin_url"];
$keyValueData['APP_CURRENCY'] = $_POST["app_currency"]; $keyValueData['APP_CURRENCY'] = $_POST["app_currency"];
$keyValueData['APP_LOCALE'] = $_POST["app_locale"]; $keyValueData['APP_LOCALE'] = $_POST["app_locale"];
$keyValueData['APP_TIMEZONE'] = $_POST["app_timezone"]; $keyValueData['APP_TIMEZONE'] = $_POST["app_timezone"];

7
public/installer/Views/environment.blade.php
View File

@ -18,7 +18,12 @@
<div class="form-group" id="app_url"> <div class="form-group" id="app_url">
<label for="application_url" class="required">Default URL</label> <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']; ?>" <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>
<div class="form-group" id="app_currency"> <div class="form-group" id="app_currency">