Merge from 3.0 branch till 1103

1 files changed, 29 insertions, 2 deletions

diff --git a/demos/blog/protected/Pages/Users/NewUser.php b/demos/blog/protected/Pages/Users/NewUser.php
index 166abf66..50a8100b 100644
--- a/demos/blog/protected/Pages/Users/NewUser.php
+++ b/demos/blog/protected/Pages/Users/NewUser.php
@@ -1,10 +1,33 @@
 <?php

+/**

+ * NewUser 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: $

+ */

 

+/**

+ * NewUser 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 NewUser extends BlogPage

 {

+	public function onInit($param)

+	{

+		if(!$this->User->IsAdmin && !TPropertyValue::ensureBoolean($this->Application->Parameters['MultipleUser']))

+			throw new BlogException(500,'newuser_registration_disallowed');

+	}

+

 	public function checkUsername($sender,$param)

 	{

-		$username=$this->Username->Text;

+		$username=strtolower($this->Username->Text);

 		$param->IsValid=$this->DataAccess->queryUserByName($username)===null;

 	}

 

@@ -13,13 +36,17 @@ class NewUser extends BlogPage
 		if($this->IsValid)

 		{

 			$userRecord=new UserRecord;

-			$userRecord->Name=$this->Username->Text;

+			$userRecord->Name=strtolower($this->Username->Text);

 			$userRecord->FullName=$this->FullName->Text;

 			$userRecord->Role=0;

 			$userRecord->Password=md5($this->Password->Text);

 			$userRecord->Email=$this->Email->Text;

 			$userRecord->CreateTime=time();

 			$userRecord->Website=$this->Website->Text;

+			if(TPropertyValue::ensureBoolean($this->Application->Parameters['AccountApproval']))

+				$userRecord->Status=UserRecord::STATUS_PENDING;

+			else

+				$userRecord->Status=UserRecord::STATUS_NORMAL;

 			$this->DataAccess->insertUser($userRecord);

 			$authManager=$this->Application->getModule('auth');

 			$authManager->login($this->Username->Text,$this->Password->Text);