Check if .env.example exists in web installer

freescout-help-desk · Nov 13, 2018 · d1ba487 · d1ba487
1 parent 5294213
commit d1ba487
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,4 +29,5 @@ Thumbs.db
 /public/modules
 /storage/.ignore_locales
 /storage/.installed
-/tools
+/tools
+.well-known
diff --git a/.htaccess b/.htaccess
@@ -1,4 +1,6 @@
 # On some hostings it is impossible to change web root directory
 # so we rewrite all web requests into /public folder
-RewriteEngine on
-RewriteRule (.*) /public/$1 [L]
+<IfModule mod_rewrite.c>
+	RewriteEngine on
+	RewriteRule (.*) /public/$1 [L]
+</IfModule>
diff --git a/public/install.php b/public/install.php
@@ -123,6 +123,13 @@ function showPermissionsError()
 if (empty($app_key)) {
     // Copy .env.example
     if (!file_exists($root_dir.'.env')) {
+
+        // Check if .env.example eixists
+        if (!file_exists($root_dir.'.env.example')) {
+            showError('File <strong>'.$root_dir.'.env.example</strong> not found. Please make sure to copy this file from the application dist.');
+            exit();
+        }
+
         copy($root_dir.'.env.example', $root_dir.'.env');
 
         if (!file_exists($root_dir.'.env')) {