Static method detectCorePath() must be added to ApplicationEntryPoint

[shipsimu.git] / index.php

diff --git a/index.php b/index.php
index a6846bf8cc21ee7690c5a8bcf949a348311b1bdf..3945af962076cc247ed0e9b1ab2e30f6a3c3e30d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ define('DEVELOPER', true);
 //xdebug_start_trace();
 /**
  * The main class with the entry point to the whole application. This class
- * "emulates" Java(tm)'s entry point call. Additionally it covers local
+ * "emulates" Java's entry point call. Additionally it covers local
  * variables from outside access to prevent possible attacks on uninitialized
  * local variables.
  *
@@ -29,7 +29,12 @@ define('DEVELOPER', true);
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationEntryPoint {
+final class ApplicationEntryPoint {
+       /**
+        * Core path
+        */
+       private static $corePath = '';
+
        /**
         * The instances we want to remove after all is done
         *
@@ -83,17 +88,16 @@ class ApplicationEntryPoint {
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
                $lang = LanguageSystem::getInstance();
-               $io = FileIoHandler::getInstance();
 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?
-               if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
+               if ((class_exists($tpl)) && (is_object($lang))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
-                               $templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+                               $templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
                        } catch (FrameworkException $e) {
                                die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
                                        $e->getMessage()
@@ -156,20 +160,33 @@ class ApplicationEntryPoint {
                }
        }
 
+       /**
+        * Determines the correct absolute path for all include
+        *
+        * @return      $basePath       Base path (core) for all includes
+        */
+       protected static function detectCorePath () {
+               // Is it not set?
+               if (empty(self::$corePath)) {
+                       // Auto-detect our core path
+                       self::$corePath = str_replace("\\", '/', dirname(__FILE__));
+               } // END - if
+
+               // Return it
+               return self::$corePath;
+       }
+
        /**
         * The application's main entry point. This class isolates some local
         * variables which shall not become visible to outside because of security
         * concerns. We are doing this here to "emulate" the well-known entry
-        * point in Java(tm).
+        * point in Java.
         *
         * @return      void
         */
        public static function main () {
-               // Some non-global common arrays we need...
-               global $_SERVER;
-
                // Load config file
-               require(dirname(__FILE__) . '/inc/config.php');
+               require(self::detectCorePath() . '/inc/config.php');
 
                // Load all include files
                require($cfg->readConfig('base_path') . 'inc/includes.php');