readConfig() is not naming convention, renamed to getConfigEntry()

diff --git a/application/install/data.php b/application/install/data.php
index 453187eb20e259a377962470457d4a920d70449f..2c32bb8468795c04492dfa98d828f6004ec71bf0 100644 (file)
--- a/application/install/data.php
+++ b/application/install/data.php
@@ -38,7 +38,7 @@ $cfg = FrameworkConfiguration::getInstance();
 
 // Get an instance of the helper
 $app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), 'getInstance'),
+       array($cfg->getConfigEntry('app_helper_class'), 'getInstance'),
        array()
 );
 

diff --git a/application/install/init.php b/application/install/init.php
index 5b82a774d35d7004beeb66eba74147eaad45a4d9..3baf31fb6fcd46671a7a3d5a3995fd6a54aac7b0 100644 (file)
--- a/application/install/init.php
+++ b/application/install/init.php
@@ -37,17 +37,17 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Initialize output system
-require($cfg->readConfig('base_path') . 'inc/output.php');
+require($cfg->getConfigEntry('base_path') . 'inc/output.php');
 
 // Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
+require($cfg->getConfigEntry('base_path') . 'inc/file_io.php');
 
 // Include the language sub-system
-require($cfg->readConfig('base_path') . 'inc/language.php');
+require($cfg->getConfigEntry('base_path') . 'inc/language.php');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
-require($cfg->readConfig('base_path') . 'inc/database.php');
+require($cfg->getConfigEntry('base_path') . 'inc/database.php');
 
 // [EOF]
 ?>

diff --git a/application/install/loader.php b/application/install/loader.php
index 34419687213f45ac830702b810c8a3acef1ac015..b46c98f697714ea976d0ac6759796ac146bf9987 100644 (file)
--- a/application/install/loader.php
+++ b/application/install/loader.php
@@ -28,7 +28,7 @@ $cfg = FrameworkConfiguration::getInstance();
 // Load all classes for the application
 foreach ($lowerClasses as $className) {
        // Load the application classes
-       ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->readConfig('application_path'), $cfg->readConfig('app_name'), $className));
+       ClassLoader::getInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $className));
 } // END - if
 
 // Clean up the global namespace

diff --git a/application/install/starter.php b/application/install/starter.php
index 841486a1985fea3125aa902ede8056b6a4f38972..1e6d88840689e8fce6cfab8ef7f99eefa04542d2 100644 (file)
--- a/application/install/starter.php
+++ b/application/install/starter.php
@@ -24,30 +24,30 @@
 
 // Is there an application helper instance? We need the method main() for
 // maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), 'getInstance'), array());
+$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class'), 'getInstance'), array());
 
 // Some sanity checks
 if ((empty($app)) || (is_null($app))) {
        // Something went wrong!
        ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
                $application,
-               FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
+               FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class')
        ));
 } elseif (!is_object($app)) {
        // No object!
        ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
                $application
        ));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
+} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->getConfigEntry('entry_method'))) {
        // Method not found!
        ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
                $application,
-               FrameworkConfiguration::getInstance()->readConfig('entry_method')
+               FrameworkConfiguration::getInstance()->getConfigEntry('entry_method')
        ));
 }
 
 // Call user function
-call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
+call_user_func_array(array($app, FrameworkConfiguration::getInstance()->getConfigEntry('entry_method')), array());
 
 // [EOF]
 ?>