From 32702da3e7035c52f9124720310b797e05fd7410 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 6 Apr 2015 01:42:07 +0200 Subject: [PATCH] Renamed a lot more stuff from 'web' to 'html'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../template/class_CompileableTemplate.php | 4 ++-- inc/classes/main/actions/{web => html}/.htaccess | 0 .../class_HtmlLoginProfileAction.php} | 6 +++--- .../main/commands/html/class_HtmlConfirmCommand.php | 4 ++-- .../main/commands/html/class_HtmlDoFormCommand.php | 4 ++-- .../main/commands/html/class_HtmlHomeCommand.php | 4 ++-- .../commands/html/class_HtmlLoginAreaCommand.php | 6 +++--- .../main/commands/html/class_HtmlLoginCommand.php | 4 ++-- .../commands/html/class_HtmlLoginFailedCommand.php | 4 ++-- .../main/commands/html/class_HtmlLogoutCommand.php | 4 ++-- .../commands/html/class_HtmlLogoutDoneCommand.php | 4 ++-- .../main/commands/html/class_HtmlProblemCommand.php | 4 ++-- .../main/commands/html/class_HtmlRegisterCommand.php | 4 ++-- .../commands/html/class_HtmlResendLinkCommand.php | 4 ++-- .../main/commands/html/class_HtmlStatusCommand.php | 4 ++-- .../main/controller/{captcha => html/form}/.htaccess | 0 .../form/class_HtmlDoFormController.php} | 6 +++--- .../main/controller/{form => html/login}/.htaccess | 0 .../login/class_HtmlLoginAreaController.php} | 6 +++--- .../controller/{login => image/captcha}/.htaccess | 0 .../captcha/class_ImageCodeCaptchaController.php | 0 .../template/class_XmlRewriterTemplateDecorator.php | 6 +++--- inc/classes/main/factories/{web => html}/.htaccess | 0 .../class_HtmlNewsFactory.php} | 4 ++-- .../main/filter/news/class_NewsDownloadFilter.php | 2 +- inc/classes/main/helper/{web => html}/.htaccess | 0 .../main/helper/{web => html}/blocks/.htaccess | 0 .../blocks/class_HtmlBlockHelper.php} | 6 +++--- inc/classes/main/helper/{web => html}/class_ | 6 +++--- .../class_BaseHtmlHelper.php} | 2 +- .../main/helper/{web => html}/forms/.htaccess | 0 .../forms/class_HtmlFormHelper.php} | 6 +++--- .../main/helper/{web => html}/links/.htaccess | 0 .../links/class_HtmlLinkHelper.php} | 6 +++--- .../main/resolver/action/{web => html}/.htaccess | 0 .../class_HtmlActionResolver.php} | 12 ++++++------ inc/classes/main/resolver/class_ | 8 ++++---- .../main/template/class_BaseTemplateEngine.php | 10 +++++----- inc/config.php | 8 ++++---- 39 files changed, 74 insertions(+), 74 deletions(-) rename inc/classes/main/actions/{web => html}/.htaccess (100%) rename inc/classes/main/actions/{web/class_WebLoginProfileAction.php => html/class_HtmlLoginProfileAction.php} (90%) rename inc/classes/main/controller/{captcha => html/form}/.htaccess (100%) rename inc/classes/main/controller/{form/class_WebDoFormController.php => html/form/class_HtmlDoFormController.php} (93%) rename inc/classes/main/controller/{form => html/login}/.htaccess (100%) rename inc/classes/main/controller/{login/class_WebLoginAreaController.php => html/login/class_HtmlLoginAreaController.php} (93%) rename inc/classes/main/controller/{login => image/captcha}/.htaccess (100%) rename inc/classes/main/controller/{ => image}/captcha/class_ImageCodeCaptchaController.php (100%) rename inc/classes/main/factories/{web => html}/.htaccess (100%) rename inc/classes/main/factories/{web/class_WebNewsFactory.php => html/class_HtmlNewsFactory.php} (95%) rename inc/classes/main/helper/{web => html}/.htaccess (100%) rename inc/classes/main/helper/{web => html}/blocks/.htaccess (100%) rename inc/classes/main/helper/{web/blocks/class_WebBlockHelper.php => html/blocks/class_HtmlBlockHelper.php} (94%) rename inc/classes/main/helper/{web => html}/class_ (89%) rename inc/classes/main/helper/{web/class_BaseWebHelper.php => html/class_BaseHtmlHelper.php} (96%) rename inc/classes/main/helper/{web => html}/forms/.htaccess (100%) rename inc/classes/main/helper/{web/forms/class_WebFormHelper.php => html/forms/class_HtmlFormHelper.php} (99%) rename inc/classes/main/helper/{web => html}/links/.htaccess (100%) rename inc/classes/main/helper/{web/links/class_WebLinkHelper.php => html/links/class_HtmlLinkHelper.php} (97%) rename inc/classes/main/resolver/action/{web => html}/.htaccess (100%) rename inc/classes/main/resolver/action/{web/class_WebActionResolver.php => html/class_HtmlActionResolver.php} (92%) diff --git a/inc/classes/interfaces/template/class_CompileableTemplate.php b/inc/classes/interfaces/template/class_CompileableTemplate.php index b35a750c..4cdd7422 100644 --- a/inc/classes/interfaces/template/class_CompileableTemplate.php +++ b/inc/classes/interfaces/template/class_CompileableTemplate.php @@ -32,13 +32,13 @@ interface CompileableTemplate extends FrameworkInterface { function assignVariable ($variableName, $value); /** - * Load a specified web template into the engine + * Load a specified HTML template into the engine * * @param $template The web template we shall load which is located in * "html" by default * @return void */ - function loadWebTemplate ($template); + function loadHtmlTemplate ($template); /** * Load a specified code template into the engine for later compilation diff --git a/inc/classes/main/actions/web/.htaccess b/inc/classes/main/actions/html/.htaccess similarity index 100% rename from inc/classes/main/actions/web/.htaccess rename to inc/classes/main/actions/html/.htaccess diff --git a/inc/classes/main/actions/web/class_WebLoginProfileAction.php b/inc/classes/main/actions/html/class_HtmlLoginProfileAction.php similarity index 90% rename from inc/classes/main/actions/web/class_WebLoginProfileAction.php rename to inc/classes/main/actions/html/class_HtmlLoginProfileAction.php index faa5d181..55ff8cee 100644 --- a/inc/classes/main/actions/web/class_WebLoginProfileAction.php +++ b/inc/classes/main/actions/html/class_HtmlLoginProfileAction.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebLoginProfileAction extends BaseAction implements Commandable, Registerable { +class HtmlLoginProfileAction extends BaseAction implements Commandable, Registerable { /** * Protected constructor * @@ -38,9 +38,9 @@ class WebLoginProfileAction extends BaseAction implements Commandable, Registera * @param $resolverInstance An instance of an action resolver * @return $actionInstance An instance of this action class */ - public static final function createWebLoginProfileAction (ActionResolver $resolverInstance) { + public static final function createHtmlLoginProfileAction (ActionResolver $resolverInstance) { // Get a new instance - $actionInstance = new WebLoginProfileAction(); + $actionInstance = new HtmlLoginProfileAction(); // Set the resolver instance $actionInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlConfirmCommand.php b/inc/classes/main/commands/html/class_HtmlConfirmCommand.php index 0ca3f7ea..7500fead 100644 --- a/inc/classes/main/commands/html/class_HtmlConfirmCommand.php +++ b/inc/classes/main/commands/html/class_HtmlConfirmCommand.php @@ -38,9 +38,9 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebConfirmCommand (CommandResolver $resolverInstance) { + public static final function createHtmlConfirmCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebConfirmCommand(); + $commandInstance = new HtmlConfirmCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlDoFormCommand.php b/inc/classes/main/commands/html/class_HtmlDoFormCommand.php index 5c38e15d..05ece9ea 100644 --- a/inc/classes/main/commands/html/class_HtmlDoFormCommand.php +++ b/inc/classes/main/commands/html/class_HtmlDoFormCommand.php @@ -38,9 +38,9 @@ class HtmlDoFormCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebDoFormCommand (CommandResolver $resolverInstance) { + public static final function createHtmlDoFormCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebDoFormCommand(); + $commandInstance = new HtmlDoFormCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlHomeCommand.php b/inc/classes/main/commands/html/class_HtmlHomeCommand.php index bca92ae2..b422cb73 100644 --- a/inc/classes/main/commands/html/class_HtmlHomeCommand.php +++ b/inc/classes/main/commands/html/class_HtmlHomeCommand.php @@ -38,9 +38,9 @@ class HtmlHomeCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebHomeCommand (CommandResolver $resolverInstance) { + public static final function createHtmlHomeCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebHomeCommand(); + $commandInstance = new HtmlHomeCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlLoginAreaCommand.php b/inc/classes/main/commands/html/class_HtmlLoginAreaCommand.php index 5ab4d807..c75c59c2 100644 --- a/inc/classes/main/commands/html/class_HtmlLoginAreaCommand.php +++ b/inc/classes/main/commands/html/class_HtmlLoginAreaCommand.php @@ -43,9 +43,9 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebLoginAreaCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginAreaCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebLoginAreaCommand(); + $commandInstance = new HtmlLoginAreaCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); @@ -186,7 +186,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Get a resolver - $actionResolver = WebActionResolver::createWebActionResolver($this->actionName, $applicationInstance); + $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance); // Resolve the action $actionInstance = $actionResolver->resolveAction(); diff --git a/inc/classes/main/commands/html/class_HtmlLoginCommand.php b/inc/classes/main/commands/html/class_HtmlLoginCommand.php index c1d71c90..f5221504 100644 --- a/inc/classes/main/commands/html/class_HtmlLoginCommand.php +++ b/inc/classes/main/commands/html/class_HtmlLoginCommand.php @@ -38,9 +38,9 @@ class HtmlLoginCommand extends BaseCommand implements Commandable, Registerable * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebLoginCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebLoginCommand(); + $commandInstance = new HtmlLoginCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlLoginFailedCommand.php b/inc/classes/main/commands/html/class_HtmlLoginFailedCommand.php index 960ce7b0..af50192a 100644 --- a/inc/classes/main/commands/html/class_HtmlLoginFailedCommand.php +++ b/inc/classes/main/commands/html/class_HtmlLoginFailedCommand.php @@ -38,9 +38,9 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebLoginFailedCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLoginFailedCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebLoginFailedCommand(); + $commandInstance = new HtmlLoginFailedCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlLogoutCommand.php b/inc/classes/main/commands/html/class_HtmlLogoutCommand.php index 4725d184..47c8fd12 100644 --- a/inc/classes/main/commands/html/class_HtmlLogoutCommand.php +++ b/inc/classes/main/commands/html/class_HtmlLogoutCommand.php @@ -38,9 +38,9 @@ class HtmlLogoutCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebLogoutCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebLogoutCommand(); + $commandInstance = new HtmlLogoutCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlLogoutDoneCommand.php b/inc/classes/main/commands/html/class_HtmlLogoutDoneCommand.php index ccac0789..9149de16 100644 --- a/inc/classes/main/commands/html/class_HtmlLogoutDoneCommand.php +++ b/inc/classes/main/commands/html/class_HtmlLogoutDoneCommand.php @@ -38,9 +38,9 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebLogoutDoneCommand (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutDoneCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebLogoutDoneCommand(); + $commandInstance = new HtmlLogoutDoneCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlProblemCommand.php b/inc/classes/main/commands/html/class_HtmlProblemCommand.php index 500789d9..1c18dc62 100644 --- a/inc/classes/main/commands/html/class_HtmlProblemCommand.php +++ b/inc/classes/main/commands/html/class_HtmlProblemCommand.php @@ -38,9 +38,9 @@ class HtmlProblemCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebProblemCommand (CommandResolver $resolverInstance) { + public static final function createHtmlProblemCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebProblemCommand(); + $commandInstance = new HtmlProblemCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlRegisterCommand.php b/inc/classes/main/commands/html/class_HtmlRegisterCommand.php index c78dc805..a293bed4 100644 --- a/inc/classes/main/commands/html/class_HtmlRegisterCommand.php +++ b/inc/classes/main/commands/html/class_HtmlRegisterCommand.php @@ -38,9 +38,9 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable, Registerab * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebRegisterCommand (CommandResolver $resolverInstance) { + public static final function createHtmlRegisterCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebRegisterCommand(); + $commandInstance = new HtmlRegisterCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlResendLinkCommand.php b/inc/classes/main/commands/html/class_HtmlResendLinkCommand.php index fedd4e79..05f66f93 100644 --- a/inc/classes/main/commands/html/class_HtmlResendLinkCommand.php +++ b/inc/classes/main/commands/html/class_HtmlResendLinkCommand.php @@ -38,9 +38,9 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebResendLinkCommand (CommandResolver $resolverInstance) { + public static final function createHtmlResendLinkCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebResendLinkCommand(); + $commandInstance = new HtmlResendLinkCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/commands/html/class_HtmlStatusCommand.php b/inc/classes/main/commands/html/class_HtmlStatusCommand.php index 2ded5a41..eb280138 100644 --- a/inc/classes/main/commands/html/class_HtmlStatusCommand.php +++ b/inc/classes/main/commands/html/class_HtmlStatusCommand.php @@ -38,9 +38,9 @@ class HtmlStatusCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createWebStatusCommand (CommandResolver $resolverInstance) { + public static final function createHtmlStatusCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new WebStatusCommand(); + $commandInstance = new HtmlStatusCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/captcha/.htaccess b/inc/classes/main/controller/html/form/.htaccess similarity index 100% rename from inc/classes/main/controller/captcha/.htaccess rename to inc/classes/main/controller/html/form/.htaccess diff --git a/inc/classes/main/controller/form/class_WebDoFormController.php b/inc/classes/main/controller/html/form/class_HtmlDoFormController.php similarity index 93% rename from inc/classes/main/controller/form/class_WebDoFormController.php rename to inc/classes/main/controller/html/form/class_HtmlDoFormController.php index d109dfb8..38ae3c2a 100644 --- a/inc/classes/main/controller/form/class_WebDoFormController.php +++ b/inc/classes/main/controller/html/form/class_HtmlDoFormController.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebDoFormController extends BaseController implements Controller { +class HtmlDoFormController extends BaseController implements Controller { /** * Protected constructor * @@ -38,9 +38,9 @@ class WebDoFormController extends BaseController implements Controller { * @param $resolverInstance An instance of a resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebDoFormController (CommandResolver $resolverInstance) { + public static final function createHtmlDoFormController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebDoFormController(); + $controllerInstance = new HtmlDoFormController(); // Set resolver instance $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/form/.htaccess b/inc/classes/main/controller/html/login/.htaccess similarity index 100% rename from inc/classes/main/controller/form/.htaccess rename to inc/classes/main/controller/html/login/.htaccess diff --git a/inc/classes/main/controller/login/class_WebLoginAreaController.php b/inc/classes/main/controller/html/login/class_HtmlLoginAreaController.php similarity index 93% rename from inc/classes/main/controller/login/class_WebLoginAreaController.php rename to inc/classes/main/controller/html/login/class_HtmlLoginAreaController.php index 83ebfd4c..0c7725c0 100644 --- a/inc/classes/main/controller/login/class_WebLoginAreaController.php +++ b/inc/classes/main/controller/html/login/class_HtmlLoginAreaController.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebLoginAreaController extends BaseController implements Controller { +class HtmlLoginAreaController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebLoginAreaController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some morer filters to this controller */ - public static final function createWebLoginAreaController (CommandResolver $resolverInstance) { + public static final function createHtmlLoginAreaController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebLoginAreaController(); + $controllerInstance = new HtmlLoginAreaController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/login/.htaccess b/inc/classes/main/controller/image/captcha/.htaccess similarity index 100% rename from inc/classes/main/controller/login/.htaccess rename to inc/classes/main/controller/image/captcha/.htaccess diff --git a/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php b/inc/classes/main/controller/image/captcha/class_ImageCodeCaptchaController.php similarity index 100% rename from inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php rename to inc/classes/main/controller/image/captcha/class_ImageCodeCaptchaController.php diff --git a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php index 13e07abd..9aad65d8 100644 --- a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php +++ b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php @@ -194,15 +194,15 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT } /** - * Load a specified web template into the engine + * Load a specified HTML template into the engine * * @param $template The web template we shall load which is located in * 'html' by default * @return void */ - public function loadWebTemplate ($template) { + public function loadHtmlTemplate ($template) { // Call the inner class' method - $this->getTemplateInstance()->loadWebTemplate($template); + $this->getTemplateInstance()->loadHtmlTemplate($template); } /** diff --git a/inc/classes/main/factories/web/.htaccess b/inc/classes/main/factories/html/.htaccess similarity index 100% rename from inc/classes/main/factories/web/.htaccess rename to inc/classes/main/factories/html/.htaccess diff --git a/inc/classes/main/factories/web/class_WebNewsFactory.php b/inc/classes/main/factories/html/class_HtmlNewsFactory.php similarity index 95% rename from inc/classes/main/factories/web/class_WebNewsFactory.php rename to inc/classes/main/factories/html/class_HtmlNewsFactory.php index 35546fbd..2cb7ec78 100644 --- a/inc/classes/main/factories/web/class_WebNewsFactory.php +++ b/inc/classes/main/factories/html/class_HtmlNewsFactory.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebNewsFactory extends BaseFactory { +class HtmlNewsFactory extends BaseFactory { /** * Instance of a request class */ @@ -42,7 +42,7 @@ class WebNewsFactory extends BaseFactory { * request * * @param $requestInstance An instance of a request class - * @return $factoryInstance An instance of a WebNewsFactory class + * @return $factoryInstance An instance of a HtmlNewsFactory class */ public static final function createFactoryByRequest (Requestable $requestInstance) { // Set default news reader class diff --git a/inc/classes/main/filter/news/class_NewsDownloadFilter.php b/inc/classes/main/filter/news/class_NewsDownloadFilter.php index 9f79e76f..2e1fb8df 100644 --- a/inc/classes/main/filter/news/class_NewsDownloadFilter.php +++ b/inc/classes/main/filter/news/class_NewsDownloadFilter.php @@ -56,7 +56,7 @@ class NewsDownloadFilter extends BaseFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get a news instance - $newsInstance = WebNewsFactory::createFactoryByRequest($requestInstance); + $newsInstance = HtmlNewsFactory::createFactoryByRequest($requestInstance); // Store the news instance in registry Registry::getRegistry()->addInstance('news', $newsInstance); diff --git a/inc/classes/main/helper/web/.htaccess b/inc/classes/main/helper/html/.htaccess similarity index 100% rename from inc/classes/main/helper/web/.htaccess rename to inc/classes/main/helper/html/.htaccess diff --git a/inc/classes/main/helper/web/blocks/.htaccess b/inc/classes/main/helper/html/blocks/.htaccess similarity index 100% rename from inc/classes/main/helper/web/blocks/.htaccess rename to inc/classes/main/helper/html/blocks/.htaccess diff --git a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php b/inc/classes/main/helper/html/blocks/class_HtmlBlockHelper.php similarity index 94% rename from inc/classes/main/helper/web/blocks/class_WebBlockHelper.php rename to inc/classes/main/helper/html/blocks/class_HtmlBlockHelper.php index 1b20fd36..b0fc6605 100644 --- a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php +++ b/inc/classes/main/helper/html/blocks/class_HtmlBlockHelper.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebBlockHelper extends BaseWebHelper implements HelpableTemplate { +class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate { /** * Name of the block */ @@ -44,9 +44,9 @@ class WebBlockHelper extends BaseWebHelper implements HelpableTemplate { * @param $blockName Name of the block we shall generate * @return $helperInstance A prepared instance of this helper */ - public static final function createWebBlockHelper (CompileableTemplate $templateInstance, $blockName) { + public static final function createHtmlBlockHelper (CompileableTemplate $templateInstance, $blockName) { // Get new instance - $helperInstance = new WebBlockHelper(); + $helperInstance = new HtmlBlockHelper(); // Set template instance $helperInstance->setTemplateInstance($templateInstance); diff --git a/inc/classes/main/helper/web/class_ b/inc/classes/main/helper/html/class_ similarity index 89% rename from inc/classes/main/helper/web/class_ rename to inc/classes/main/helper/html/class_ index ae99b2cd..09466e18 100644 --- a/inc/classes/main/helper/web/class_ +++ b/inc/classes/main/helper/html/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class Web???Helper extends BaseWebHelper implements HelpableTemplate { +class Html???Helper extends BaseHtmlHelper implements HelpableTemplate { /** * Name of the ??? */ @@ -47,9 +47,9 @@ class Web???Helper extends BaseWebHelper implements HelpableTemplate { * @param $???Name Name of the ??? we shall generate * @return $helperInstance A prepared instance of this helper */ - public final static function createWeb???Helper (CompileableTemplate $templateInstance, $???Name) { + public final static function createHtml???Helper (CompileableTemplate $templateInstance, $???Name) { // Get new instance - $helperInstance = new Web???Helper(); + $helperInstance = new Html???Helper(); // Set template instance $helperInstance->setTemplateInstance($templateInstance); diff --git a/inc/classes/main/helper/web/class_BaseWebHelper.php b/inc/classes/main/helper/html/class_BaseHtmlHelper.php similarity index 96% rename from inc/classes/main/helper/web/class_BaseWebHelper.php rename to inc/classes/main/helper/html/class_BaseHtmlHelper.php index 14ce3982..02497dde 100644 --- a/inc/classes/main/helper/web/class_BaseWebHelper.php +++ b/inc/classes/main/helper/html/class_BaseHtmlHelper.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 BaseWebHelper extends BaseHelper { +class BaseHtmlHelper extends BaseHelper { /** * Protected constructor * diff --git a/inc/classes/main/helper/web/forms/.htaccess b/inc/classes/main/helper/html/forms/.htaccess similarity index 100% rename from inc/classes/main/helper/web/forms/.htaccess rename to inc/classes/main/helper/html/forms/.htaccess diff --git a/inc/classes/main/helper/web/forms/class_WebFormHelper.php b/inc/classes/main/helper/html/forms/class_HtmlFormHelper.php similarity index 99% rename from inc/classes/main/helper/web/forms/class_WebFormHelper.php rename to inc/classes/main/helper/html/forms/class_HtmlFormHelper.php index f7c8fa1d..10b152e3 100644 --- a/inc/classes/main/helper/web/forms/class_WebFormHelper.php +++ b/inc/classes/main/helper/html/forms/class_HtmlFormHelper.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebFormHelper extends BaseWebHelper implements HelpableTemplate { +class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate { /** * Whether the form tag is opened (keep at FALSE or else your forms will * never work!) @@ -63,9 +63,9 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate { * @param $withForm Whether include the form tag * @return $helperInstance A preparedf instance of this helper */ - public static final function createWebFormHelper (CompileableTemplate $templateInstance, $formName, $formId = FALSE, $withForm = TRUE) { + public static final function createHtmlFormHelper (CompileableTemplate $templateInstance, $formName, $formId = FALSE, $withForm = TRUE) { // Get new instance - $helperInstance = new WebFormHelper(); + $helperInstance = new HtmlFormHelper(); // Set template instance $helperInstance->setTemplateInstance($templateInstance); diff --git a/inc/classes/main/helper/web/links/.htaccess b/inc/classes/main/helper/html/links/.htaccess similarity index 100% rename from inc/classes/main/helper/web/links/.htaccess rename to inc/classes/main/helper/html/links/.htaccess diff --git a/inc/classes/main/helper/web/links/class_WebLinkHelper.php b/inc/classes/main/helper/html/links/class_HtmlLinkHelper.php similarity index 97% rename from inc/classes/main/helper/web/links/class_WebLinkHelper.php rename to inc/classes/main/helper/html/links/class_HtmlLinkHelper.php index ff0b7083..09121d59 100644 --- a/inc/classes/main/helper/web/links/class_WebLinkHelper.php +++ b/inc/classes/main/helper/html/links/class_HtmlLinkHelper.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { +class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate { /** * Name of the link */ @@ -61,9 +61,9 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { * @return $helperInstance A prepared instance of this helper * @throws NoConfigEntryException A deprecated exception at this point */ - public static final function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = NULL) { + public static final function createHtmlLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = NULL) { // Get new instance - $helperInstance = new WebLinkHelper(); + $helperInstance = new HtmlLinkHelper(); // Set template instance $helperInstance->setTemplateInstance($templateInstance); diff --git a/inc/classes/main/resolver/action/web/.htaccess b/inc/classes/main/resolver/action/html/.htaccess similarity index 100% rename from inc/classes/main/resolver/action/web/.htaccess rename to inc/classes/main/resolver/action/html/.htaccess diff --git a/inc/classes/main/resolver/action/web/class_WebActionResolver.php b/inc/classes/main/resolver/action/html/class_HtmlActionResolver.php similarity index 92% rename from inc/classes/main/resolver/action/web/class_WebActionResolver.php rename to inc/classes/main/resolver/action/html/class_HtmlActionResolver.php index a5e9a0ca..e6d8bb37 100644 --- a/inc/classes/main/resolver/action/web/class_WebActionResolver.php +++ b/inc/classes/main/resolver/action/html/class_HtmlActionResolver.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebActionResolver extends BaseActionResolver implements ActionResolver { +class HtmlActionResolver extends BaseActionResolver implements ActionResolver { /** * Last successfull resolved action */ @@ -36,12 +36,12 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver { // Call parent constructor parent::__construct(__CLASS__); - // Set prefix to "Web" - $this->setClassPrefix('web'); + // Set prefix to 'html' + $this->setClassPrefix('html'); } /** - * Creates an instance of a Web action resolver with a given default action + * Creates an instance of a Html action resolver with a given default action * * @param $actionName The default action we shall execute * @param $applicationInstance An instance of a manageable application helper class @@ -49,9 +49,9 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver { * @throws EmptyVariableException Thrown if default action is not set * @throws InvalidActionException Thrown if default action is invalid */ - public static final function createWebActionResolver ($actionName, ManageableApplication $applicationInstance) { + public static final function createHtmlActionResolver ($actionName, ManageableApplication $applicationInstance) { // Create the new instance - $resolverInstance = new WebActionResolver(); + $resolverInstance = new HtmlActionResolver(); // Is the variable $actionName set and the action is valid? if (empty($actionName)) { diff --git a/inc/classes/main/resolver/class_ b/inc/classes/main/resolver/class_ index 33ce259e..5cdfd089 100644 --- a/inc/classes/main/resolver/class_ +++ b/inc/classes/main/resolver/class_ @@ -37,7 +37,7 @@ class ???Resolver extends BaseResolver implements Resolver { } /** - * Creates an instance of a Web action resolver with a given default action + * Creates an instance of a Html action resolver with a given default action * * @param $!!!Name The default action we shall execute * @param $appInstance An instance of a manageable application helper class @@ -181,7 +181,7 @@ class ???Resolver extends BaseResolver implements Resolver { } /** - * Creates an instance of a Web action resolver with a given default action + * Creates an instance of a Html action resolver with a given default action * * @param $!!!Name The default action we shall execute * @param $appInstance An instance of a manageable application helper class @@ -325,7 +325,7 @@ class ???Resolver extends BaseResolver implements Resolver { } /** - * Creates an instance of a Web action resolver with a given default action + * Creates an instance of a Html action resolver with a given default action * * @param $!!!Name The default action we shall execute * @param $appInstance An instance of a manageable application helper class @@ -469,7 +469,7 @@ class ???Resolver extends BaseResolver implements Resolver { } /** - * Creates an instance of a Web action resolver with a given default action + * Creates an instance of a ??? resolver with a given default action * * @param $!!!Name The default action we shall execute * @param $appInstance An instance of a manageable application helper class diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php index e4f3130d..68be4dcb 100644 --- a/inc/classes/main/template/class_BaseTemplateEngine.php +++ b/inc/classes/main/template/class_BaseTemplateEngine.php @@ -704,7 +704,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { $this->loadRawTemplateData($fqfn); } catch (FileIoException $e) { // If we shall load a code-template we need to switch the file extension - if (($this->getTemplateType() != $this->getConfigInstance()->getConfigEntry('web_template_type')) && (empty($extOther))) { + if (($this->getTemplateType() != $this->getConfigInstance()->getConfigEntry('html_template_type')) && (empty($extOther))) { // Switch over to the code-template extension and try it again $ext = $this->getCodeTemplateExtension(); @@ -934,7 +934,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem { foreach ($this->rawTemplates as $key => $template) { try { // Load the template - $this->loadWebTemplate($template); + $this->loadHtmlTemplate($template); // Remember it's contents $this->rawTemplates[$template] = $this->getRawTemplateData(); @@ -1086,15 +1086,15 @@ class BaseTemplateEngine extends BaseFrameworkSystem { } /** - * Load a specified web template into the engine + * Load a specified HTML template into the engine * * @param $template The web template we shall load which is located in * 'html' by default * @return void */ - public function loadWebTemplate ($template) { + public function loadHtmlTemplate ($template) { // Set template type - $this->setTemplateType($this->getConfigInstance()->getConfigEntry('web_template_type')); + $this->setTemplateType($this->getConfigInstance()->getConfigEntry('html_template_type')); // Load the special template $this->loadTemplate($template); diff --git a/inc/config.php b/inc/config.php index 77db3c02..276e5579 100644 --- a/inc/config.php +++ b/inc/config.php @@ -104,8 +104,8 @@ $cfg->setConfigEntry('debug_console_class', 'DebugConsoleOutput'); // CFG: DEFAULT-LANGUAGE $cfg->setConfigEntry('default_lang', 'de'); // A two-char language string: de for german, en for english and so on -// CFG: WEB-TEMPLATE-TYPE -$cfg->setConfigEntry('web_template_type', 'html'); +// CFG: HTML-TEMPLATE-TYPE +$cfg->setConfigEntry('html_template_type', 'html'); // CFG: EMAIL-TEMPLATE-TYPE $cfg->setConfigEntry('email_template_type', 'emails'); @@ -246,10 +246,10 @@ $cfg->setConfigEntry('user_db_wrapper_class', 'UserDatabaseWrapper'); $cfg->setConfigEntry('news_db_wrapper_class', 'NewsDatabaseWrapper'); // CFG: HTML-CMD-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_resolver_class', 'WebCommandResolver'); +$cfg->setConfigEntry('html_cmd_resolver_class', 'HtmlCommandResolver'); // CFG: HTML-CMD-LOGIN-RESOLVER-CLASS -$cfg->setConfigEntry('html_cmd_login_resolver_class', 'WebCommandResolver'); +$cfg->setConfigEntry('html_cmd_login_resolver_class', 'HtmlCommandResolver'); // CFG: IMAGE-CMD-RESOLVER-CLASS $cfg->setConfigEntry('image_cmd_resolver_class', 'ImageCommandResolver'); -- 2.39.2