From c3021952494266e05bfa9046baf9bcd11bfe7d13 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 02:15:15 +0100 Subject: [PATCH] Renamed more stuff (will break app_die(), so it needs fixing). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/class_BaseFrameworkSystem.php | 4 ++-- .../main/commands/web/class_WebResendLinkCommand.php | 2 +- inc/classes/main/response/image/class_ImageResponse.php | 2 +- inc/classes/main/template/{web => html}/.htaccess | 0 .../class_HtmlTemplateEngine.php} | 6 +++--- inc/classes/main/template/menu/class_MenuTemplateEngine.php | 2 +- inc/config.php | 4 ++-- index.php | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename inc/classes/main/template/{web => html}/.htaccess (100%) rename inc/classes/main/template/{web/class_WebTemplateEngine.php => html/class_HtmlTemplateEngine.php} (94%) diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 88fdae37..cfba6f1f 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -1509,7 +1509,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Prepare the template engine (WebTemplateEngine by default) for a given + * Prepare the template engine (HtmlTemplateEngine by default) for a given * application helper instance (ApplicationHelper by default). * * @param $applicationInstance An application helper instance or @@ -1532,7 +1532,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } // END - if // Initialize the template engine - $templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class'); + $templateInstance = ObjectFactory::createObjectByConfiguredName('html_template_class'); // Return the prepared instance return $templateInstance; diff --git a/inc/classes/main/commands/web/class_WebResendLinkCommand.php b/inc/classes/main/commands/web/class_WebResendLinkCommand.php index 1af3c0d6..37dfe803 100644 --- a/inc/classes/main/commands/web/class_WebResendLinkCommand.php +++ b/inc/classes/main/commands/web/class_WebResendLinkCommand.php @@ -79,7 +79,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable { $userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH, $hashedString); // Re-set config entry to mailer engine - $this->getConfigInstance()->setConfigEntry('web_template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class')); + $this->getConfigInstance()->setConfigEntry('html_template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class')); // Prepare the template engine $templateInstance = $this->prepareTemplateInstance($applicationInstance); diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php index 31966071..0a8e92c7 100644 --- a/inc/classes/main/response/image/class_ImageResponse.php +++ b/inc/classes/main/response/image/class_ImageResponse.php @@ -66,7 +66,7 @@ class ImageResponse extends BaseResponse implements Responseable { $cfg = $this->getConfigInstance(); // Set new template engine - $cfg->setConfigEntry('web_template_class' , $cfg->getConfigEntry('image_template_class')); + $cfg->setConfigEntry('html_template_class' , $cfg->getConfigEntry('image_template_class')); $cfg->setConfigEntry('raw_template_extension' , '.img'); $cfg->setConfigEntry('code_template_extension', '.xml'); $cfg->setConfigEntry('tpl_base_path' , 'templates/images/'); diff --git a/inc/classes/main/template/web/.htaccess b/inc/classes/main/template/html/.htaccess similarity index 100% rename from inc/classes/main/template/web/.htaccess rename to inc/classes/main/template/html/.htaccess diff --git a/inc/classes/main/template/web/class_WebTemplateEngine.php b/inc/classes/main/template/html/class_HtmlTemplateEngine.php similarity index 94% rename from inc/classes/main/template/web/class_WebTemplateEngine.php rename to inc/classes/main/template/html/class_HtmlTemplateEngine.php index d642b886..f1d758a5 100644 --- a/inc/classes/main/template/web/class_WebTemplateEngine.php +++ b/inc/classes/main/template/html/class_HtmlTemplateEngine.php @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplate { +class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTemplate { /** * Protected constructor * @@ -44,9 +44,9 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createWebTemplateEngine () { + public static final function createHtmlTemplateEngine () { // Get a new instance - $templateInstance = new WebTemplateEngine(); + $templateInstance = new HtmlTemplateEngine(); // Get the application instance from registry $applicationInstance = Registry::getRegistry()->getInstance('app'); diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php index 23e114fa..4f1dd50d 100644 --- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php +++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php @@ -314,7 +314,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla */ private function initMenu ($templateDependency = '') { // Get web template engine - $this->setTemplateInstance(ObjectFactory::createObjectByConfiguredName('web_template_class', array($this->getApplicationInstance()))); + $this->setTemplateInstance(ObjectFactory::createObjectByConfiguredName('html_template_class', array($this->getApplicationInstance()))); // Handle the dependency template $this->handleTemplateDependency('menu', $templateDependency); diff --git a/inc/config.php b/inc/config.php index 57c0ef34..8df6b657 100644 --- a/inc/config.php +++ b/inc/config.php @@ -89,8 +89,8 @@ $cfg->setConfigEntry('application_path', $cfg->getConfigEntry('base_path') . $cf // CFG: COMPILE-OUTPUT-PATH $cfg->setConfigEntry('compile_output_path', 'templates/_compiled/'); -// CFG: TEMPLATE-CLASS -$cfg->setConfigEntry('web_template_class', 'WebTemplateEngine'); +// CFG: HTML-TEMPLATE-CLASS +$cfg->setConfigEntry('html_template_class', 'HtmlTemplateEngine'); // CFG: DECO-XML-REWRITER-TEMPLATE-CLASS $cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDecorator'); diff --git a/index.php b/index.php index 28703323..ca598d09 100644 --- a/index.php +++ b/index.php @@ -68,7 +68,7 @@ final class ApplicationEntryPoint { } // END - if // Get some instances - $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_template_class'); + $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('html_template_class'); $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE -- 2.30.2