From 552196ce575f0a043ef47be16abf3263230fe5e2 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 2 Sep 2020 18:47:38 -0400
Subject: [PATCH] Fix root detection #798

---
 public/index.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/public/index.php b/public/index.php
index 9c2f9e1b..aba76258 100755
--- a/public/index.php
+++ b/public/index.php
@@ -1,26 +1,37 @@
 <?php
 
 /**
- * phpVMS
+ * phpVMS Entry Point
+ * https://phpvms.net
+ * https://docs.phpvms.net
  */
 
 /**
+ * NOTE!!
+ *
  * If you move the public folder, or all the files in the public folder,
  * be sure to change this to point to the right place. View these docs:
  *
- * https://docs.phpvms.net/installation/installation
+ * https://docs.phpvms.net/installation/uploading
  */
 $path_to_phpvms_folder = __DIR__.'/../';
-if (file_exists($path_to_phpvms_folder.'/bootstrap/autoload.php')) {
-    require $path_to_phpvms_folder.'/bootstrap/autoload.php';
+if (file_exists($path_to_phpvms_folder.'bootstrap/autoload.php')) {
+    require $path_to_phpvms_folder.'bootstrap/autoload.php';
+    $app = require_once $path_to_phpvms_folder.'bootstrap/app.php';
 }
 
 // Look up one more folder up (outside of the Laravel root) and in the `phpvms` subfolder
-elseif (file_exists($path_to_phpvms_folder.'/../phpvms/bootstrap/autoload.php')) {
-    require $path_to_phpvms_folder.'/../phpvms/bootstrap/autoload.php';
+elseif (file_exists($path_to_phpvms_folder.'../phpvms/bootstrap/autoload.php')) {
+    require $path_to_phpvms_folder.'../phpvms/bootstrap/autoload.php';
+    $app = require_once $path_to_phpvms_folder.'../phpvms/bootstrap/app.php';
+}
+
+// Bail out
+else {
+    echo 'Cannot find path to bootstrap/autoload.php. Modify this file to the proper path';
+    exit();
 }
 
-$app = require_once $path_to_phpvms_folder.'/bootstrap/app.php';
 $app->setPublicPath(__DIR__);
 
 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);