X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=index.php;h=46f5db5e3db33873e9aabba507ef3140aeb84367;hp=35f9baa7b8d4013137e62a3366361c0ed5b0dff5;hb=HEAD;hpb=ceb7b679e1000712e0613864e9579e4ed31ca819

diff --git a/index.php b/index.php
index 35f9baa7..37fa2612 100644
--- a/index.php
+++ b/index.php
@@ -25,7 +25,7 @@ use \Exception;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -60,9 +60,11 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) {
 		// Is this method already called?
+		//* NOISY-DEBUG: */ printf('[%s:%d]: message=%s,code=%d,extraData=%s,silentMode=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message, $code, $extraData, intval($silentMode));
 		if (isset($GLOBALS['app_die_called'])) {
 			// Then output the text directly
-			exit($message);
+			print $message . PHP_EOL;
+			exit(255);
 		}
 
 		// This method shall not be called twice
@@ -80,7 +82,8 @@ final class ApplicationEntryPoint {
 		// Do we have debug installation?
 		if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
 			// Abort here
-			exit;
+			//* NOISY-DEBUG: */ printf('[%s:%d]: product_install_mode=%d,silentMode=%d - EXIT!' . PHP_EOL, __METHOD__, __LINE__, $configInstance->getConfigEntry('product_install_mode'), intval($silentMode));
+			exit(255);
 		}
 
 		// Get some instances
@@ -173,17 +176,20 @@ final class ApplicationEntryPoint {
 				$responseInstance->flushBuffer();
 			} catch (FileNotFoundException $e) {
 				// Even the template 'emergency_exit' wasn't found so output both message
-				exit($message . ', exception: ' . $e->getMessage());
+				print ($message . ', exception: ' . $e->getMessage() . PHP_EOL);
+				exit($e->getCode());
 			}
 
 			// Good bye...
-			exit;
+			exit(255);
 		} else {
 			// Output message and die
-			die(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
-				$message
-			));
+			printf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>', $message);
+			exit(255);
 		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
 	}
 
 	/**
@@ -196,16 +202,19 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function detectFrameworkPath () {
 		// Is it not set?
+		//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 		if (empty(self::$frameworkPath)) {
 			// Auto-detect core path (first application-common)
-			foreach (array('core', __DIR__, '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) {
+			foreach (['core', self::getRootPath(), '/usr/local/share/php/core', '/usr/share/php/core'] as $possiblePath) {
 				// Create full path for testing
+				//* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s' . PHP_EOL, __METHOD__, __LINE__, $possiblePath);
 				$realPath = realpath($possiblePath);
 
 				// Is it false?
 				//* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
 				if ($realPath === false) {
 					// Then, not found.
+					//* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s was not found. - SKIPPED!' . PHP_EOL, __METHOD__, __LINE__, $possiblePath);
 					continue;
 				}
 
@@ -213,6 +222,7 @@ final class ApplicationEntryPoint {
 				$frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
 
 				// First create full-qualified file name (FQFN) to framework/config-global.php
+				//* NOISY-DEBUG: */ printf('[%s:%d]: frameworkPath=%s' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath);
 				$configFile = $frameworkPath . 'config-global.php';
 
 				// Is it readable?
@@ -222,11 +232,13 @@ final class ApplicationEntryPoint {
 					self::$frameworkPath = $frameworkPath;
 
 					// Abort here
+					//* NOISY-DEBUG: */ printf('[%s:%d]: Setting self::frameworkPath=%s - BREAK!' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath);
 					break;
 				}
 			}
 
 			// Able to find?
+			//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - Checking ...' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 			if (!is_dir(self::$frameworkPath)) {
 				// Is no directory
 				throw new Exception('Cannot find framework.');
@@ -234,6 +246,7 @@ final class ApplicationEntryPoint {
 		}
 
 		// Return it
+		//* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - EXIT!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath);
 		return self::$frameworkPath;
 	}
 
@@ -257,6 +270,7 @@ final class ApplicationEntryPoint {
 	 */
 	public static final function main () {
 		// Load bootstrap file
+		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 		require sprintf('%sbootstrap%sbootstrap.inc.php', self::detectFrameworkPath(), DIRECTORY_SEPARATOR);
 
 		/*
@@ -273,13 +287,14 @@ final class ApplicationEntryPoint {
 		 * register the application instance in registry.
 		 */
 		FrameworkBootstrap::startApplication();
+
+		// Trace message
+		//* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
 	}
 }
 
 // Log all exceptions (only debug! This option can create large error logs)
 //define('LOG_EXCEPTIONS', true);
 
-//xdebug_start_trace();
-
 // Call above main() method
 ApplicationEntryPoint::main();