X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=46f5db5e3db33873e9aabba507ef3140aeb84367;hb=93a44a93d7d790d1e6dbe53f40f6c1582f2a730b;hp=61d5347327fde61f06cd9ded6066776cb11dd523;hpb=c6edcfe27f630eb68192783b155795273da28c2d;p=core.git

diff --git a/index.php b/index.php
index 61d53473..46f5db5e 100644
--- a/index.php
+++ b/index.php
@@ -1,16 +1,15 @@
 <?php
 // Own namespace (watch out: core)
-namespace CoreFramework\EntryPoint;
+namespace Org\Mxchange\CoreFramework\EntryPoint;
 
 // Import framework stuff
-use CoreFramework\Bootstrap\FrameworkBootstrap;
-use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filesystem\FileNotFoundException;
-use CoreFramework\Helper\Application\ApplicationHelper;
-use CoreFramework\Localization\LanguageSystem;
-use CoreFramework\Loader\ClassLoader;
-use CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
+use Org\Mxchange\CoreFramework\Localization\LanguageSystem;
+use Org\Mxchange\CoreFramework\Loader\ClassLoader;
+use Org\Mxchange\CoreFramework\Generic\FrameworkException;
 
 // Import SPL stuff
 use \Exception;
@@ -25,7 +24,7 @@ use \Exception;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -58,12 +57,12 @@ final class ApplicationEntryPoint {
 	 * @return	void
 	 * @todo	This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
 	 */
-	public static final function app_exit ($message = '', $code = false, $extraData = '', $silentMode = false) {
+	public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) {
 		// Is this method already called?
 		if (isset($GLOBALS['app_die_called'])) {
 			// Then output the text directly
 			exit($message);
-		} // END - if
+		}
 
 		// This method shall not be called twice
 		$GLOBALS['app_die_called'] = true;
@@ -72,16 +71,16 @@ final class ApplicationEntryPoint {
 		if (empty($message)) {
 			// No message provided
 			$message = 'No message provided.';
-		} // END - if
+		}
 
 		// Get config instance
-		$configInstance = FrameworkConfiguration::getSelfInstance();
+		$configInstance = FrameworkBootstrap::getConfigurationInstance();
 
 		// Do we have debug installation?
 		if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
 			// Abort here
-			exit();
-		} // END - if
+			exit;
+		}
 
 		// Get some instances
 		$tpl = $configInstance->getConfigEntry('html_template_class');
@@ -91,7 +90,7 @@ final class ApplicationEntryPoint {
 		$templateInstance = NULL;
 
 		// Get response instance
-		$responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance();
+		$responseInstance = FrameworkBootstrap::getResponseInstance();
 
 		// Is the template engine loaded?
 		if ((class_exists($tpl)) && (is_object($languageInstance))) {
@@ -106,19 +105,18 @@ final class ApplicationEntryPoint {
 			}
 
 			// Get and prepare backtrace for output
-			$backtraceArray = debug_backtrace();
 			$backtrace = '';
-			foreach ($backtraceArray as $key => $trace) {
+			foreach (debug_backtrace() as $key => $trace) {
 				// Set missing array elements
 				if (!isset($trace['file'])) {
 					$trace['file'] = __FILE__;
-				} // END - if
+				}
 				if (!isset($trace['line'])) {
 					$trace['line'] = __LINE__;
-				} // END - if
+				}
 				if (!isset($trace['args'])) {
 					$trace['args'] = array();
-				} // END - if
+				}
 
 				// Add the traceback path to the final output
 				$backtrace .= sprintf('<span class="backtrace_file">%s</span>:%d, <span class="backtrace_function">%s(%d)</span><br />' . PHP_EOL,
@@ -127,30 +125,30 @@ final class ApplicationEntryPoint {
 					$trace['function'],
 					count($trace['args'])
 				);
-			} // END - foreach
+			}
 
 			// Init application instance
 			$applicationInstance = NULL;
 
 			// Is the class there?
-			if (class_exists('CoreFramework\Helper\Application\ApplicationHelper')) {
+			if (class_exists('Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper')) {
 				// Get application instance
 				$applicationInstance = ApplicationHelper::getSelfInstance();
 
 				// Assign application data
-				$templateInstance->assignApplicationData($applicationInstance);
-			} // END - if
+				$templateInstance->assignApplicationData();
+			}
 
 			// We only try this
 			try {
 				// Assign variables
-				$templateInstance->assignVariable('message', $message);
-				$templateInstance->assignVariable('code', $code);
-				$templateInstance->assignVariable('extra', $extraData);
-				$templateInstance->assignVariable('backtrace', $backtrace);
+				$templateInstance->assignVariable('message'       , $message);
+				$templateInstance->assignVariable('code'          , $code);
+				$templateInstance->assignVariable('extra'         , $extraData);
+				$templateInstance->assignVariable('backtrace'     , $backtrace);
 				$templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal());
-				$templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
-				$templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));
+				$templateInstance->assignVariable('total_objects' , ObjectFactory::getTotal());
+				$templateInstance->assignVariable('title'         , $languageInstance->getMessage('emergency_exit_title'));
 
 				// Load the template
 				$templateInstance->loadCodeTemplate('emergency_exit');
@@ -172,10 +170,10 @@ final class ApplicationEntryPoint {
 			}
 
 			// Good bye...
-			exit();
+			exit;
 		} else {
 			// Output message and die
-			exit(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
+			die(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
 				$message
 			));
 		}
@@ -193,47 +191,40 @@ final class ApplicationEntryPoint {
 		// Is it not set?
 		if (empty(self::$frameworkPath)) {
 			// Auto-detect core path (first application-common)
-			foreach (array('core', '.', '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) {
+			foreach (array('core', __DIR__, '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) {
 				// Create full path for testing
 				$realPath = realpath($possiblePath);
 
-				// Debug message
-				//* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
-
 				// Is it false?
+				//* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath);
 				if ($realPath === false) {
 					// Then, not found.
 					continue;
-				} // END - if
+				}
 
-				// First create full-qualified file name (FQFN) to framework/config-global.php
-				$fqfn = sprintf(
-					'%s%sframework%sconfig-global.php',
-					$realPath,
-					DIRECTORY_SEPARATOR,
-					DIRECTORY_SEPARATOR,
-					$possiblePath
-				);
+				// Append framework path
+				$frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
 
-				// Debug message
-				//* NOISY-DEBUG: */ printf('[%s:%d]: fqfn=%s' . PHP_EOL, __METHOD__, __LINE__, $fqfn);
+				// First create full-qualified file name (FQFN) to framework/config-global.php
+				$configFile = $frameworkPath . 'config-global.php';
 
 				// Is it readable?
-				if (is_readable($fqfn)) {
+				//* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile);
+				if (is_readable($configFile)) {
 					// Found one
-					self::$frameworkPath = $realPath . '/framework/';
+					self::$frameworkPath = $frameworkPath;
 
 					// Abort here
 					break;
-				} // END - if
-			} // END - foreach
+				}
+			}
 
 			// Able to find?
 			if (!is_dir(self::$frameworkPath)) {
 				// Is no directory
 				throw new Exception('Cannot find framework.');
-			} // END - if
-		} // END - if
+			}
+		}
 
 		// Return it
 		return self::$frameworkPath;
@@ -278,9 +269,6 @@ final class ApplicationEntryPoint {
 	}
 }
 
-// Developer mode active? Comment out if no dev!
-define('DEVELOPER', true);
-
 // Log all exceptions (only debug! This option can create large error logs)
 //define('LOG_EXCEPTIONS', true);