Copyright upgraded to 2010

[core.git] / inc / classes / main / resolver / action / web / class_WebActionResolver.php

diff --git a/inc/classes/main/resolver/action/web/class_WebActionResolver.php b/inc/classes/main/resolver/action/web/class_WebActionResolver.php
index 6276b11d694e39e28b24f2f89751f38442acc917..a7bcc685ca3b966e344180398ef6df46dc23ac5c 100644 (file)
--- a/inc/classes/main/resolver/action/web/class_WebActionResolver.php
+++ b/inc/classes/main/resolver/action/web/class_WebActionResolver.php
@@ -4,7 +4,7 @@
  *
  * @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, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -25,7 +25,7 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver {
        /**
         * Last successfull resolved action
         */
-       private $lastActionInstance = "";
+       private $lastActionInstance = '';
 
        /**
         * Protected constructor
@@ -82,14 +82,14 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver {
         */
        public function resolveActionByRequest (Requestable $requestInstance) {
                // Init variables
-               $actionName = "";
+               $actionName = '';
                $actionInstance = null;
 
-               // This goes fine so let's resolv the action
+               // This goes fine so let's resolve the action
                $actionName = $requestInstance->getRequestElement('action');
 
                // Is the action empty? Then fall back to default action
-               if (empty($actionName)) $actionName = $this->getConfigInstance()->readConfig('default_action');
+               if (empty($actionName)) $actionName = $this->getConfigInstance()->getConfigEntry('default_action');
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {
@@ -127,7 +127,7 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver {
                $actionName = $this->getActionName();
 
                // Is the action empty? Then fall back to default action
-               if (empty($actionName)) $actionName = $this->getConfigInstance()->readConfig('default_action');
+               if (empty($actionName)) $actionName = $this->getConfigInstance()->getConfigEntry('default_action');
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {