From 4c3ef4749d3f2f2e06c50e674c1b7481faeb2d42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 22 Dec 2009 08:05:43 +0000 Subject: [PATCH] Naming convention applied on class templates --- inc/classes/main/resolver/command/web/class_ | 6 +++--- inc/classes/main/template/class_ | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/classes/main/resolver/command/web/class_ b/inc/classes/main/resolver/command/web/class_ index 57955f97..f276d484 100644 --- a/inc/classes/main/resolver/command/web/class_ +++ b/inc/classes/main/resolver/command/web/class_ @@ -89,7 +89,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv $commandName = $requestInstance->getRequestElement('page'); // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); // Check if the command is valid if ($this->isCommandValid($commandName) === false) { @@ -125,7 +125,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv $commandInstance = null; // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); // Check if the command is valid if ($this->isCommandValid($commandName) === false) { @@ -150,7 +150,7 @@ class Web???CommandResolver extends BaseCommandResolver implements CommandResolv */ private function loadCommand ($commandName) { // Cache default command - $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command'); + $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_web_command'); // Init command instance $commandInstance = null; diff --git a/inc/classes/main/template/class_ b/inc/classes/main/template/class_ index 985d514f..702ea8fe 100644 --- a/inc/classes/main/template/class_ +++ b/inc/classes/main/template/class_ @@ -53,7 +53,7 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat $ioInstance = $appInstance->getFileIoInstance(); // Determine base path - $templateBasePath = $tplInstance->getConfigInstance()->readConfig('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $tplInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { @@ -81,11 +81,11 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat $tplInstance->setFileIoInstance($ioInstance); // Set template extensions - $tplInstance->setRawTemplateExtension($configInstance->readConfig('raw_template_extension')); - $tplInstance->setCodeTemplateExtension($configInstance->readConfig('code_template_extension')); + $tplInstance->setRawTemplateExtension($configInstance->getConfigEntry('raw_template_extension')); + $tplInstance->setCodeTemplateExtension($configInstance->getConfigEntry('code_template_extension')); // Absolute output path for compiled templates - $tplInstance->setCompileOutputPath($configInstance->readConfig('base_path') . $configInstance->readConfig('compile_output_path')); + $tplInstance->setCompileOutputPath($configInstance->getConfigEntry('base_path') . $configInstance->getConfigEntry('compile_output_path')); // Return the prepared instance return $tplInstance; -- 2.39.5