*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
parent::__construct(__CLASS__);
// Set prefix to "Web"
- $this->setCommandPrefix("Web");
+ $this->setCommandPrefix('Web');
}
/**
$commandName = '';
$commandInstance = null;
- // This goes fine so let's resolv the command
+ // 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()->readConfig('default_web_command');
+ if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command');
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
$commandInstance = null;
// Is the command empty? Then fall back to default command
- if (empty($commandName)) $commandName = $this->getConfigInstance()->readConfig('default_web_command');
+ if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command');
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
* command class is missing (bad!)
*/
private function loadCommand ($commandName) {
- // Cache default command
- $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
-
// Init command instance
$commandInstance = null;
// Create class name
- $className = 'Web' . $this->convertToClassName($commandName) . 'Command';
+ $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
// Create command class name
$this->setClassName($className);
// Is this class loaded?
if (!class_exists($this->getClassName())) {
// Class not found, so throw an exception
- throw new InvalidCommandException(array($this, $defaultCommand), self::EXCEPTION_INVALID_COMMAND);
+ throw new InvalidCommandException(array($this, $commandName), self::EXCEPTION_INVALID_COMMAND);
} // END - if
// Initiate the command