'public static final' is correct

[shipsimu.git] / application / ship-simu / main / commands / web / class_WebShipsimuUserLoginCommand.php

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index 1a0a99f28540de11f6ac0c106dc0aec054f0bc7f..3614b825b4f6ce8aab9aa7c6df460255b89ba425 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
@@ -30,10 +30,6 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);

-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();

        }
 
        /**
        }
 
        /**


@@ -42,7 +38,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver
         * @return      $commandInstance        The created command instance
         */
         * @param       $resolverInstance       An instance of a command resolver
         * @return      $commandInstance        The created command instance
         */

-       public final static function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) {
+       public static final function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) {

                // Get a new instance
                $commandInstance = new WebShipsimuUserLoginCommand();
 
                // Get a new instance
                $commandInstance = new WebShipsimuUserLoginCommand();
 


@@ -102,12 +98,12 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?

-               switch ($this->getConfigInstance()->readConfig('login_type')) {
-                       case "username": // Login via username
+               switch ($this->getConfigInstance()->getConfigEntry('login_type')) {
+                       case 'username': // Login via username

                                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
                                break;
 
                                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
                                break;
 

-                       case "email": // Login via email
+                       case 'email': // Login via email

                                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));
                                break;
 
                                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));
                                break;