From 90b3f22cba8ad85ef2eb38c158fa2da46d798cf8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 8 Sep 2006 19:31:03 +0000
Subject: merge from 3.0 branch till 1397.

---
 framework/Security/IUserManager.php       | 4 ++--
 framework/Security/TAuthManager.php       | 4 ++--
 framework/Security/TAuthorizationRule.php | 6 +++---
 framework/Security/TSecurityManager.php   | 6 +++---
 framework/Security/TUser.php              | 4 ++--
 framework/Security/TUserManager.php       | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'framework/Security')

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
  */
-- 
cgit v1.2.3