Application init phase rewritten, data.php now sets app data

[shipsimu.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 69f413461e49982447cc5cf7ea9b1ceee32ec71c..d20cbcb04abcd0c14fa5a5b6fa182142a5395d43 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -29,6 +29,7 @@ $cfg = FrameworkConfiguration::getInstance();
 $configAppIncludes = array(
        sprintf("class_%s", $cfg->readConfig('app_helper_class')), // The ApplicationHelper class
        "config",               // The application's own configuration
+       "data",                 // Application data
        "init",                 // The application initializer
        "loader",               // The application's class loader
        "debug",                // Some debugging stuff
@@ -45,12 +46,10 @@ foreach ($configAppIncludes as $inc) {
        }
 
        // Generate a FQFN for the helper class
-       $fqfn = sprintf("%s%s/%s/%s%s",
-               $cfg->readConfig('base_path'),
+       $fqfn = sprintf("%s%s/%s.php",
                $cfg->readConfig('application_path'),
                $cfg->readConfig('app_name'),
-               $inc,
-               $cfg->readConfig('php_extension')
+               $inc
        );
 
        // Does the include file exists?
@@ -59,8 +58,8 @@ foreach ($configAppIncludes as $inc) {
                require_once($fqfn);
        } elseif ($cfg->readConfig('verbose_level') > 0) {
                // File is missing
-               trigger_error(sprintf("Cannot load application script %s! File is missing or read-protected.",
-                       $inc . $cfg->readConfig('php_extension')
+               trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
+                       $inc
                ));
        }
 }