Packager script for latest dev version added, misc fixes, captcha verifier filter...

[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 1143d22136a2772fa8ddb6429d850e95e4abe252..4c8a8814f9d8ddc989b165379a505fe1e8f9e8be 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -49,8 +49,8 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
        /**
         * Creates an instance of this class
         *
-        * @param       $resolverInstance               An instance of a command resolver class
-        * @return      $commandInstance                An instance a prepared command class
+        * @param       $resolverInstance       An instance of a command resolver class
+        * @return      $commandInstance        An instance a prepared command class
         */
        public final static function createWebLoginAreaCommand (CommandResolver $resolverInstance) {
                // Get new instance
@@ -70,24 +70,27 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
         * Prepares some general data which shall be displayed on every page
         *
         * @return      void
+        * @todo        Add some stuff here: Some personal data, app/game related data
         */
        protected function prepareCommand () {
-               /* @TODO Add some stuff here: Some personal data, app/game related data */
        }
 
        /**
         * Executes the given command with given request and response objects
         *
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @param       $responseInstance               An instance of a class with an Responseable interface
+        * @param       $requestInstance        An instance of a class with an Requestable interface
+        * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // 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);
+               // Do we have an action here?
+               if ($actionInstance instanceof PerformableAction) {
+                       // Execute the action (shall not output anything, see below why)
+                       $actionInstance->execute($requestInstance, $responseInstance);
+               } // END - if
 
                // Get the application instance
                $appInstance = $this->getResolverInstance()->getApplicationInstance();
@@ -105,18 +108,18 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $masterTemplate = $appInstance->getMasterTemplate();
 
                // Load header template
-               $templateInstance->loadCodeTemplate("header");
+               $templateInstance->loadCodeTemplate('header');
 
                // Compile and assign it with a variable
                $templateInstance->compileTemplate();
-               $templateInstance->assignTemplateWithVariable("header", "header");
+               $templateInstance->assignTemplateWithVariable('header', 'header');
 
                // Load footer template
-               $templateInstance->loadCodeTemplate("footer");
+               $templateInstance->loadCodeTemplate('footer');
 
                // Compile and assign it with a variable
                $templateInstance->compileTemplate();
-               $templateInstance->assignTemplateWithVariable("footer", "footer");
+               $templateInstance->assignTemplateWithVariable('footer', 'footer');
 
                // Load the matching template
                $templateInstance->loadCodeTemplate($this->actionName);
@@ -126,22 +129,21 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->assignTemplateWithVariable($this->actionName, "login_content");
 
                // Load main template
-               $templateInstance->loadCodeTemplate("login_main");
+               $templateInstance->loadCodeTemplate('login_main');
 
                // Assign the main template with the master template as a content ... ;)
                $templateInstance->compileTemplate();
-               $templateInstance->assignTemplateWithVariable("login_main", "content");
+               $templateInstance->assignTemplateWithVariable('login_main', 'content');
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($this->actionName."_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
                // these two calls to cache compiled templates.
-               //$templateInstance->debugInstance();
                $templateInstance->compileVariables();
 
                // Get the content back from the template engine and put it in the response class