Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

7 files changed, 13 insertions, 31 deletions

diff --git a/framework/Security/IUserManager.php b/framework/Security/IUserManager.php
index 390189cb..0ca65929 100644
--- a/framework/Security/IUserManager.php
+++ b/framework/Security/IUserManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: IUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -18,7 +17,6 @@
  * and {@link TUser}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: IUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index e30b0bcb..2bf6a5b1 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAuthManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -26,7 +25,7 @@ Prado::using('System.Security.IUserManager');
  * To login or logout a user, call {@link login} or {@link logout}, respectively.
  *
  * The {@link setAuthExpire AuthExpire} property can be used to define the time
- * in seconds after which the authentication should expire. 
+ * in seconds after which the authentication should expire.
  * {@link setAllowAutoLogin AllowAutoLogin} specifies if the login information
  * should be stored in a cookie to perform automatic login. Enabling this
  * feature will cause that {@link setAuthExpire AuthExpire} has no effect
@@ -37,7 +36,6 @@ Prado::using('System.Security.IUserManager');
  * <module id="users" class="System.Security.TUserManager" />
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TAuthManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
@@ -290,7 +288,7 @@ class TAuthManager extends TModule
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() && 
+		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
         ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
@@ -321,7 +319,7 @@ class TAuthManager extends TModule
 		if($this->hasEventHandler('OnAuthenticate'))
 			$this->raiseEvent('OnAuthenticate',$this,$application);
 	}
-	
+
 	/**
 	 * Performs user logout on authentication expiration.
 	 * An 'OnAuthExpire' event will be raised if there is any handler attached to it.
@@ -333,7 +331,7 @@ class TAuthManager extends TModule
 		if($this->hasEventHandler('OnAuthExpire'))
 			$this->raiseEvent('OnAuthExpire',$this,$param);
 	}
-	
+
 	/**
 	 * Performs the real authorization work.
 	 * Authorization rules obtained from the application will be used to check
diff --git a/framework/Security/TAuthorizationRule.php b/framework/Security/TAuthorizationRule.php
index cae28bfb..aa9bed90 100644
--- a/framework/Security/TAuthorizationRule.php
+++ b/framework/Security/TAuthorizationRule.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAuthorizationRule.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 /**
@@ -25,7 +24,6 @@
  * IP rules are separated by comma ',' and can contain wild card in the rules (e.g. '192.132.23.33, 192.122.*.*')
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TAuthorizationRule.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
@@ -249,7 +247,6 @@ class TAuthorizationRule extends TComponent
  * To check if a user is allowed, call {@link isUserAllowed}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TAuthorizationRule.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
diff --git a/framework/Security/TDbUserManager.php b/framework/Security/TDbUserManager.php
index aabd6e5c..0832dfe5 100644
--- a/framework/Security/TDbUserManager.php
+++ b/framework/Security/TDbUserManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDbUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -44,7 +43,6 @@ Prado::using('System.Security.TUser');
  * which specifies how to establish database connection to retrieve user information.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDbUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.1.0
  */
@@ -216,7 +214,6 @@ class TDbUserManager extends TModule implements IUserManager
  * - {@link createUser()}: creates a new user instance given the username
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDbUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.1.0
  */
diff --git a/framework/Security/TSecurityManager.php b/framework/Security/TSecurityManager.php
index b5267db1..bdb85564 100644
--- a/framework/Security/TSecurityManager.php
+++ b/framework/Security/TSecurityManager.php
@@ -5,9 +5,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSecurityManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -36,7 +35,6 @@
  * Note, to use encryption, the PHP Mcrypt extension must be loaded.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TSecurityManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
@@ -354,7 +352,6 @@ class TSecurityManager extends TModule
  * - SHA1: an SHA1 hash is generated from the data and used for validation.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TSecurityManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0.4
  */
diff --git a/framework/Security/TUser.php b/framework/Security/TUser.php
index 3a7a3fa0..8a229b1a 100644
--- a/framework/Security/TUser.php
+++ b/framework/Security/TUser.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TUser.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -27,7 +26,6 @@ Prado::using('System.Security.IUserManager');
  * TUser is meant to be used together with {@link IUserManager}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TUser.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index 5cb716dd..4ad67a15 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  */
 
@@ -64,7 +63,6 @@ Prado::using('System.Security.TUser');
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Carl Mathisen <carl@kamikazemedia.no>
- * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0
  */
@@ -108,7 +106,7 @@ class TUserManager extends TModule implements IUserManager
 	 */
 	public function init($config)
 	{
-		$this->loadUserData($config);	
+		$this->loadUserData($config);
 		if($this->_userFile!==null)
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
@@ -125,7 +123,7 @@ class TUserManager extends TModule implements IUserManager
 		}
 		$this->_initialized=true;
 	}
-	
+
 	/*
 	 * Loads user/role information
 	 * @param mixed the variable containing the user information
@@ -389,7 +387,6 @@ class TUserManager extends TModule implements IUserManager
  * - SHA1: the password is recorded as the SHA1 hash value of the original password
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TUserManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Security
  * @since 3.0.4
  */