X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcommand%2Fweb%2Fclass_WebCommandResolver.php;h=9225c454a2f850d79e5dffa14fb094cc5fc2b4bc;hp=0e5e65de018edc51e0e6c4d1a0b161065241de76;hb=69b003f77062e6008f85b074c88aa922b0135498;hpb=253b7896740f6146fe92f2caa85c52438c209ae7 diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php index 0e5e65de..9225c454 100644 --- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php +++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php @@ -2,11 +2,11 @@ /** * A command resolver for local (non-hubbed) web commands * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org + * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver /** * Last successfull resolved command */ - private $lastCommandInstance = null; + private $lastCommandInstance = NULL; /** * Protected constructor @@ -37,19 +37,19 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver parent::__construct(__CLASS__); // Set prefix to "Web" - $this->setCommandPrefix('Web'); + $this->setClassPrefix('web'); } /** * Creates an instance of a Web command resolver with a given default command * * @param $commandName The default command we shall execute - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared command resolver instance * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public final static function createWebCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createWebCommandResolver ($commandName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new WebCommandResolver(); @@ -57,13 +57,13 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver if (empty($commandName)) { // Then thrown an exception here throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); - } elseif ($resolverInstance->isCommandValid($commandName) === false) { + } elseif ($resolverInstance->isCommandValid($commandName) === FALSE) { // Invalid command found throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND); } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance return $resolverInstance; @@ -83,16 +83,18 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver public function resolveCommandByRequest (Requestable $requestInstance) { // Init variables $commandName = ''; - $commandInstance = null; + $commandInstance = NULL; // This goes fine so let's resolve the command $commandName = $requestInstance->getRequestElement('page'); // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) { + $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); + } // END - if // Check if command is valid - if ($this->isCommandValid($commandName) === false) { + if ($this->isCommandValid($commandName) === FALSE) { // This command is invalid! throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND); } // END - if @@ -107,7 +109,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver } // END - if // Set last command - $this->lastCommandInstance = $commandInstance; + $this->setResolvedInstance($commandInstance); // Return the resolved command instance return $commandInstance; @@ -122,16 +124,18 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver */ public function resolveCommand ($commandName) { // Initiate the instance variable - $commandInstance = null; + $commandInstance = NULL; // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) { + $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); + } // END - if // Check if command is valid - if ($this->isCommandValid($commandName) === false) { + if ($this->isCommandValid($commandName) === FALSE) { // This command is invalid! throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND); - } + } // END - if // Get the command $commandInstance = $this->loadCommand($commandName); @@ -150,13 +154,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver */ private function loadCommand ($commandName) { // Init command instance - $commandInstance = null; - - // Create class name - $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command'; - - // Create command class name - $this->setClassName($className); + $commandInstance = NULL; // Is this class loaded? if (!class_exists($this->getClassName())) {