Actions (so called sub-commands) may now have own pre/post filter, profile update...

[shipsimu.git] / inc / classes / main / commands / web / class_WebLoginAreaCommand.php

diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index 146623d24ecae9e0aa4fef6fe792f3a86d597b56..1143d22136a2772fa8ddb6429d850e95e4abe252 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -22,6 +22,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class WebLoginAreaCommand extends BaseCommand implements Commandable {
+       /**
+        * Name of the action
+        */
+       private $actionName = "";
+
        /**
         * Protected constructor
         *
@@ -78,22 +83,8 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
         * @return      void
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Default action is the one from configuration
-               $actionClass = sprintf("login_%s_action_class", $this->getConfigInstance()->readConfig('login_default_action'));
-               $action = sprintf("login_%s", $this->getConfigInstance()->readConfig('login_default_action'));
-
-               // Get "action" from request
-               $actReq = $requestInstance->getRequestElement('action');
-
-               // Do we have a "action" parameter set?
-               if (is_string($actReq)) {
-                       // Then use it with prefix
-                       $actionClass = sprintf("login_%s_action_class", $actReq);
-                       $action = sprintf("login_%s", $actReq);
-               } // END - if
-
-               // Get an action instance
-               $actionInstance = ObjectFactory::createObjectByConfiguredName($actionClass);
+               // Get the action instance from registry
+               $actionInstance = Registry::getRegistry()->getInstance('action');
 
                // Execute the action (shall not output anything, see below why)
                $actionInstance->execute($requestInstance, $responseInstance);
@@ -128,11 +119,11 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->assignTemplateWithVariable("footer", "footer");
 
                // Load the matching template
-               $templateInstance->loadCodeTemplate($action);
+               $templateInstance->loadCodeTemplate($this->actionName);
 
                // Assign the template with the master template as a content ... ;)
                $templateInstance->compileTemplate();
-               $templateInstance->assignTemplateWithVariable($action, "login_content");
+               $templateInstance->assignTemplateWithVariable($this->actionName, "login_content");
 
                // Load main template
                $templateInstance->loadCodeTemplate("login_main");
@@ -145,7 +136,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($action."_title"));
+               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($this->actionName."_title"));
 
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between
@@ -161,10 +152,44 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
         * Adds extra filters to the given controller instance
         *
         * @param       $controllerInstance             A controller instance
+        * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         */
-       function addExtraFilters (Controller $controllerInstance) {
-               // Empty for now
+       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+               // Default is no action
+               $actionInstance = null;
+
+               // Default action is the one from configuration
+               $this->actionName = sprintf("login_%s", $this->getConfigInstance()->readConfig('login_default_action'));
+
+               // Get "action" from request
+               $actReq = $requestInstance->getRequestElement('action');
+
+               // Do we have a "action" parameter set?
+               if ((is_string($actReq)) && (!empty($actReq))) {
+                       // Then use it with prefix
+                       $this->actionName = sprintf("login_%s", $actReq);
+               } // END - if
+
+               // Get application instance
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+
+               // Try to get an action resolver for the given action
+               try {
+                       // Get a resolver
+                       $actionResolver = WebActionResolver::createWebActionResolver($this->actionName, $applicationInstance);
+
+                       // Resolve the action
+                       $actionInstance = $actionResolver->resolveAction();
+
+                       // Add more action-specific filters
+                       $actionInstance->addExtraFilters($controllerInstance, $requestInstance);
+
+                       // Remember this action in registry
+                       Registry::getRegistry()->addInstance('action', $actionInstance);
+               } catch (InvalidActionException $e) {
+                       // Silently ignored because no special action was found
+               }
        }
 }