From dfe99490c0edc190fbf0ece9c28c5b61c96fe524 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 00:34:21 +0100 Subject: [PATCH] Class renamed + some cosmetical changes applied. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/language/class_LanguageSystem.php | 6 +++--- .../main/resolver/controller/{web => html}/.htaccess | 0 .../class_HtmlControllerResolver.php} | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) rename inc/classes/main/resolver/controller/{web => html}/.htaccess (100%) rename inc/classes/main/resolver/controller/{web/class_WebControllerResolver.php => html/class_HtmlControllerResolver.php} (91%) diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php index 65cfddda..c621c57c 100644 --- a/inc/classes/main/language/class_LanguageSystem.php +++ b/inc/classes/main/language/class_LanguageSystem.php @@ -140,7 +140,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, * @return void */ public function initLanguageStrings () { - $this->langStrings = new FrameworkArrayObject("FakedLanguageStrings"); + $this->langStrings = new FrameworkArrayObject('FakedLanguageStrings'); } /** @@ -160,7 +160,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, */ public function getMessage ($messageId) { // Default is missing message text - $messageText = sprintf("!%s!", + $messageText = sprintf('!%s!', $messageId ); @@ -168,7 +168,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, if ($this->langStrings->offsetExists($messageId)) { // Return the message string $messageText = $this->langStrings->offsetGet($messageId); - } + } // END - if // Return the text return $messageText; diff --git a/inc/classes/main/resolver/controller/web/.htaccess b/inc/classes/main/resolver/controller/html/.htaccess similarity index 100% rename from inc/classes/main/resolver/controller/web/.htaccess rename to inc/classes/main/resolver/controller/html/.htaccess diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/html/class_HtmlControllerResolver.php similarity index 91% rename from inc/classes/main/resolver/controller/web/class_WebControllerResolver.php rename to inc/classes/main/resolver/controller/html/class_HtmlControllerResolver.php index 8c004cad..5c495af6 100644 --- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php +++ b/inc/classes/main/resolver/controller/html/class_HtmlControllerResolver.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 WebControllerResolver extends BaseControllerResolver implements ControllerResolver { +class HtmlControllerResolver extends BaseControllerResolver implements ControllerResolver { /** * Protected constructor * @@ -31,8 +31,8 @@ class WebControllerResolver extends BaseControllerResolver implements Controller // Call parent constructor parent::__construct(__CLASS__); - // Set prefix to 'Web' - $this->setClassPrefix('Web'); + // Set prefix to 'Html' + $this->setClassPrefix('Html'); } /** @@ -44,9 +44,9 @@ class WebControllerResolver extends BaseControllerResolver implements Controller * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public static final function createWebControllerResolver ($controllerName, ManageableApplication $applicationInstance) { + public static final function createHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance - $resolverInstance = new WebControllerResolver(); + $resolverInstance = new HtmlControllerResolver(); // Is the variable $controllerName set and the command is valid? if (empty($controllerName)) { -- 2.30.2