projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefixes used from attribute
[core.git]
/
inc
/
classes
/
main
/
resolver
/
command
/
image
/
class_ImageCommandResolver.php
diff --git
a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index dc104e6a387fb68f1c48cd0b15140a16ef0317ec..fa23fda148506b781856fe0e89cc7495bb5424f2 100644
(file)
--- a/
inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/
inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@
-4,7
+4,7
@@
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 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
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
@@
-37,7
+37,7
@@
class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
parent::__construct(__CLASS__);
// Set prefix to "Image"
parent::__construct(__CLASS__);
// Set prefix to "Image"
- $this->setCommandPrefix(
"Image"
);
+ $this->setCommandPrefix(
'Image'
);
}
/**
}
/**
@@
-82,14
+82,14
@@
class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
*/
public function resolveCommandByRequest (Requestable $requestInstance) {
// Init variables
- $commandName =
""
;
+ $commandName =
''
;
$commandInstance = null;
$commandInstance = null;
- // This goes fine so let's resolv the command
+ // This goes fine so let's resolv
e
the command
$commandName = $requestInstance->getRequestElement('page');
// Is the command empty? Then fall back to default command
$commandName = $requestInstance->getRequestElement('page');
// Is the command empty? Then fall back to default command
- if (empty($commandName)) $commandName = $this->getConfigInstance()->
readConfig
('default_image_command');
+ if (empty($commandName)) $commandName = $this->getConfigInstance()->
getConfigEntry
('default_image_command');
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
@@
-125,7
+125,7
@@
class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
$commandInstance = null;
// Is the command empty? Then fall back to default command
$commandInstance = null;
// Is the command empty? Then fall back to default command
- if (empty($commandName)) $commandName = $this->getConfigInstance()->
readConfig
('default_image_command');
+ if (empty($commandName)) $commandName = $this->getConfigInstance()->
getConfigEntry
('default_image_command');
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
// Check if command is valid
if ($this->isCommandValid($commandName) === false) {
@@
-149,21
+149,16
@@
class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
* command class is missing (bad!)
*/
private function loadCommand ($commandName) {
* command class is missing (bad!)
*/
private function loadCommand ($commandName) {
- // Cache default command
- $defaultCommand = $this->getConfigInstance()->readConfig('default_image_command');
-
// Init command instance
$commandInstance = null;
// Init command instance
$commandInstance = null;
- // Create command class name
- $this->setClassName(sprintf("Image%sCommand",
- $this->convertToClassName($commandName)
- ));
+ // Create class name
+ $className = $this->getCommandPrefix() . $this->convertToClassName($commandName) . 'Command';
// Is this class loaded?
if (!class_exists($this->getClassName())) {
// Class not found, so throw an exception
// 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
} // END - if
// Initiate the command