From 75f28186a995aa930f6db9f05ec7b63bbd2cd284 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 30 May 2006 03:30:14 +0000
Subject: Merge from 3.0 branch till 1103

---
 demos/blog/protected/Common/BlogUserManager.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'demos/blog/protected/Common/BlogUserManager.php')

diff --git a/demos/blog/protected/Common/BlogUserManager.php b/demos/blog/protected/Common/BlogUserManager.php
index c3ddb80b..3a7f4789 100644
--- a/demos/blog/protected/Common/BlogUserManager.php
+++ b/demos/blog/protected/Common/BlogUserManager.php
@@ -1,8 +1,25 @@
 <?php
+/**
+ * BlogUserManager class file
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ * @version $Revision: $  $Date: $
+ */
 
 Prado::using('System.Security.IUserManager');
 Prado::using('Application.Common.BlogUser');
 
+/**
+ * BlogUserManager class
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.pradosoft.com/
+ * @copyright Copyright &copy; 2006 PradoSoft
+ * @license http://www.pradosoft.com/license/
+ */
 class BlogUserManager extends TModule implements IUserManager
 {
 	public function getGuestName()
@@ -29,7 +46,7 @@ class BlogUserManager extends TModule implements IUserManager
 				$user->setID($userRecord->ID);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				$user->setRoles($userRecord->Role===0?'user':'admin');
+				$user->setRoles($userRecord->Role===UserRecord::ROLE_USER?'user':'admin');
 				return $user;
 			}
 			else
@@ -47,7 +64,7 @@ class BlogUserManager extends TModule implements IUserManager
 	{
 		$db=$this->Application->getModule('data');
 		if(($userRecord=$db->queryUserByName($username))!==null)
-			return $userRecord->Password===md5($password);
+			return $userRecord->Password===md5($password) && $userRecord->Status===UserRecord::STATUS_NORMAL;
 		else
 			return false;
 	}
-- 
cgit v1.2.3