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

diff --git a/application/admin/data.php b/application/admin/data.php
index d2e89042f6e734bdf60ba58ec9fa7a96f73ae830..b06d50519693579c54ba4f6c87c9bd685075a92f 100644 (file)
--- a/application/admin/data.php
+++ b/application/admin/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/admin/init.php b/application/admin/init.php
index 02044840acbf13f3e56f31318ca15dc1ba1fa173..d77dcc6e87c3a935cd5a66e1c636646a1509c365 100644 (file)
--- a/application/admin/init.php
+++ b/application/admin/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/admin/loader.php b/application/admin/loader.php
index 26aff4e26c54dab76ff3bc0c51c0cc873a0032ce..6a14c74e45ecea46971a49af1c13531850397c51 100644 (file)
--- a/application/admin/loader.php
+++ b/application/admin/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/admin/main/commands/web/class_WebAdminUserLoginCommand.php b/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
index 60e1d1b30acae4cfc555c4e0af04efd3b8efe818..52103d8148f584facf84d0eb2f703b69bebeb43f 100644 (file)
--- a/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
+++ b/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
@@ -102,7 +102,7 @@ class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?
-               switch ($this->getConfigInstance()->readConfig('login_type')) {
+               switch ($this->getConfigInstance()->getConfigEntry('login_type')) {
                        case "username": // Login via username
                                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
                                break;

diff --git a/application/admin/main/login/class_AdminUserLogin.php b/application/admin/main/login/class_AdminUserLogin.php
index 2b0429e0714e2a2b1da89090f18f1c55982ec354..75815c9afef65225fbdf8e188997eec00059da6d 100644 (file)
--- a/application/admin/main/login/class_AdminUserLogin.php
+++ b/application/admin/main/login/class_AdminUserLogin.php
@@ -74,7 +74,7 @@ class AdminUserLogin extends BaseFrameworkSystem implements LoginableUser {
                $data = "";
 
                // Get member class
-               $userClass = $this->getConfigInstance()->readConfig('user_class');
+               $userClass = $this->getConfigInstance()->getConfigEntry('user_class');
 
                // Get a user instance
                $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));

diff --git a/application/admin/main/login/helper/class_AdminLoginHelper.php b/application/admin/main/login/helper/class_AdminLoginHelper.php
index b825cef6e17330ed9690f6006d1350ad96095847..d54d400530602f915008680da53798d8d73ced61 100644 (file)
--- a/application/admin/main/login/helper/class_AdminLoginHelper.php
+++ b/application/admin/main/login/helper/class_AdminLoginHelper.php
@@ -85,7 +85,7 @@ class AdminLoginHelper extends BaseLoginHelper implements HelpableLogin {
         * @return      void
         */
        protected function setDefaultAuthMethod () {
-               $this->authMethod = $this->getConfigInstance()->readConfig('auth_method_class');
+               $this->authMethod = $this->getConfigInstance()->getConfigEntry('auth_method_class');
        }
 
        /**

diff --git a/application/admin/starter.php b/application/admin/starter.php
index e0ea680ccf118d461997e191271f1bc3c97f063a..22c2af270a0f65023314cd243b8e57915ffda055 100644 (file)
--- a/application/admin/starter.php
+++ b/application/admin/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]
 ?>

diff --git a/index.php b/index.php
index 005004646b5cee9d87e2ae89b499f8f675e6604d..cf898bf7dbb77fe8967570faa0a48e168b4c4a5c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -80,13 +80,13 @@ final class ApplicationEntryPoint {
                $configInstance = FrameworkConfiguration::getInstance();
 
                // Do we have debug installation?
-               if (($configInstance->readConfig('product_install_mode') == 'productive') || ($silentMode === true)) {
+               if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
                        // Abort here
                        die();
                } // END - if
 
                // Get some instances
-               $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
+               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
                $lang = LanguageSystem::getInstance();
 
                // Get response instance
@@ -190,13 +190,13 @@ final class ApplicationEntryPoint {
                require(self::detectCorePath() . '/inc/config.php');
 
                // Load all include files
-               require($cfg->readConfig('base_path') . 'inc/includes.php');
+               require($cfg->getConfigEntry('base_path') . 'inc/includes.php');
 
                // Load all framework classes
-               require($cfg->readConfig('base_path') . 'inc/classes.php');
+               require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
 
                // Include the application selector
-               require($cfg->readConfig('base_path') . 'inc/selector.php');
+               require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
        } // END - main()
 
 } // END - class