From: Roland Häder Date: Tue, 28 Jul 2009 17:27:49 +0000 (+0000) Subject: readConfig() is not naming convention, renamed to getConfigEntry() X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=5aa5796943ec5287dd9bae9d27219f99ddb7540b;hp=2ed3bf8c24eed5403a08684bce715c9cafbcbecd;ds=sidebyside readConfig() is not naming convention, renamed to getConfigEntry() --- diff --git a/application/mxchange/class_ApplicationHelper.php b/application/mxchange/class_ApplicationHelper.php index edea933943..1728a74753 100644 --- a/application/mxchange/class_ApplicationHelper.php +++ b/application/mxchange/class_ApplicationHelper.php @@ -201,7 +201,11 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication // If it is null then get default command if (is_null($commandName)) { + // Get default command $commandName = $responseInstance->getDefaultCommand(); + + // Set it in request + $requestInstance->setRequestElement('page'); } // END - if // Get a resolver diff --git a/application/mxchange/data.php b/application/mxchange/data.php index 1923385669..be9f009068 100644 --- a/application/mxchange/data.php +++ b/application/mxchange/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/mxchange/init.php b/application/mxchange/init.php index 9cee54fbe3..21dcbf956f 100644 --- a/application/mxchange/init.php +++ b/application/mxchange/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/mxchange/loader.php b/application/mxchange/loader.php index dbde16610f..c499a19335 100644 --- a/application/mxchange/loader.php +++ b/application/mxchange/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/mxchange/starter.php b/application/mxchange/starter.php index 4586718874..5a447f0b81 100644 --- a/application/mxchange/starter.php +++ b/application/mxchange/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 %s could not be launched because the helper class %s 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 %s could not be launched because 'app' 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 %s could not be launched because the method %s 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 005004646b..cf898bf7db 100644 --- 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