summaryrefslogtreecommitdiff
path: root/framework/Security
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Security')
-rw-r--r--framework/Security/IUserManager.php2
-rw-r--r--framework/Security/TAuthManager.php10
-rw-r--r--framework/Security/TAuthorizationRule.php2
-rw-r--r--framework/Security/TDbUserManager.php2
-rw-r--r--framework/Security/TSecurityManager.php2
-rw-r--r--framework/Security/TUser.php2
-rw-r--r--framework/Security/TUserManager.php6
7 files changed, 13 insertions, 13 deletions
diff --git a/framework/Security/IUserManager.php b/framework/Security/IUserManager.php
index 390189cb..5ed7cb08 100644
--- a/framework/Security/IUserManager.php
+++ b/framework/Security/IUserManager.php
@@ -4,7 +4,7 @@
*
* @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
diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index e30b0bcb..416cb628 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -4,7 +4,7 @@
*
* @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 +26,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
@@ -290,7 +290,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 +321,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 +333,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..cf04591c 100644
--- a/framework/Security/TAuthorizationRule.php
+++ b/framework/Security/TAuthorizationRule.php
@@ -4,7 +4,7 @@
*
* @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
diff --git a/framework/Security/TDbUserManager.php b/framework/Security/TDbUserManager.php
index aabd6e5c..e116a6a4 100644
--- a/framework/Security/TDbUserManager.php
+++ b/framework/Security/TDbUserManager.php
@@ -4,7 +4,7 @@
*
* @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
diff --git a/framework/Security/TSecurityManager.php b/framework/Security/TSecurityManager.php
index b5267db1..e2f06a19 100644
--- a/framework/Security/TSecurityManager.php
+++ b/framework/Security/TSecurityManager.php
@@ -5,7 +5,7 @@
*
* @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
diff --git a/framework/Security/TUser.php b/framework/Security/TUser.php
index 3a7a3fa0..4ab2a96d 100644
--- a/framework/Security/TUser.php
+++ b/framework/Security/TUser.php
@@ -4,7 +4,7 @@
*
* @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
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index 5cb716dd..8af5a11b 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -4,7 +4,7 @@
*
* @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
@@ -108,7 +108,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 +125,7 @@ class TUserManager extends TModule implements IUserManager
}
$this->_initialized=true;
}
-
+
/*
* Loads user/role information
* @param mixed the variable containing the user information