2 files changed, 6 insertions, 42 deletions

diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index ae3f713f..3bf6964e 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -34,17 +34,13 @@ Prado::using('System.Security.TUserManager');
  * @package System.Security

  * @since 3.0

  */

-class TAuthManager extends TComponent implements IModule

+class TAuthManager extends TModule

 {

 	/**

 	 * GET variable name for return url

 	 */

 	const RETURN_URL_VAR='ReturnUrl';

 	/**

-	 * @var string module ID

-	 */

-	private $_id;

-	/**

 	 * @var boolean if the module has been initialized

 	 */

 	private $_initialized=false;

@@ -66,22 +62,6 @@ class TAuthManager extends TComponent implements IModule
 	private $_skipAuthorization=false;

 

 	/**

-	 * @return string id of this module

-	 */

-	public function getID()

-	{

-		return $this->_id;

-	}

-

-	/**

-	 * @param string id of this module

-	 */

-	public function setID($value)

-	{

-		$this->_id=$value;

-	}

-

-	/**

 	 * Initializes this module.

 	 * This method is required by the IModule interface.

 	 * @param TApplication Prado application, can be null

@@ -90,6 +70,8 @@ class TAuthManager extends TComponent implements IModule
 	 */

 	public function init($application,$config)

 	{

+		parent::init($application,$config);

+

 		if($this->_userManager===null)

 			throw new TConfigurationException('authmanager_usermanager_required');

 		if(is_string($this->_userManager))

diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index 9da386f0..d9210661 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -189,13 +189,9 @@ class TUser extends TComponent implements IUser
  * @package System.Security

  * @since 3.0

  */

-class TUserManager extends TComponent implements IModule

+class TUserManager extends TModule

 {

 	/**

-	 * @var string id of this module

-	 */

-	private $_id;

-	/**

 	 * @var array list of users managed by this module

 	 */

 	private $_users=array();

@@ -221,6 +217,8 @@ class TUserManager extends TComponent implements IModule
 	 */

 	public function init($application,$config)

 	{

+		parent::init($application,$config);

+

 		foreach($config->getElementsByTagName('user') as $node)

 			$this->_users[strtolower($node->getAttribute('name'))]=$node->getAttribute('password');

 		foreach($config->getElementsByTagName('role') as $node)

@@ -234,22 +232,6 @@ class TUserManager extends TComponent implements IModule
 	}

 

 	/**

-	 * @return string id of this module

-	 */

-	public function getID()

-	{

-		return $this->_id;

-	}

-

-	/**

-	 * @param string id of this module

-	 */

-	public function setID($value)

-	{

-		$this->_id=$value;

-	}

-

-	/**

 	 * @return string guest name, defaults to 'Guest'

 	 */

 	public function getGuestName()