Let's name it better, more clear.

[core.git] / index.php

diff --git a/index.php b/index.php
index f0f02f6df124b1ce00ac8d4c18ab96d35d9b7310..c5ab7dd84aa667e4ab04a4e84428395338562344 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,6 +6,7 @@ namespace CoreFramework\EntryPoint;
 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;
@@ -24,7 +25,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 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -57,7 +58,7 @@ 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 ($message = '', $code = false, $extraData = '', $silentMode = false) {
                // Is this method already called?
                if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly
@@ -90,7 +91,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))) {
@@ -192,7 +193,7 @@ 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);
 
@@ -205,22 +206,19 @@ final class ApplicationEntryPoint {
                                        continue;
                                } // END - if
 
+                               // Append framework path
+                               $frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
+
                                // 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
-                               );
+                               $configFile = $frameworkPath . 'config-global.php';
 
                                // Debug message
-                               //* NOISY-DEBUG: */ printf('[%s:%d]: fqfn=%s' . PHP_EOL, __METHOD__, __LINE__, $fqfn);
+                               //* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile);
 
                                // Is it readable?
-                               if (is_readable($fqfn)) {
+                               if (is_readable($configFile)) {
                                        // Found one
-                                       self::$frameworkPath = $realPath . '/framework/';
+                                       self::$frameworkPath = $frameworkPath;
 
                                        // Abort here
                                        break;