Constants PATH and _DB_TYPE replaced

diff --git a/application/blog/init.php b/application/blog/init.php
index a9739a537b520b3402e198a288c5cf9f35fb6302..4043f37ee404b854276357e047d10a629900e6cb 100644 (file)
--- a/application/blog/init.php
+++ b/application/blog/init.php
@@ -34,17 +34,17 @@
  */
 
 // Initialize output system
  */
 
 // Initialize output system

-require(PATH . 'inc/output.php');
+require($cfg->readConfig('base_path') . 'inc/output.php');

 
 // Initialize file i/o system
 
 // Initialize file i/o system

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Include the language sub-system
 
 // Include the language sub-system

-require(PATH . 'inc/language.php');
+require($cfg->readConfig('base_path') . 'inc/language.php');

 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index ddae1d49ff7a45a1a90e3342658885c96d3760dd..1f664a66f85adec338d7057d5166523ddf77d34e 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -188,7 +188,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
        public function readApplicationDirectory () {
                // Generate the base path for all applications
                $appBasePath = sprintf("%s%s/",
        public function readApplicationDirectory () {
                // Generate the base path for all applications
                $appBasePath = sprintf("%s%s/",

-                       PATH,
+                       $this->getConfigInstance()->readConfig('base_path'),

                        $this->getConfigInstance()->readConfig('application_path')
                );
 
                        $this->getConfigInstance()->readConfig('application_path')
                );
 

diff --git a/application/selector/init.php b/application/selector/init.php
index 4a4a147e82de28c35689586dcdbbef6d37d9b2d8..cac841df5223d9364e01be54ec7e47aaf3e115df 100644 (file)
--- a/application/selector/init.php
+++ b/application/selector/init.php
@@ -26,13 +26,13 @@
  */
 
 // Initialize output system
  */
 
 // Initialize output system

-require(PATH . 'inc/output.php');
+require($cfg->readConfig('base_path') . 'inc/output.php');

 
 // Initialize file i/o system
 
 // Initialize file i/o system

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Include the language sub-system
 
 // Include the language sub-system

-require(PATH . 'inc/language.php');
+require($cfg->readConfig('base_path') . 'inc/language.php');

 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index b9220e90cb5ab9bb8f14db4691abadaf005d9500..548894c981ed7b387453184bd111ae43b6d57c88 100644 (file)
--- a/application/ship-simu/init.php
+++ b/application/ship-simu/init.php
@@ -34,17 +34,17 @@
  */
 
 // Initialize output system
  */
 
 // Initialize output system

-require(PATH . 'inc/output.php');
+require($cfg->readConfig('base_path') . 'inc/output.php');

 
 // Initialize file i/o system
 
 // Initialize file i/o system

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Include the language sub-system
 
 // Include the language sub-system

-require(PATH . 'inc/language.php');
+require($cfg->readConfig('base_path') . 'inc/language.php');

 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",

diff --git a/application/todo/init.php b/application/todo/init.php
index 38482f91e91cfe4c98c4f848571a388b5d39df90..3f7a8857ad81d96052048d271ce7dcc9a936c5b5 100644 (file)
--- a/application/todo/init.php
+++ b/application/todo/init.php
@@ -34,17 +34,17 @@
  */
 
 // Initialize output system
  */
 
 // Initialize output system

-require(PATH . 'inc/output.php');
+require($cfg->readConfig('base_path') . 'inc/output.php');

 
 // Initialize file i/o system
 
 // Initialize file i/o system

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Include the language sub-system
 
 // Include the language sub-system

-require(PATH . 'inc/language.php');
+require($cfg->readConfig('base_path') . 'inc/language.php');

 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
 
 // Generate call-back function
 $callback = sprintf("%s::getInstance",

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 5652f4fa03001c7363ee453b6f6487eb6daaadbc..061b2f4da45953b8baae6f7db1d548fd3e4fb069 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -281,7 +281,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
                        // Set the compressor channel
                        $this->setCompressorChannel(CompressorChannel::createCompressorChannel(sprintf("%s%s",
 
                        // Set the compressor channel
                        $this->setCompressorChannel(CompressorChannel::createCompressorChannel(sprintf("%s%s",

-                               PATH,
+                               $this->getConfigInstance()->readConfig('base_path'),

                                $this->getConfigInstance()->readConfig('compressor_base_path')
                        )));
 
                                $this->getConfigInstance()->readConfig('compressor_base_path')
                        )));
 


@@ -719,7 +719,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
                // Generate FQFN for all application templates
                $fqfn = sprintf("%s%s/%s/%s",
 
                // Generate FQFN for all application templates
                $fqfn = sprintf("%s%s/%s/%s",

-                       PATH,
+                       $this->getConfigInstance()->readConfig('base_path'),

                        $this->getConfigInstance()->readConfig('application_path'),
                        strtolower($appInstance->getAppShortName()),
                        $this->getConfigInstance()->readConfig('tpl_base_path')
                        $this->getConfigInstance()->readConfig('application_path'),
                        strtolower($appInstance->getAppShortName()),
                        $this->getConfigInstance()->readConfig('tpl_base_path')

diff --git a/inc/classes/main/template/image/class_ImageTemplateEngine.php b/inc/classes/main/template/image/class_ImageTemplateEngine.php
index 210002ffe9dd04119b6b200b532a4d112c857b70..68d1cbef656889d941dc91e3076d62b840428f74 100644 (file)
--- a/inc/classes/main/template/image/class_ImageTemplateEngine.php
+++ b/inc/classes/main/template/image/class_ImageTemplateEngine.php
@@ -100,7 +100,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates

-               $tplInstance->setCompileOutputPath(PATH . $cfgInstance->readConfig('compile_output_path'));
+               $tplInstance->setCompileOutputPath($cfgInstance->readConfig('base_path') . $cfgInstance->readConfig('compile_output_path'));

 
                // Return the prepared instance
                return $tplInstance;
 
                // Return the prepared instance
                return $tplInstance;

diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index fbe229d7cf9454630a22705204104bf17dec3414..8fcd0f9e5f685b963bb454fec23dbd736c4d6246 100644 (file)
--- a/inc/classes/main/template/mail/class_MailTemplateEngine.php
+++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php
@@ -100,7 +100,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates

-               $tplInstance->setCompileOutputPath(PATH . $cfgInstance->readConfig('compile_output_path'));
+               $tplInstance->setCompileOutputPath($cfgInstance->readConfig('base_path') . $cfgInstance->readConfig('compile_output_path'));

 
                // Return the prepared instance
                return $tplInstance;
 
                // Return the prepared instance
                return $tplInstance;

diff --git a/inc/classes/main/template/web/class_WebTemplateEngine.php b/inc/classes/main/template/web/class_WebTemplateEngine.php
index d166f9f0191ca14e0ccfbe2b43711a16ad6c9348..61a6bbb1075a90d2ebe55c06794dd543614f7bf0 100644 (file)
--- a/inc/classes/main/template/web/class_WebTemplateEngine.php
+++ b/inc/classes/main/template/web/class_WebTemplateEngine.php
@@ -81,7 +81,7 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates
                $tplInstance->setCodeTemplateExtension($cfgInstance->readConfig('code_template_extension'));
 
                // Absolute output path for compiled templates

-               $tplInstance->setCompileOutputPath(PATH . $cfgInstance->readConfig('compile_output_path'));
+               $tplInstance->setCompileOutputPath($cfgInstance->readConfig('base_path') . $cfgInstance->readConfig('compile_output_path'));

 
                // Return the prepared instance
                return $tplInstance;
 
                // Return the prepared instance
                return $tplInstance;

diff --git a/inc/config.php b/inc/config.php
index 4c739507448a53cf20f9560a624a52a63c294fa8..8f25248f9dcb10370ba8a73f1632ca8f714c97e9 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -33,16 +33,16 @@
 $cfg = FrameworkConfiguration::createFrameworkConfiguration();
 
 // CFG: SERVER-PATH
 $cfg = FrameworkConfiguration::createFrameworkConfiguration();
 
 // CFG: SERVER-PATH

-$cfg->definePath(dirname(dirname(__FILE__)) . '/'); // DON'T MISS THE TRAILING SLASH!!!
+$cfg->setConfigEntry('base_path', (dirname(dirname(__FILE__)) . '/')); // DON'T MISS THE TRAILING SLASH!!!

 
 // CFG: BASE-URL
 $cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
 
 // CFG: DATABASE-TYPE
 
 // CFG: BASE-URL
 $cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
 
 // CFG: DATABASE-TYPE

-$cfg->defineDatabaseType('local');
+$cfg->setConfigEntry('db_type', "local");

 
 // CFG: LOCAL-DB-PATH
 
 // CFG: LOCAL-DB-PATH

-$cfg->setConfigEntry('local_db_path', "db/");
+$cfg->setConfigEntry('local_db_path', $cfg->readConfig('base_path', "db/"));

 
 // CFG: TIME-ZONE
 $cfg->setDefaultTimezone("Europe/Berlin");
 
 // CFG: TIME-ZONE
 $cfg->setDefaultTimezone("Europe/Berlin");

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 6bfdfbf7c1efab379a9cb45a1c0a2bd9e4d0b6ad..8f6fa15f45cd254137a917bb7744bd481a3974f8 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -139,7 +139,7 @@ class FrameworkConfiguration implements Registerable {
                                        // Base path added? (Uni* / Windows)
                                        if ((substr($inc, 0, 1) != "/") && (substr($inc, 1, 1) != ":")) {
                                                // Generate FQFN
                                        // Base path added? (Uni* / Windows)
                                        if ((substr($inc, 0, 1) != "/") && (substr($inc, 1, 1) != ":")) {
                                                // Generate FQFN

-                                               $fqfn = sprintf("%s/inc/extra/%s", PATH, $inc);
+                                               $fqfn = sprintf("%s/inc/extra/%s", $this->readConfig('base_path'), $inc);

                                        } // END - if
                                } // END - if
 
                                        } // END - if
                                } // END - if
 


@@ -149,63 +149,14 @@ class FrameworkConfiguration implements Registerable {
                } // END - if
        }
 
                } // END - if
        }
 

-       /**
-        * Define the database type which must be valid and will not be verified.
-        *
-        * @param               $type   The database type. See path inc/database/.
-        * @return      void
-        */
-       public function defineDatabaseType ($type) {
-               // Is it defined or not?
-               if (defined('_DB_TYPE')) {
-                       // Already defined! But we cannot throw an exception here... :(
-                       ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the database type only once in your application!",
-                               __CLASS__
-                       ));
-               }
-
-               // Set the constant
-               define('_DB_TYPE', (string) $type);
-       }
-
-       /**
-        * Define the local file path
-        *
-        * @param               $path   Local file path for include files.
-        * @return      void
-        */
-       public function definePath ($path) {
-               // Cast to string
-               $path = (string) $path;
-
-               // Replace backslashes with slashes
-               $path = str_replace("\\", "/", $path);
-
-               // Is it defined or not?
-               if ((!is_dir($path)) || (!is_readable($path))) {
-                       // Is not a valid path
-                       ApplicationEntryPoint::app_die(sprintf("[%s:] Invalid path (not found) specified. Please make sure it is created.",
-                               __CLASS__
-                       ));
-               } elseif (defined('PATH')) {
-                       // Already defined! But we cannot throw an exception here... :(
-                       ApplicationEntryPoint::app_die(sprintf("[%s:] Please define the local file path only once in your application.",
-                               __CLASS__
-                       ));
-               }
-
-               // Define path here
-               define('PATH', $path);
-       }
-

        /**
         * Read a configuration element.
         *
        /**
         * Read a configuration element.
         *

-        * @param               $cfgEntry       The configuration element
+        * @param       $cfgEntry       The configuration element

         * @return      $cfgValue       The fetched configuration value
         * @return      $cfgValue       The fetched configuration value

-        * @throws      ConfigEntryIsEmptyException     If $cfgEntry is empty
+        * @throws      ConfigEntryIsEmptyException             If $cfgEntry is empty

         * @throws      ConfigEntryNotFoundException    If a configuration element
         * @throws      ConfigEntryNotFoundException    If a configuration element

-        *                                                                      was not found
+        *                                                                                      was not found

         */
        public function readConfig ($cfgEntry) {
                // Cast to string
         */
        public function readConfig ($cfgEntry) {
                // Cast to string


@@ -232,8 +183,8 @@ class FrameworkConfiguration implements Registerable {
        /**
         * Set a configuration entry.
         *
        /**
         * Set a configuration entry.
         *

-        * @param               $cfgEntry       The configuration entry we want to add/change
-        * @param               $cfgValue       The configuration value we want to set
+        * @param       $cfgEntry       The configuration entry we want to add/change
+        * @param       $cfgValue       The configuration value we want to set

         * @return      void
         * @throws      ConfigEntryIsEmptyException     If $cfgEntry is empty
         */
         * @return      void
         * @throws      ConfigEntryIsEmptyException     If $cfgEntry is empty
         */

diff --git a/inc/database.php b/inc/database.php
index 1d381d2e2b482139d043173e4caebb3e9d8c4dde..7f9003a897139e76bd3ff8f31c72c1243702b8f6 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -25,19 +25,14 @@
 // Initialize layer
 $layer = null;
 
 // Initialize layer
 $layer = null;
 

-// Is the type defined?
-if (!defined('_DB_TYPE')) {
-       // Abort here
-       ApplicationEntryPoint::app_die("[Main:] Please define a database type first!<br />
-E.g.:<pre>&#36;cfg->defineDatabaseType(&quot;local&quot;);</pre>
-This will choose the local file-based database layer.");
-}
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();

 
 // Generate FQFN for the database layer
 $INC = sprintf("%sinc/database/lib-%s%s",
 
 // Generate FQFN for the database layer
 $INC = sprintf("%sinc/database/lib-%s%s",

-       PATH,
-       _DB_TYPE,
-       FrameworkConfiguration::getInstance()->readConfig('php_extension')
+       $cfg->readConfig('base_path'),
+       $cfg->readConfig('db_type'),
+       $cfg->readConfig('php_extension')

 );
 
 // Load the database layer include
 );
 
 // Load the database layer include


@@ -47,7 +42,7 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",

-               _DB_TYPE
+               $cfg->readConfig('db_type')

        ));
 }
 
        ));
 }
 

diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php
index 7216bedd6eedf727fe74b77fe305fac57e115f85..f9ec63e5f0ce7112d15c56a7061c27da8efb15b0 100644 (file)
--- a/inc/database/lib-local.php
+++ b/inc/database/lib-local.php
@@ -24,7 +24,7 @@
 
 // Zum Testen speichern wir in lokale Dateien (LocalFileDatabase)
 try {
 
 // Zum Testen speichern wir in lokale Dateien (LocalFileDatabase)
 try {

-       $layer = LocalFileDatabase::createLocalFileDatabase(PATH . FrameworkConfiguration::getInstance()->readConfig('local_db_path'), FileIoHandler::getInstance());
+       $layer = LocalFileDatabase::createLocalFileDatabase(FrameworkConfiguration::getInstance()->readConfig('local_db_path'), FileIoHandler::getInstance());

 } catch (SavePathIsEmptyException $e) {
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer could not be initialized. Reason: <strong>%s</strong>",
                $e->getMessage()
 } catch (SavePathIsEmptyException $e) {
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer could not be initialized. Reason: <strong>%s</strong>",
                $e->getMessage()

diff --git a/inc/includes.php b/inc/includes.php
index 41933d9544f8b36974032ce942b3ebdc819cc070..54bd39be01546f744b9cb064b576ab3cc833377f 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -26,7 +26,7 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Include the class loader function
 $cfg = FrameworkConfiguration::getInstance();
 
 // Include the class loader function

-require(sprintf("%sinc/loader/class_ClassLoader%s", PATH, $cfg->readConfig('php_extension')));
+require(sprintf("%sinc/loader/class_ClassLoader%s", $cfg->readConfig('base_path'), $cfg->readConfig('php_extension')));

 
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {
 
 // Does the user has an application specified?
 if (!empty($_GET['app'])) {


@@ -71,7 +71,7 @@ function __autoload ($className) {
 /**
  * Is the devel package included?
  */
 /**
  * Is the devel package included?
  */

-if (is_dir(sprintf("%sdevel", PATH))) {
+if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {

        /**
         * Load all development includes
         */
        /**
         * Load all development includes
         */

diff --git a/inc/language.php b/inc/language.php
index 3f7c3859cbc2e97cf2785b8a36c3d056c33ba129..6db17c0ba7bb4ec55caf0da4b4ad868de3734dbf 100644 (file)
--- a/inc/language.php
+++ b/inc/language.php
@@ -22,7 +22,7 @@
  */
 try {
        $lang = LanguageSystem::createLanguageSystem(sprintf("%s%s",
  */
 try {
        $lang = LanguageSystem::createLanguageSystem(sprintf("%s%s",

-               PATH,
+               $cfg->readConfig('base_path'),

                FrameworkConfiguration::getInstance()->readConfig('lang_base_path')
        ));
 } catch (LanguagePathIsEmptyException $e) {
                FrameworkConfiguration::getInstance()->readConfig('lang_base_path')
        ));
 } catch (LanguagePathIsEmptyException $e) {

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 7297c7d199355193949bb933514ff1e88c3d7fff..5f5f97a3446db380af0842e9665b685e06cbb222 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -119,8 +119,8 @@ class ClassLoader {
 
                // Construct the FQFN for the cache
                if (!defined('DEVELOPER')) {
 
                // Construct the FQFN for the cache
                if (!defined('DEVELOPER')) {

-                       $this->listCacheFQFN  = PATH . $this->cfgInstance->readConfig('local_db_path') . "list-" . $this->cfgInstance->readConfig('app_name') . ".cache";
-                       $this->classCacheFQFN = PATH . $this->cfgInstance->readConfig('local_db_path') . "class-" . $this->cfgInstance->readConfig('app_name') . ".cache";
+                       $this->listCacheFQFN  = $this->cfgInstance->readConfig('base_path') . $this->cfgInstance->readConfig('local_db_path') . "list-" . $this->cfgInstance->readConfig('app_name') . ".cache";
+                       $this->classCacheFQFN = $this->cfgInstance->readConfig('base_path') . $this->cfgInstance->readConfig('local_db_path') . "class-" . $this->cfgInstance->readConfig('app_name') . ".cache";

                } // END - if
 
                // Set suffix and prefix from configuration
                } // END - if
 
                // Set suffix and prefix from configuration


@@ -208,8 +208,8 @@ class ClassLoader {
        /**
         * Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
         *
        /**
         * Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
         *

-        * @param               $basePath               The relative base path to PATH constant for all classes
-        * @param               $ignoreList     An optional list (array or string) of directory names which shall be ignored
+        * @param       $basePath               The relative base path to 'base_path' constant for all classes
+        * @param       $ignoreList             An optional list (array or string) of directory names which shall be ignored

         * @return      void
         */
        public function loadClasses ($basePath, $ignoreList = array() ) {
         * @return      void
         */
        public function loadClasses ($basePath, $ignoreList = array() ) {


@@ -280,7 +280,7 @@ class ClassLoader {
                $this->prefixLen = strlen($this->prefix);
 
                // Set base directory
                $this->prefixLen = strlen($this->prefix);
 
                // Set base directory

-               $basePath = sprintf("%sinc/config/", PATH);
+               $basePath = sprintf("%sinc/config/", $this->cfgInstance->readConfig('base_path'));

 
                // Load all classes from the config directory
                $this->loadClasses($basePath);
 
                // Load all classes from the config directory
                $this->loadClasses($basePath);

diff --git a/inc/selector.php b/inc/selector.php
index a1ae868810ed07cc3b140d2a876d625c43039877..69f413461e49982447cc5cf7ea9b1ceee32ec71c 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -46,7 +46,7 @@ foreach ($configAppIncludes as $inc) {
 
        // Generate a FQFN for the helper class
        $fqfn = sprintf("%s%s/%s/%s%s",
 
        // Generate a FQFN for the helper class
        $fqfn = sprintf("%s%s/%s/%s%s",

-               PATH,
+               $cfg->readConfig('base_path'),

                $cfg->readConfig('application_path'),
                $cfg->readConfig('app_name'),
                $inc,
                $cfg->readConfig('application_path'),
                $cfg->readConfig('app_name'),
                $inc,

diff --git a/index.php b/index.php
index 9d61748040789a81eec21cfd61263ca3a1ff4d9b..f6c600516d2b1ff3c87a0f8facc82a18a0a0e3b7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -68,7 +68,7 @@ class ApplicationEntryPoint {
                if (empty($message)) {
                        // No message provided
                        $message = "No message provided!";
                if (empty($message)) {
                        // No message provided
                        $message = "No message provided!";

-               }
+               } // END - if

 
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
 
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');


@@ -150,13 +150,13 @@ class ApplicationEntryPoint {
                require(dirname(__FILE__) . '/inc/config.php');
 
                // Load all include files
                require(dirname(__FILE__) . '/inc/config.php');
 
                // Load all include files

-               require(PATH . 'inc/includes.php');
+               require($cfg->readConfig('base_path') . 'inc/includes.php');

 
                // Load all framework classes
 
                // Load all framework classes

-               require(PATH . 'inc/classes.php');
+               require($cfg->readConfig('base_path') . 'inc/classes.php');

 
                // Include the application selector
 
                // Include the application selector

-               require(PATH . 'inc/selector.php');
+               require($cfg->readConfig('base_path') . 'inc/selector.php');

        } // END - main()
 
 } // END - class
        } // END - main()
 
 } // END - class

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index df0cc13df6b3b98ac53bceb18bf9793ca6246f29..7c70e61b7987f4a426f35c0a0d7cff1584bdfda3 100644 (file)
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -8,10 +8,10 @@ print (basename(__FILE__).": Init...\n");
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');

diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index 73ca2583b6b2c18d14b53c3d209c10891447f78d..e4dc50e57e4f8184ed8aef64c9b0e0b9fa55cc51 100644 (file)
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -8,10 +8,10 @@ print (basename(__FILE__).": Init...\n");
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
index d7e86535e9532d9131a936d664e2b263d0cf55f5..0104f63504f428b16179b2672aab6129241b206d 100644 (file)
--- a/tests/RequestTest.php
+++ b/tests/RequestTest.php
@@ -8,10 +8,10 @@ print (basename(__FILE__).": Init...\n");
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');

diff --git a/tests/Test.php b/tests/Test.php
index a3f8c65d68bd9a9c63b53f664d78dc289129a809..7e5a551c428b0167367b414489e4b9a1f7c1ee98 100644 (file)
--- a/tests/Test.php
+++ b/tests/Test.php
@@ -8,10 +8,10 @@ print (basename(__FILE__).": Init...\n");
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files
 require(dirname(dirname(__FILE__)) . '/inc/config.php');
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');

diff --git a/tests/old/contract-test.php b/tests/old/contract-test.php
index 3c56da51a9a998944d566db13cac659d590acb68..3e9cd2b4ba735f0d8e2fef8f25cc11b13028d83f 100644 (file)
--- a/tests/old/contract-test.php
+++ b/tests/old/contract-test.php
@@ -9,23 +9,23 @@ define('TEST_MODE', true);
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Load file I/O handler
 
 // Load file I/O handler

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Load database layer
 
 // Load database layer

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes

-require(PATH . 'application/ship-simu/loader.php');
+require($cfg->readConfig('base_path') . 'application/ship-simu/loader.php');

 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen
 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen

diff --git a/tests/old/loader-test.php b/tests/old/loader-test.php
index a00440a810aa5e9cc79d22654ad799b978c12336..6d885ab9fe83dfc8d10cd8077b318aa90c4f68ae 100644 (file)
--- a/tests/old/loader-test.php
+++ b/tests/old/loader-test.php
@@ -9,23 +9,23 @@ define('TEST_MODE', true);
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Load file I/O handler
 
 // Load file I/O handler

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Load database layer
 
 // Load database layer

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes

-require(PATH . 'application/ship-simu/loader.php');
+require($cfg->readConfig('base_path') . 'application/ship-simu/loader.php');

 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen
 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen

diff --git a/tests/old/personell-test.php b/tests/old/personell-test.php
index 43c2944e1ca42bb5a98c53774aa6e59c9c4c9293..67dea21ae1423e1a34d7a3b07ca77e9bb92c39d8 100644 (file)
--- a/tests/old/personell-test.php
+++ b/tests/old/personell-test.php
@@ -9,23 +9,23 @@ define('TEST_MODE', true);
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files
 require(dirname(dirname(dirname(__FILE__))) . "/inc/config.php");
 
 // Load all include files

-require(PATH . 'inc/includes.php');
+require($cfg->readConfig('base_path') . 'inc/includes.php');

 
 // Load all game classes
 
 // Load all game classes

-require(PATH . 'inc/classes.php');
+require($cfg->readConfig('base_path') . 'inc/classes.php');

 
 // Load file I/O handler
 
 // Load file I/O handler

-require(PATH . 'inc/file_io.php');
+require($cfg->readConfig('base_path') . 'inc/file_io.php');

 
 // Load database layer
 
 // Load database layer

-require(PATH . 'inc/database.php');
+require($cfg->readConfig('base_path') . 'inc/database.php');

 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes
 
 // Set default application
 FrameworkConfiguration::getInstance()->setConfigEntry('default_application', 'ship-simu');
 $application = 'ship-simu';
 
 // Load more includes

-require(PATH . 'application/ship-simu/loader.php');
+require($cfg->readConfig('base_path') . 'application/ship-simu/loader.php');

 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen
 
 // Wir tun hier so, als waere schon das Reederei-Objekt generiert und wir wollen
 // jetzt die Personalliste wiederherstellen