From 356cdf49910447db473a15c1bd2ef59452832db0 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Fri, 17 Apr 2020 19:57:22 +0200
Subject: [PATCH] Fixed pre requisite checker paths (fixes #748)

---
 app.php                         | 15 +--------------
 helpers/PrerequisiteChecker.php |  4 ++--
 public/index.php                | 13 +++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app.php b/app.php
index af65ad1b..112d84dd 100644
--- a/app.php
+++ b/app.php
@@ -8,19 +8,6 @@ use Slim\Factory\AppFactory;
 use Grocy\Helpers\UrlManager;
 use Grocy\Controllers\LoginController;
 
-// Definitions for embedded mode
-if (file_exists(__DIR__ . '/embedded.txt'))
-{
-	define('GROCY_IS_EMBEDDED_INSTALL', true);
-	define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
-	define('GROCY_USER_ID', 1);
-}
-else
-{
-	define('GROCY_IS_EMBEDDED_INSTALL', false);
-	define('GROCY_DATAPATH', __DIR__ . '/data');
-}
-
 // Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -29,7 +16,7 @@ require_once GROCY_DATAPATH . '/config.php';
 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
 
 // Definitions for dev/demo/prerelease mode
-if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+if ((GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease') && !defined('GROCY_USER_ID'))
 {
 	define('GROCY_USER_ID', 1);
 }
diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
index 31bc224a..ea46c39e 100644
--- a/helpers/PrerequisiteChecker.php
+++ b/helpers/PrerequisiteChecker.php
@@ -17,9 +17,9 @@ class PrerequisiteChecker
     
     private function checkForConfigFile()
     {
-        if (!file_exists(__DIR__ . '/../data/config.php'))
+        if (!file_exists(GROCY_DATAPATH . '/config.php'))
         {
-            throw new ERequirementNotMet('/data/config.php not found. Have you copied config-dist.php to the data directory and renamed it to config.php?');
+            throw new ERequirementNotMet('config.php in data directory (' . GROCY_DATAPATH . ') not found. Have you copied config-dist.php to the data directory and renamed it to config.php?');
         }
     }
 
diff --git a/public/index.php b/public/index.php
index e22b3975..4d7356ce 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,18 @@
 <?php
 
+// Definitions for embedded mode
+if (file_exists(__DIR__ . '/../embedded.txt'))
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', true);
+	define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/../embedded.txt'));
+	define('GROCY_USER_ID', 1);
+}
+else
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', false);
+	define('GROCY_DATAPATH', __DIR__ . '/../data');
+}
+
 require_once __DIR__ . '/../helpers/PrerequisiteChecker.php';
 
 try