summaryrefslogtreecommitdiff
path: root/framework/Security
diff options
context:
space:
mode:
authorxue <>2006-09-08 19:31:03 +0000
committerxue <>2006-09-08 19:31:03 +0000
commit90b3f22cba8ad85ef2eb38c158fa2da46d798cf8 (patch)
treec321fedfe1339a1567766c375c600a738e6ac840 /framework/Security
parenta5dd2d8c17fcac8da117a9c8ae8af519b02c717a (diff)
merge from 3.0 branch till 1397.
Diffstat (limited to 'framework/Security')
-rw-r--r--framework/Security/IUserManager.php4
-rw-r--r--framework/Security/TAuthManager.php4
-rw-r--r--framework/Security/TAuthorizationRule.php6
-rw-r--r--framework/Security/TSecurityManager.php6
-rw-r--r--framework/Security/TUser.php4
-rw-r--r--framework/Security/TUserManager.php6
6 files changed, 15 insertions, 15 deletions
diff --git a/framework/Security/IUserManager.php b/framework/Security/IUserManager.php
index b1a6b67c..649c41b6 100644
--- a/framework/Security/IUserManager.php
+++ b/framework/Security/IUserManager.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
@@ -18,7 +18,7 @@
* and {@link TUser}.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php
index e378b51e..481b9ddb 100644
--- a/framework/Security/TAuthManager.php
+++ b/framework/Security/TAuthManager.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
@@ -30,7 +30,7 @@ Prado::using('System.Security.IUserManager');
* <module id="users" class="System.Security.TUserManager" />
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
diff --git a/framework/Security/TAuthorizationRule.php b/framework/Security/TAuthorizationRule.php
index 5c8f0f9b..b2f3c235 100644
--- a/framework/Security/TAuthorizationRule.php
+++ b/framework/Security/TAuthorizationRule.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
/**
@@ -23,7 +23,7 @@
* Verb can be either 'get' or 'post'. If it is absent, it means both.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
@@ -171,7 +171,7 @@ class TAuthorizationRule extends TComponent
* To check if a user is allowed, call {@link isUserAllowed}.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
diff --git a/framework/Security/TSecurityManager.php b/framework/Security/TSecurityManager.php
index 89f3711a..5caf96dc 100644
--- a/framework/Security/TSecurityManager.php
+++ b/framework/Security/TSecurityManager.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
@@ -35,7 +35,7 @@
* Note, to use encryption, the PHP Mcrypt extension must be loaded.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
@@ -269,7 +269,7 @@ 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 $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0.4
*/
diff --git a/framework/Security/TUser.php b/framework/Security/TUser.php
index ee52ceaa..3ff41104 100644
--- a/framework/Security/TUser.php
+++ b/framework/Security/TUser.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
@@ -27,7 +27,7 @@ Prado::using('System.Security.IUserManager');
* TUser is meant to be used together with {@link IUserManager}.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index c0bbe65d..60e67df8 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -6,7 +6,7 @@
* @link http://www.pradosoft.com/
* @copyright Copyright &copy; 2005 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
*/
@@ -43,7 +43,7 @@ Prado::using('System.Security.TUser');
* how users are authenticated and authorized in a Prado application.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0
*/
@@ -269,7 +269,7 @@ 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 $Revision: $ $Date: $
+ * @version $Id$
* @package System.Security
* @since 3.0.4
*/