readConfig() is not naming convention, renamed to getConfigEntry()

[shipsimu.git] / application / ship-simu / main / login / helper / class_ShipSimuLoginHelper.php

diff --git a/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php b/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php
index 0e9aee1fedb768cc73a6d420f951875a2ca4e2c5..32da33fe2b45de746b7c8dead80a62647e6a9fe7 100644 (file)
--- a/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php
+++ b/application/ship-simu/main/login/helper/class_ShipSimuLoginHelper.php
@@ -12,7 +12,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 Ship-Simu 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
  *


@@ -36,7 +36,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin {
        private $authMethod = "";
 
        // Exception constants
        private $authMethod = "";
 
        // Exception constants

-       const EXCEPTION_INVALID_USER_INSTANCE = 0x080;
+       const EXCEPTION_INVALID_USER_INSTANCE = 0x190;

 
        /**
         * Protected constructor
 
        /**
         * Protected constructor


@@ -46,12 +46,6 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);

-
-               // Set part description
-               $this->setObjectDescription("Login helper for Ship-Simu");
-
-               // Create unique ID number
-               $this->generateUniqueId();

        }
 
        /**
        }
 
        /**


@@ -70,7 +64,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin {
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Is this instance valid?
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Is this instance valid?

-               if (!$userInstance instanceof ManageableUser) {
+               if (!$userInstance instanceof ManageableAccount) {

                        // Thrown an exception here
                        throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE);
                } // END - if
                        // Thrown an exception here
                        throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE);
                } // END - if


@@ -91,7 +85,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin {
         * @return      void
         */
        protected function setDefaultAuthMethod () {
         * @return      void
         */
        protected function setDefaultAuthMethod () {

-               $this->authMethod = $this->getConfigInstance()->readConfig('auth_method_class');
+               $this->authMethod = $this->getConfigInstance()->getConfigEntry('auth_method_class');

        }
 
        /**
        }
 
        /**