/**
* A command resolver for local (non-hubbed) web commands
*
- * @author Roland Haeder <webmaster@ship-simu.org>
+ * @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 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
/**
* Last successfull resolved command
*/
- private $lastCommandInstance = null;
+ private $lastCommandInstance = NULL;
/**
* Protected constructor
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();
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;
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
} // END - if
// Set last command
- $this->lastCommandInstance = $commandInstance;
+ $this->setResolvedInstance($commandInstance);
// Return the resolved command instance
return $commandInstance;
*/
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
*/
private function loadCommand ($commandName) {
// Init command instance
- $commandInstance = null;
+ $commandInstance = NULL;
// Is this class loaded?
if (!class_exists($this->getClassName())) {