replace is_null() function calls with native native language constuct

35 files changed, 1905 insertions, 1904 deletions

diff --git a/HISTORY b/HISTORY
index 576b554d..4da3e9d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,6 +14,7 @@ CHG: Issue#7 - Clients Scripts are not combined anymore in Debug application mod
 ENH: Issue#115 - Registry for Prado generated clientside counterparts of serverside controls (Yves Berkholz)
 ENH: Added caching of message files to TException (Michael)
 ENH: Updated to scriptaculous 1.8.2 & Prototype 1.6.0.3
+ENH: replace is_null() function calls with native native language constuct (Yves)
 
 Version 3.1.4 January 11, 2009
 BUG: Issue#9  - Global page properties are ignored when using external configuration (Christophe)
diff --git a/framework/Data/SqlMap/Configuration/TParameterMap.php b/framework/Data/SqlMap/Configuration/TParameterMap.php
index f4fbbe1c..4b5ee144 100644
--- a/framework/Data/SqlMap/Configuration/TParameterMap.php
+++ b/framework/Data/SqlMap/Configuration/TParameterMap.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

@@ -140,12 +140,12 @@ class TParameterMap extends TComponent
 	{

 		$value = $this->getObjectValue($parameterValue,$property);

 

-		if(!is_null($handler=$this->createTypeHandler($property, $registry)))

+		if(($handler=$this->createTypeHandler($property, $registry))!==null)

 			$value = $handler->getParameter($value);

 

 		$value = $this->nullifyDefaultValue($property,$value);

 

-		if(!is_null($type = $property->getType()))

+		if(($type = $property->getType())!==null)

 			$value = $registry->convertToType($type, $value);

 

 		return $value;

@@ -197,7 +197,7 @@ class TParameterMap extends TComponent
 	 */

 	protected function nullifyDefaultValue($property,$value)

 	{

-		if(!is_null($nullValue = $property->getNullValue()))

+		if(($nullValue = $property->getNullValue())!==null)

 		{

 			if($nullValue === $value)

 				$value = null;

diff --git a/framework/Data/SqlMap/Configuration/TResultMap.php b/framework/Data/SqlMap/Configuration/TResultMap.php
index d59d9522..e85dc1aa 100644
--- a/framework/Data/SqlMap/Configuration/TResultMap.php
+++ b/framework/Data/SqlMap/Configuration/TResultMap.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

@@ -162,7 +162,7 @@ class TResultMap extends TComponent
 		$handler = $registry->getTypeHandler($this->getClass());

 		try

 		{

-			if(!is_null($handler))

+			if($handler!==null)

 				return $handler->createNewInstance();

 			else

 				return $registry->createInstanceOf($this->getClass());

@@ -184,12 +184,12 @@ class TResultMap extends TComponent
 	public function resolveSubMap($registry,$row)

 	{

 		$subMap = $this;

-		if(!is_null($disc = $this->getDiscriminator()))

+		if(($disc = $this->getDiscriminator())!==null)

 		{

 			$value = $disc->getMapping()->getPropertyValue($registry,$row);

 			$subMap = $disc->getSubMap((string)$value);

 

-			if(is_null($subMap))

+			if($subMap===null)

 				$subMap = $this;

 			else if($subMap !== $this)

 				$subMap = $subMap->resolveSubMap($registry,$row);

diff --git a/framework/Data/SqlMap/Configuration/TResultProperty.php b/framework/Data/SqlMap/Configuration/TResultProperty.php
index 8e20d5e4..7316ef0b 100644
--- a/framework/Data/SqlMap/Configuration/TResultProperty.php
+++ b/framework/Data/SqlMap/Configuration/TResultProperty.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

@@ -242,7 +242,7 @@ class TResultProperty extends TComponent
 			$value = $this->getTypedValue($registry,$row[$index]);

 		else if(isset($row[$name]))

 			$value = $this->getTypedValue($registry,$row[$name]);

-		if(is_null($value) && !is_null($this->getNullValue()))

+		if(($value===null) && ($this->getNullValue()!==null))

 			$value = $this->getTypedValue($registry,$this->getNullValue());

 		return $value;

 	}

@@ -302,7 +302,7 @@ class TResultProperty extends TComponent
 	 */

 	public function instanceOfListType($target)

 	{

-		if(is_null($this->getType()))

+		if($this->getType()===null)

 			return  TPropertyAccess::get($target,$this->getProperty()) instanceof TList;

 		return $this->getPropertyValueType() == self::LIST_TYPE;

 	}

@@ -315,7 +315,7 @@ class TResultProperty extends TComponent
 	 */

 	public function instanceOfArrayType($target)

 	{

-		if(is_null($this->getType()))

+		if($this->getType()===null)

 		{

 			$prop = TPropertyAccess::get($target,$this->getProperty());

 			if(is_object($prop))

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
index d7984dc4..5d19a3a3 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

@@ -79,7 +79,7 @@ class TSqlMapCacheModel extends TComponent
 	 */

 	public function initialize($cache=null)

 	{

-		if(is_null($cache))

+		if($cache===null)

 			$this->_cache= Prado::createComponent($this->getImplementationClass());

 		else

 			$this->_cache=$cache;

@@ -127,7 +127,7 @@ class TSqlMapCacheModel extends TComponent
 		//if flush ?

 		$value = $this->_cache->get($key);

 		$this->_requests++;

-		if(!is_null($value))

+		if($value!==null)

 			$this->_hits++;

 		return $value;

 	}

@@ -141,7 +141,7 @@ class TSqlMapCacheModel extends TComponent
 		if($key instanceof TSqlMapCacheKey)

 			$key = $key->getHash();

 

-		if(!is_null($value))

+		if($value!==null)

 			$this->_cache->set($key, $value);

 	}

 

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapStatement.php b/framework/Data/SqlMap/Configuration/TSqlMapStatement.php
index 3afcc75f..7e1783a3 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapStatement.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapStatement.php
@@ -5,7 +5,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

@@ -275,7 +275,7 @@ class TSqlMapStatement extends TComponent
 	protected function createInstanceOf($registry,$type,$row=null)

 	{

 		$handler = $registry->getTypeHandler($type);

-		if(!is_null($handler))

+		if($handler!==null)

 			return $handler->createNewInstance($row);

 		else

 			return $registry->createInstanceOf($type);

diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index f2d13966..ba8c3d0c 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -4,14 +4,14 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Configuration

  */

 

 Prado::using('System.Data.SqlMap.Configuration.TSqlMapStatement');

-
+

 /**

  * TSqlMapXmlConfig class file.

  *

@@ -255,7 +255,7 @@ class TSqlMapXmlConfiguration extends TSqlMapXmlConfigBuilder
 								$resultMap, $this->_configFile, $entry->getID());

 				}

 			}

-			if(!is_null($entry->getDiscriminator()))

+			if($entry->getDiscriminator()!==null)

 				$entry->getDiscriminator()->initialize($this->_manager);

 		}

 	}

@@ -309,16 +309,16 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 

 	private $_FlushOnExecuteStatements=array();

 

-	/**
-	 * Regular expressions for escaping simple/inline parameter symbols
-	 */
-	const SIMPLE_MARK='$';
-	const INLINE_SYMBOL='#';
-	const ESCAPED_SIMPLE_MARK_REGEXP='/\$\$/';
-	const ESCAPED_INLINE_SYMBOL_REGEXP='/\#\#/';
-	const SIMPLE_PLACEHOLDER='`!!`';
-	const INLINE_PLACEHOLDER='`!!!`';
-
+	/**

+	 * Regular expressions for escaping simple/inline parameter symbols

+	 */

+	const SIMPLE_MARK='$';

+	const INLINE_SYMBOL='#';

+	const ESCAPED_SIMPLE_MARK_REGEXP='/\$\$/';

+	const ESCAPED_INLINE_SYMBOL_REGEXP='/\#\#/';

+	const SIMPLE_PLACEHOLDER='`!!`';

+	const INLINE_PLACEHOLDER='`!!!`';

+

 	/**

 	 * @param TSqlMapXmlConfiguration parent xml configuration.

 	 */

@@ -434,7 +434,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 

 		foreach($node->xpath('subMap') as $subMapNode)

 		{

-			if(is_null($discriminator))

+			if($discriminator===null)

 				throw new TSqlMapConfigurationException(

 					'sqlmap_undefined_discriminator', $node, $this->_configFile,$subMapNode);

 			$subMap = new TSubMap;

@@ -442,7 +442,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 			$discriminator->addSubMap($subMap);

 		}

 

-		if(!is_null($discriminator))

+		if($discriminator!==null)

 			$resultMap->setDiscriminator($discriminator);

 

 		return $resultMap;

@@ -542,7 +542,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 		$scope['file'] = $this->_configFile;

 		$scope['node'] = $node;

 

-		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);
+		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);

 		if($statement->parameterMap() === null)

 		{

 			// Build a Parametermap with the inline parameters.

@@ -559,7 +559,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 			}

 			$sqlStatement = $sqlText['sql'];

 		}

-		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/',self::INLINE_SYMBOL,$sqlStatement);
+		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/',self::INLINE_SYMBOL,$sqlStatement);

 

 		$this->prepareSql($statement, $sqlStatement, $node);

 	}

@@ -574,7 +574,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 	protected function prepareSql($statement,$sqlStatement, $node)

 	{

 		$simpleDynamic = new TSimpleDynamicParser;

-		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);
+		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);

 		$dynamics = $simpleDynamic->parse($sqlStatement);

 		if(count($dynamics['parameters']) > 0)

 		{

@@ -583,7 +583,7 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 		}

 		else

 			$sql = new TStaticSql();

-		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
+		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);

 		$sql->buildPreparedStatement($statement, $sqlStatement);

 		$statement->setSqlText($sql);

 	}

@@ -737,4 +737,4 @@ class TSqlMapXmlMappingConfiguration extends TSqlMapXmlConfigBuilder
 		}

 	}

 }

-
+

diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index 86171c1e..68b0c638 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap

@@ -178,7 +178,7 @@ class TSqlMapPagedList extends TPagedList
 	 */

 	public function getIsNextPageAvailable()

 	{

-		return !is_null($this->_nextPageList);

+		return $this->_nextPageList!==null;

 	}

 

 	/**

@@ -186,7 +186,7 @@ class TSqlMapPagedList extends TPagedList
 	 */

 	public function getIsPreviousPageAvailable()

 	{

-		return !is_null($this->_prevPageList);

+		return $this->_prevPageList!==null;

 	}

 

 	/**

@@ -194,7 +194,7 @@ class TSqlMapPagedList extends TPagedList
 	 */

 	public function getIsLastPage()

 	{

-		return is_null($this->_nextPageList) || $this->_nextPageList->getCount() < 1;

+		return ($this->_nextPageList===null) || $this->_nextPageList->getCount() < 1;

 	}

 

 	/**

diff --git a/framework/Data/SqlMap/Statements/TCachingStatement.php b/framework/Data/SqlMap/Statements/TCachingStatement.php
index c8a748c1..fcaeb974 100644
--- a/framework/Data/SqlMap/Statements/TCachingStatement.php
+++ b/framework/Data/SqlMap/Statements/TCachingStatement.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Statements

@@ -47,7 +47,7 @@ class TCachingStatement implements IMappedStatement
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);

 		$key = $this->getCacheKey(array(clone($sql), $keyProperty, $valueProperty,$skip, $max));

 		$map = $this->getStatement()->getCache()->get($key);

-		if(is_null($map))

+		if($map===null)

 		{

 			$map = $this->_mappedStatement->runQueryForMap(

 				$connection, $parameter, $sql, $keyProperty, $valueProperty,  $delegate);

@@ -71,7 +71,7 @@ class TCachingStatement implements IMappedStatement
 		$sql = $this->createCommand($connection, $parameter, $skip, $max);

 		$key = $this->getCacheKey(array(clone($sql), $parameter, $skip, $max));

 		$list = $this->getStatement()->getCache()->get($key);

-		if(is_null($list))

+		if($list===null)

 		{

 			$list = $this->_mappedStatement->runQueryForList(

 				$connection, $parameter, $sql, $result, $delegate);

@@ -85,7 +85,7 @@ class TCachingStatement implements IMappedStatement
 		$sql = $this->createCommand($connection, $parameter);

 		$key = $this->getCacheKey(array(clone($sql), $parameter));

 		$object = $this->getStatement()->getCache()->get($key);

-		if(is_null($object))

+		if($object===null)

 		{

 			$object = $this->_mappedStatement->runQueryForObject($connection, $sql, $result);

 			$this->getStatement()->getCache()->set($key, $object);

diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php
index 6a9130fe..6b11b107 100644
--- a/framework/Data/SqlMap/Statements/TMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TMappedStatement.php
@@ -231,7 +231,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		$connection->setActive(true);

 		$reader = $sql->query();

 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);

-		if(!is_null($delegate))

+		if($delegate!==null)

 		{

 			foreach($reader as $row)

 			{

@@ -304,14 +304,14 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		//$recordSet = $this->executeSQLQuery($connection, $sql);

 		$connection->setActive(true);

 		$reader = $command->query();

-		if(!is_null($delegate))

+		if($delegate!==null)

 		{

 			//while($row = $recordSet->fetchRow())

 			foreach($reader as $row)

 			{

 				$obj = $this->applyResultMap($row);

 				$key = TPropertyAccess::get($obj, $keyProperty);

-				$value = is_null($valueProperty) ? $obj :

+				$value = ($valueProperty===null) ? $obj :

 							TPropertyAccess::get($obj, $valueProperty);

 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);

 				$this->raiseRowDelegate($delegate, $param);

@@ -324,7 +324,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 			{

 				$obj = $this->applyResultMap($row);

 				$key = TPropertyAccess::get($obj, $keyProperty);

-				$map[$key] = is_null($valueProperty) ? $obj :

+				$map[$key] = ($valueProperty===null) ? $obj :

 								TPropertyAccess::get($obj, $valueProperty);

 			}

 		}

@@ -426,7 +426,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 //		var_dump($command,$parameter);

 		$result = $command->execute();

 

-		if(is_null($generatedKey))

+		if($generatedKey===null)

 			$generatedKey = $this->getPostGeneratedSelectKey($connection, $parameter);

 

 		$this->executePostSelect($connection);

@@ -445,7 +445,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		if($this->_statement instanceof TSqlMapInsert)

 		{

 			$selectKey = $this->_statement->getSelectKey();

-			if(!is_null($selectKey) && !$selectKey->getIsAfter())

+			if(($selectKey!==null) && !$selectKey->getIsAfter())

 				return $this->executeSelectKey($connection, $parameter, $selectKey);

 		}

 	}

@@ -461,7 +461,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		if($this->_statement instanceof TSqlMapInsert)

 		{

 			$selectKey = $this->_statement->getSelectKey();

-			if(!is_null($selectKey) && $selectKey->getIsAfter())

+			if(($selectKey!==null) && $selectKey->getIsAfter())

 				return $this->executeSelectKey($connection, $parameter, $selectKey);

 		}

 	}

@@ -575,7 +575,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	 */

 	protected function fillResultClass($resultClass, $row, $resultObject)

 	{

-		if(is_null($resultObject))

+		if($resultObject===null)

 		{

 			$registry = $this->getManager()->getTypeHandlers();

 			$resultObject = $this->_statement->createInstanceOfResultClass($registry,$row);

@@ -643,7 +643,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		$registry = $this->getManager()->getTypeHandlers();

 		$resultMap = $resultMap->resolveSubMap($registry,$row);

 

-		if(is_null($resultObject))

+		if($resultObject===null)

 			$resultObject = $resultMap->createInstanceOfResult($registry);

 

 		if(is_object($resultObject))

@@ -734,10 +734,10 @@ class TMappedStatement extends TComponent implements IMappedStatement
 	 */

 	protected function fillDefaultResultMap($resultMap, $row, $resultObject)

 	{

-		if(is_null($resultObject))

+		if($resultObject===null)

 			$resultObject='';

 

-		if(!is_null($resultMap))

+		if($resultMap!==null)

 			$result = $this->fillArrayResultMap($resultMap, $row, $resultObject);

 		else

 			$result = $row;

@@ -762,8 +762,8 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		$registry=$this->getManager()->getTypeHandlers();

 		foreach($resultMap->getColumns() as $column)

 		{

-			if(is_null($column->getType())

-				&& !is_null($resultObject) && !is_object($resultObject))

+			if(($column->getType()===null)

+				&& ($resultObject!==null) && !is_object($resultObject))

 			$column->setType(gettype($resultObject));

 			$result[$column->getProperty()] = $column->getPropertyValue($registry,$row);

 		}

@@ -800,7 +800,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 		{

 			$resultObject = $property->getPropertyValue($registry,$row);

 		}

-		else if(strlen($select) == 0 && is_null($nested))

+		else if(strlen($select) == 0 && ($nested===null))

 		{

 			$value = $property->getPropertyValue($registry,$row);

 

@@ -810,7 +810,7 @@ class TMappedStatement extends TComponent implements IMappedStatement
 			else

 				$resultObject = $value;

 		}

-		else if(!is_null($nested))

+		else if($nested!==null)

 		{

 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))

 			{

@@ -995,8 +995,8 @@ class TSqlMapObjectCollectionTree
 	 */

 	public function add($parent, $node, $object='')

 	{

-		if(isset($this->_entries[$parent]) && !is_null($this->_entries[$parent])

-			&& isset($this->_entries[$node]) && !is_null($this->_entries[$node]))

+		if(isset($this->_entries[$parent]) && ($this->_entries[$parent]!==null)

+			&& isset($this->_entries[$node]) && ($this->_entries[$node]!==null))

 		{

 			$this->_entries[$node] = $object;

 			return;

diff --git a/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php b/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php
index 44603408..a2a9df03 100644
--- a/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php
+++ b/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data.SqlMap.Statements

@@ -35,7 +35,7 @@ class TPreparedStatementFactory
 	{

 		$this->_preparedStatement = new TPreparedStatement();

 		$this->_preparedStatement->setPreparedSql($this->_commandText);

-		if(!is_null($this->_statement->parameterMap()))

+		if($this->_statement->parameterMap()!==null)

 			$this->createParametersForTextCommand();

 		return $this->_preparedStatement;

 	}

diff --git a/framework/Data/TDataSourceConfig.php b/framework/Data/TDataSourceConfig.php
index 9a81ff8c..53a5ef22 100644
--- a/framework/Data/TDataSourceConfig.php
+++ b/framework/Data/TDataSourceConfig.php
@@ -1,10 +1,10 @@
-<?php
+<?php

 /**

  * TDataSourceConfig class file.

  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Data

@@ -131,7 +131,7 @@ class TDataSourceConfig extends TModule
 	 */

 	public function setConnectionClass($value)

 	{

-		if(!is_null($this->_conn))

+		if($this->_conn!==null)

 			throw new TConfigurationException('datasource_dbconnection_exists', $value);

 		$this->_connClass=$value;

 	}

@@ -153,4 +153,4 @@ class TDataSourceConfig extends TModule
 			throw new TConfigurationException('datasource_dbconnection_invalid',$id);

 	}

 }

-
+

diff --git a/framework/I18N/TDateFormat.php b/framework/I18N/TDateFormat.php
index 914131bd..2a4ef8bc 100644
--- a/framework/I18N/TDateFormat.php
+++ b/framework/I18N/TDateFormat.php
@@ -119,7 +119,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 

 		//no presets found, use the string as the pattern

 		//and let the DateFormat handle it.

-		if(is_null($pattern))

+		if($pattern===null)

 			$pattern = $string;

 		if (!is_array($pattern) && strlen($pattern) == 0)

 			$pattern = null;

@@ -226,7 +226,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 		$app = $this->getApplication()->getGlobalization();

 

 		//initialized the default class wide formatter

-		if(is_null(self::$formatter))

+		if(self::$formatter===null)

 			self::$formatter = new DateFormat($app->getCulture());

 

 		$culture = $this->getCulture();

diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index 1d158ce9..fd16f7bd 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.I18N

@@ -225,7 +225,7 @@ class TGlobalization extends TModule
 	 */

 	public function getCultureVariants($culture=null)

 	{

-		if(is_null($culture)) $culture = $this->getCulture();

+		if($culture===null) $culture = $this->getCulture();

 		$variants = explode('_', $culture);

 		$result = array();

 		for(; count($variants) > 0; array_pop($variants))

diff --git a/framework/I18N/TI18NControl.php b/framework/I18N/TI18NControl.php
index ac3246fe..c04477e0 100644
--- a/framework/I18N/TI18NControl.php
+++ b/framework/I18N/TI18NControl.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.I18N

@@ -49,11 +49,11 @@ class TI18NControl extends TControl
 

 		//fall back to globalization charset

 		if(empty($charset))

-			$charset = is_null($app) ? '' : $app->getCharset();

+			$charset = ($app===null) ? '' : $app->getCharset();

 

 		//fall back to default charset

 		if(empty($charset))

-			$charset = (is_null($app)) ? 'UTF-8' : $app->getDefaultCharset();

+			$charset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();

 

 		return $charset;

 	}

diff --git a/framework/I18N/TNumberFormat.php b/framework/I18N/TNumberFormat.php
index 62b43243..1f33e6e4 100644
--- a/framework/I18N/TNumberFormat.php
+++ b/framework/I18N/TNumberFormat.php
@@ -220,7 +220,7 @@ class TNumberFormat extends TI18NControl implements IDataRenderer
 

 		$app = $this->getApplication()->getGlobalization();

 		//initialized the default class wide formatter

-		if(is_null(self::$formatter))

+		if(self::$formatter===null)

 			self::$formatter = new NumberFormat($app->getCulture());

 

 		$pattern = strlen($this->getPattern()) > 0

diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 2f1e0633..a444aeba 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.I18N

@@ -236,7 +236,7 @@ class TTranslate extends TI18NControl
 		$app = $this->getApplication()->getGlobalization();

 

 		//no translation handler provided

-		if(is_null($config = $app->getTranslationConfiguration()))

+		if(($config = $app->getTranslationConfiguration())===null)

 			return strtr($text, $subs);

 

 		$catalogue = $this->getCatalogue();

diff --git a/framework/I18N/core/MessageSource_MySQL.php b/framework/I18N/core/MessageSource_MySQL.php
index 317d53e2..080b89bc 100644
--- a/framework/I18N/core/MessageSource_MySQL.php
+++ b/framework/I18N/core/MessageSource_MySQL.php
@@ -87,7 +87,7 @@ class MessageSource_MySQL extends MessageSource
 	{

 		/*static $conn;

 

-		if(!is_null($conn))

+		if($conn!==null)

 			return $conn;

 		*/

 		$dsninfo = $this->dns;

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 81087ef7..e3373855 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -1,587 +1,587 @@
-<?php
-/**
- * THttpResponse class
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
- * @license http://www.pradosoft.com/license/
- * @version $Id$
- * @package System.Web
- */
-
-/**
- * Includes the THttpResponse adapter.
- */
-Prado::using('System.Web.THttpResponseAdapter');
-
-/**
- * THttpResponse class
- *
- * THttpResponse implements the mechanism for sending output to client users.
- *
- * To output a string to client, use {@link write()}. By default, the output is
- * buffered until {@link flush()} is called or the application ends. The output in
- * the buffer can also be cleaned by {@link clear()}. To disable output buffering,
- * set BufferOutput property to false.
- *
- * To send cookies to client, use {@link getCookies()}.
- * To redirect client browser to a new URL, use {@link redirect()}.
- * To send a file to client, use {@link writeFile()}.
- *
- * By default, THttpResponse is registered with {@link TApplication} as the
- * response module. It can be accessed via {@link TApplication::getResponse()}.
- *
- * THttpResponse may be configured in application configuration file as follows
- *
- * <module id="response" class="System.Web.THttpResponse" CacheExpire="20" CacheControl="nocache" BufferOutput="true" />
- *
- * where {@link getCacheExpire CacheExpire}, {@link getCacheControl CacheControl}
- * and {@link getBufferOutput BufferOutput} are optional properties of THttpResponse.
- *
- * THttpResponse sends charset header if either {@link setCharset() Charset}
- * or {@link TGlobalization::setCharset() TGlobalization.Charset} is set.
- *
- * Since 3.1.2, HTTP status code can be set with the {@link setStatusCode StatusCode} property.
- * 
- * Note: Some HTTP Status codes can require additional header or body information. So, if you use {@link setStatusCode StatusCode}
- * in your application, be sure to add theses informations.
- * E.g : to make an http authentication :
- * <code>
- *  public function clickAuth ($sender, $param)
- *  {
- *     $response=$this->getResponse();
- *     $response->setStatusCode(401);
- *     $response->appendHeader('WWW-Authenticate: Basic realm="Test"');
- *  } 
- * </code>
- *    
- * This event handler will sent the 401 status code (Unauthorized) to the browser, with the WWW-Authenticate header field. This
- * will force the browser to ask for a username and a password.
- *  
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id$
- * @package System.Web
- * @since 3.0
- */
-class THttpResponse extends TModule implements ITextWriter
-{
-	/**
-	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
-	 */
-	private static $HTTP_STATUS_CODES = array(
-		100 => 'Continue', 101 => 'Switching Protocols', 
-		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 
-		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', 
-		400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', 
-		500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported'
-	);
-
-	/**
-	 * @var boolean whether to buffer output
-	 */
-	private $_bufferOutput=true;
-	/**
-	 * @var boolean if the application is initialized
-	 */
-	private $_initialized=false;
-	/**
-	 * @var THttpCookieCollection list of cookies to return
-	 */
-	private $_cookies=null;
-	/**
-	 * @var integer response status code
-	 */
-	private $_status=200;
-	/**
-	 * @var string reason correspond to status code
-	 */
-	private $_reason='OK';
-	/**
-	 * @var string HTML writer type
-	 */
-	private $_htmlWriterType='System.Web.UI.THtmlWriter';
-	/**
-	 * @var string content type
-	 */
-	private $_contentType=null;
-	/**
-	 * @var string character set, e.g. UTF-8
-	 */
-	private $_charset='';
-	/**
-	 * @var THttpResponseAdapter adapter.
-	 */
-	private $_adapter;
-
-	/**
-	 * Destructor.
-	 * Flushes any existing content in buffer.
-	 */
-	public function __destruct()
-	{
-		//if($this->_bufferOutput)
-		//	@ob_end_flush();
-	}
-
-	/**
-	 * @param THttpResponseAdapter response adapter
-	 */
-	public function setAdapter(THttpResponseAdapter $adapter)
-	{
-		$this->_adapter=$adapter;
-	}
-
-	/**
-	 * @return THttpResponseAdapter response adapter, null if not exist.
-	 */
-	public function getAdapter()
-	{
-		return $this->_adapter;
-	}
-
-	/**
-	 * @return boolean true if adapter exists, false otherwise.
-	 */
-	public function getHasAdapter()
-	{
-		return !is_null($this->_adapter);
-	}
-
-	/**
-	 * Initializes the module.
-	 * This method is required by IModule and is invoked by application.
-	 * It starts output buffer if it is enabled.
-	 * @param TXmlElement module configuration
-	 */
-	public function init($config)
-	{
-		if($this->_bufferOutput)
-			ob_start();
-		$this->_initialized=true;
-		$this->getApplication()->setResponse($this);
-	}
-
-	/**
-	 * @return integer time-to-live for cached session pages in minutes, this has no effect for nocache limiter. Defaults to 180.
-	 */
-	public function getCacheExpire()
-	{
-		return session_cache_expire();
-	}
-
-	/**
-	 * @param integer time-to-live for cached session pages in minutes, this has no effect for nocache limiter.
-	 */
-	public function setCacheExpire($value)
-	{
-		session_cache_expire(TPropertyValue::ensureInteger($value));
-	}
-
-	/**
-	 * @return string cache control method to use for session pages
-	 */
-	public function getCacheControl()
-	{
-		return session_cache_limiter();
-	}
-
-	/**
-	 * @param string cache control method to use for session pages. Valid values
-	 *               include none/nocache/private/private_no_expire/public
-	 */
-	public function setCacheControl($value)
-	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
-	}
-
-	/**
-	 * @return string content type, default is text/html
-	 */
-	public function setContentType($type)
-	{
-		$this->_contentType = $type;
-	}
-
-	/**
-	 * @return string current content type
-	 */
-	public function getContentType()
-	{
-		return $this->_contentType;
-	}
-
-	/**
-	 * @return string output charset.
-	 */
-	public function getCharset()
-	{
-		return $this->_charset;
-	}
-
-	/**
-	 * @param string output charset.
-	 */
-	public function setCharset($charset)
-	{
-		$this->_charset = $charset;
-	}
-
-	/**
-	 * @return boolean whether to enable output buffer
-	 */
-	public function getBufferOutput()
-	{
-		return $this->_bufferOutput;
-	}
-
-	/**
-	 * @param boolean whether to enable output buffer
-	 * @throws TInvalidOperationException if session is started already
-	 */
-	public function setBufferOutput($value)
-	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
-		else
-			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
-	}
-
-	/**
-	 * @return integer HTTP status code, defaults to 200
-	 */
-	public function getStatusCode()
-	{
-		return $this->_status;
-	}
-
-	/**
-	 * Set the HTTP status code for the response.
-	 * The code and its reason will be sent to client using the currently requested http protocol version (see {@link THttpRequest::getHttpProtocolVersion})
-	 * Keep in mind that HTTP/1.0 clients might not understand all status codes from HTTP/1.1
-	 * 
-	 * @param integer HTTP status code
-	 * @param string HTTP status reason, defaults to standard HTTP reasons
-	 */
-	public function setStatusCode($status, $reason=null)
-	{
-		$status=TPropertyValue::ensureInteger($status);
-		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason===null || $reason==='') {
-				throw new TInvalidDataValueException("response_status_reason_missing");
-			}
-			$reason=TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {
-				throw new TInvalidDataValueException("response_status_reason_barchars");
-			}
-			$this->_reason=$reason;
-		}
-		$this->_status=$status;
-	}
-
-	/**
-	 * @param string HTTP status reason
-	 */
-	public function getStatusReason() {
-		return $this->_reason;
-	}
-
-	/**
-	 * @return THttpCookieCollection list of output cookies
-	 */
-	public function getCookies()
-	{
-		if($this->_cookies===null)
-			$this->_cookies=new THttpCookieCollection($this);
-		return $this->_cookies;
-	}
-
-	/**
-	 * Outputs a string.
-	 * It may not be sent back to user immediately if output buffer is enabled.
-	 * @param string string to be output
-	 */
-	public function write($str)
-	{
-		echo $str;
-	}
-
-	/**
-	 * Sends a file back to user.
-	 * Make sure not to output anything else after calling this method.
-	 * @param string file name
-	 * @param string content to be set. If null, the content will be read from the server file pointed to by $fileName.
-	 * @param string mime type of the content.
-	 * @param array list of headers to be sent. Each array element represents a header string (e.g. 'Content-Type: text/plain').
-	 * @throws TInvalidDataValueException if the file cannot be found
-	 */
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null)
-	{
-		static $defaultMimeTypes=array(
-			'css'=>'text/css',
-			'gif'=>'image/gif',
-			'jpg'=>'image/jpeg',
-			'jpeg'=>'image/jpeg',
-			'htm'=>'text/html',
-			'html'=>'text/html',
-			'js'=>'javascript/js',
-			'pdf'=>'application/pdf',
-			'xls'=>'application/vnd.ms-excel',
-		);
-
-		if($mimeType===null)
-		{
-			$mimeType='text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
-			{
-				$ext=substr($ext,1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType=$defaultMimeTypes[$ext];
-			}
-		}
-		$fn=basename($fileName);
-		$this->sendHttpHeader();
-		if(is_array($headers))
-		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
-		{
-			header('Pragma: public');
-			header('Expires: 0');
-			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		}
-		header("Content-type: $mimeType");
-		header('Content-Length: '.($content===null?filesize($fileName):strlen($content)));
-		header("Content-Disposition: attachment; filename=\"$fn\"");
-		header('Content-Transfer-Encoding: binary');
-		if($content===null)
-			readfile($fileName);
-		else
-			echo $content;
-	}
-
-	/**
-	 * Redirects the browser to the specified URL.
-	 * The current application will be terminated after this method is invoked.
-	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of
-	 * the current request will be inserted at the beginning.
-	 */
-	public function redirect($url)
-	{
-		if($this->getHasAdapter())
-			$this->_adapter->httpRedirect($url);
-		else
-			$this->httpRedirect($url);
-	}
-
-	/**
-	 * Redirect the browser to another URL and exists the current application.
-	 * This method is used internally. Please use {@link redirect} instead.
-	 *
-	 * @since 3.1.5
-	 * You can set the set {@link setStatusCode StatusCode} to a value between 300 and 399 before
-	 * calling this function to change the type of redirection.
-	 * If not specified, StatusCode will be 302 (Found) by default
-	 * 
-	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of
-	 * the current request will be inserted at the beginning.
-	 */
-	public function httpRedirect($url)
-	{
-		if(!$this->getApplication()->getRequestCompleted())
-			$this->getApplication()->onEndRequest();
-		if($url[0]==='/')
-			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
-			// The status code has been modified to a valid redirection status, send it
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
-		else
-			header('Location: '.str_replace('&amp;','&',$url));
-		
-		exit();
-	}
-
-	/**
-	 * Reloads the current page.
-	 * The effect of this method call is the same as user pressing the
-	 * refresh button on his browser (without post data).
-	 **/
-	public function reload()
-	{
-		$this->redirect($this->getRequest()->getRequestUri());
-	}
-
-	/**
-	 * Flush the response contents and headers.
-	 */
-	public function flush()
-	{
-		if($this->getHasAdapter())
-			$this->_adapter->flushContent();
-		else
-			$this->flushContent();
-	}
-
-	/**
-	 * Outputs the buffered content, sends content-type and charset header.
-	 * This method is used internally. Please use {@link flush} instead.
-	 */
-	public function flushContent()
-	{
-		Prado::trace("Flushing output",'System.Web.THttpResponse');
-		$this->sendHttpHeader();
-		$this->sendContentTypeHeader();
-		if($this->_bufferOutput)
-			ob_flush();
-	}
-	
-	/**
-	 * Send the HTTP header with the status code (defaults to 200) and status reason (defaults to OK)
-	 */
-	protected function sendHttpHeader ()
-	{
-		if (($version=$this->getRequest()->getHttpProtocolVersion())==='')
-			header (' ', true, $this->_status);
-		else
-			header($version.' '.$this->_status.' '.$this->_reason, true, $this->_status);
-	}
-
-	/**
-	 * Sends content type header if charset is not empty.
-	 */
-	protected function sendContentTypeHeader()
-	{
-		$charset=$this->getCharset();
-		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
-			$charset=$globalization->getCharset();
-		if($charset!=='')
-		{
-			$contentType=$this->_contentType===null?'text/html':$this->_contentType;
-			$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
-		}
-		else if($this->_contentType!==null)
-			$this->appendHeader('Content-Type: '.$this->_contentType.';charset=UTF-8');
-	}
-
-	/**
-	 * Returns the content in the output buffer.
-	 * The buffer will NOT be cleared after calling this method.
-	 * Use {@link clear()} is you want to clear the buffer.
-	 * @return string output that is in the buffer.
-	 */
-	public function getContents()
-	{
-		Prado::trace("Retrieving output",'System.Web.THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
-	}
-
-	/**
-	 * Clears any existing buffered content.
-	 */
-	public function clear()
-	{
-		if($this->_bufferOutput)
-			ob_clean();
-		Prado::trace("Clearing output",'System.Web.THttpResponse');
-	}
-
-	/**
-	 * Sends a header.
-	 * @param string header
-	 */
-	public function appendHeader($value)
-	{
-		Prado::trace("Sending header '$value'",'System.Web.THttpResponse');
-		header($value);
-	}
-
-	/**
-	 * Writes a log message into error log.
-	 * This method is simple wrapper of PHP function error_log.
-	 * @param string The error message that should be logged
-	 * @param integer where the error should go
-	 * @param string The destination. Its meaning depends on the message parameter as described above
-	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
-	 * @see http://us2.php.net/manual/en/function.error-log.php
-	 */
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
-	{
-		error_log($message,$messageType,$destination,$extraHeaders);
-	}
-
-	/**
-	 * Sends a cookie.
-	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
-	 * @param THttpCookie cook to be sent
-	 */
-	public function addCookie($cookie)
-	{
-		$request=$this->getRequest();
-		if($request->getEnableCookieValidation())
-		{
-			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
-			setcookie($cookie->getName(),$value,$cookie->getExpire(),$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());
-		}
-		else
-			setcookie($cookie->getName(),$cookie->getValue(),$cookie->getExpire(),$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());
-	}
-
-	/**
-	 * Deletes a cookie.
-	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.
-	 * @param THttpCookie cook to be deleted
-	 */
-	public function removeCookie($cookie)
-	{
-		setcookie($cookie->getName(),null,0,$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());
-	}
-
-	/**
-	 * @return string the type of HTML writer to be used, defaults to THtmlWriter
-	 */
-	public function getHtmlWriterType()
-	{
-		return $this->_htmlWriterType;
-	}
-
-	/**
-	 * @param string the type of HTML writer to be used, may be the class name or the namespace
-	 */
-	public function setHtmlWriterType($value)
-	{
-		$this->_htmlWriterType=$value;
-	}
-
-	/**
-	 * Creates a new instance of HTML writer.
-	 * If the type of the HTML writer is not supplied, {@link getHtmlWriterType HtmlWriterType} will be assumed.
-	 * @param string type of the HTML writer to be created. If null, {@link getHtmlWriterType HtmlWriterType} will be assumed.
-	 */
-	public function createHtmlWriter($type=null)
-	{
-		if($type===null)
-			$type=$this->getHtmlWriterType();
-		if($this->getHasAdapter())
-			return $this->_adapter->createNewHtmlWriter($type, $this);
-		else
-		 	return $this->createNewHtmlWriter($type, $this);
-	}
-
-	/**
-	 * Create a new html writer instance.
-	 * This method is used internally. Please use {@link createHtmlWriter} instead.
-	 * @param string type of HTML writer to be created.
-	 * @param ITextWriter text writer holding the contents.
-	 */
-	public function createNewHtmlWriter($type, $writer)
-	{
-		return Prado::createComponent($type, $writer);
-	}
-}
-
+<?php

+/**

+ * THttpResponse class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2005-2008 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Id$

+ * @package System.Web

+ */

+

+/**

+ * Includes the THttpResponse adapter.

+ */

+Prado::using('System.Web.THttpResponseAdapter');

+

+/**

+ * THttpResponse class

+ *

+ * THttpResponse implements the mechanism for sending output to client users.

+ *

+ * To output a string to client, use {@link write()}. By default, the output is

+ * buffered until {@link flush()} is called or the application ends. The output in

+ * the buffer can also be cleaned by {@link clear()}. To disable output buffering,

+ * set BufferOutput property to false.

+ *

+ * To send cookies to client, use {@link getCookies()}.

+ * To redirect client browser to a new URL, use {@link redirect()}.

+ * To send a file to client, use {@link writeFile()}.

+ *

+ * By default, THttpResponse is registered with {@link TApplication} as the

+ * response module. It can be accessed via {@link TApplication::getResponse()}.

+ *

+ * THttpResponse may be configured in application configuration file as follows

+ *

+ * <module id="response" class="System.Web.THttpResponse" CacheExpire="20" CacheControl="nocache" BufferOutput="true" />

+ *

+ * where {@link getCacheExpire CacheExpire}, {@link getCacheControl CacheControl}

+ * and {@link getBufferOutput BufferOutput} are optional properties of THttpResponse.

+ *

+ * THttpResponse sends charset header if either {@link setCharset() Charset}

+ * or {@link TGlobalization::setCharset() TGlobalization.Charset} is set.

+ *

+ * Since 3.1.2, HTTP status code can be set with the {@link setStatusCode StatusCode} property.

+ * 

+ * Note: Some HTTP Status codes can require additional header or body information. So, if you use {@link setStatusCode StatusCode}

+ * in your application, be sure to add theses informations.

+ * E.g : to make an http authentication :

+ * <code>

+ *  public function clickAuth ($sender, $param)

+ *  {

+ *     $response=$this->getResponse();

+ *     $response->setStatusCode(401);

+ *     $response->appendHeader('WWW-Authenticate: Basic realm="Test"');

+ *  } 

+ * </code>

+ *    

+ * This event handler will sent the 401 status code (Unauthorized) to the browser, with the WWW-Authenticate header field. This

+ * will force the browser to ask for a username and a password.

+ *  

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @version $Id$

+ * @package System.Web

+ * @since 3.0

+ */

+class THttpResponse extends TModule implements ITextWriter

+{

+	/**

+	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}

+	 */

+	private static $HTTP_STATUS_CODES = array(

+		100 => 'Continue', 101 => 'Switching Protocols', 

+		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 

+		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', 

+		400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', 

+		500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported'

+	);

+

+	/**

+	 * @var boolean whether to buffer output

+	 */

+	private $_bufferOutput=true;

+	/**

+	 * @var boolean if the application is initialized

+	 */

+	private $_initialized=false;

+	/**

+	 * @var THttpCookieCollection list of cookies to return

+	 */

+	private $_cookies=null;

+	/**

+	 * @var integer response status code

+	 */

+	private $_status=200;

+	/**

+	 * @var string reason correspond to status code

+	 */

+	private $_reason='OK';

+	/**

+	 * @var string HTML writer type

+	 */

+	private $_htmlWriterType='System.Web.UI.THtmlWriter';

+	/**

+	 * @var string content type

+	 */

+	private $_contentType=null;

+	/**

+	 * @var string character set, e.g. UTF-8

+	 */

+	private $_charset='';

+	/**

+	 * @var THttpResponseAdapter adapter.

+	 */

+	private $_adapter;

+

+	/**

+	 * Destructor.

+	 * Flushes any existing content in buffer.

+	 */

+	public function __destruct()

+	{

+		//if($this->_bufferOutput)

+		//	@ob_end_flush();

+	}

+

+	/**

+	 * @param THttpResponseAdapter response adapter

+	 */

+	public function setAdapter(THttpResponseAdapter $adapter)

+	{

+		$this->_adapter=$adapter;

+	}

+

+	/**

+	 * @return THttpResponseAdapter response adapter, null if not exist.

+	 */

+	public function getAdapter()

+	{

+		return $this->_adapter;

+	}

+

+	/**

+	 * @return boolean true if adapter exists, false otherwise.

+	 */

+	public function getHasAdapter()

+	{

+		return $this->_adapter!==null;

+	}

+

+	/**

+	 * Initializes the module.

+	 * This method is required by IModule and is invoked by application.

+	 * It starts output buffer if it is enabled.

+	 * @param TXmlElement module configuration

+	 */

+	public function init($config)

+	{

+		if($this->_bufferOutput)

+			ob_start();

+		$this->_initialized=true;

+		$this->getApplication()->setResponse($this);

+	}

+

+	/**

+	 * @return integer time-to-live for cached session pages in minutes, this has no effect for nocache limiter. Defaults to 180.

+	 */

+	public function getCacheExpire()

+	{

+		return session_cache_expire();

+	}

+

+	/**

+	 * @param integer time-to-live for cached session pages in minutes, this has no effect for nocache limiter.

+	 */

+	public function setCacheExpire($value)

+	{

+		session_cache_expire(TPropertyValue::ensureInteger($value));

+	}

+

+	/**

+	 * @return string cache control method to use for session pages

+	 */

+	public function getCacheControl()

+	{

+		return session_cache_limiter();

+	}

+

+	/**

+	 * @param string cache control method to use for session pages. Valid values

+	 *               include none/nocache/private/private_no_expire/public

+	 */

+	public function setCacheControl($value)

+	{

+		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));

+	}

+

+	/**

+	 * @return string content type, default is text/html

+	 */

+	public function setContentType($type)

+	{

+		$this->_contentType = $type;

+	}

+

+	/**

+	 * @return string current content type

+	 */

+	public function getContentType()

+	{

+		return $this->_contentType;

+	}

+

+	/**

+	 * @return string output charset.

+	 */

+	public function getCharset()

+	{

+		return $this->_charset;

+	}

+

+	/**

+	 * @param string output charset.

+	 */

+	public function setCharset($charset)

+	{

+		$this->_charset = $charset;

+	}

+

+	/**

+	 * @return boolean whether to enable output buffer

+	 */

+	public function getBufferOutput()

+	{

+		return $this->_bufferOutput;

+	}

+

+	/**

+	 * @param boolean whether to enable output buffer

+	 * @throws TInvalidOperationException if session is started already

+	 */

+	public function setBufferOutput($value)

+	{

+		if($this->_initialized)

+			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');

+		else

+			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);

+	}

+

+	/**

+	 * @return integer HTTP status code, defaults to 200

+	 */

+	public function getStatusCode()

+	{

+		return $this->_status;

+	}

+

+	/**

+	 * Set the HTTP status code for the response.

+	 * The code and its reason will be sent to client using the currently requested http protocol version (see {@link THttpRequest::getHttpProtocolVersion})

+	 * Keep in mind that HTTP/1.0 clients might not understand all status codes from HTTP/1.1

+	 * 

+	 * @param integer HTTP status code

+	 * @param string HTTP status reason, defaults to standard HTTP reasons

+	 */

+	public function setStatusCode($status, $reason=null)

+	{

+		$status=TPropertyValue::ensureInteger($status);

+		if(isset(self::$HTTP_STATUS_CODES[$status])) {

+			$this->_reason=self::$HTTP_STATUS_CODES[$status];

+		}else{

+			if($reason===null || $reason==='') {

+				throw new TInvalidDataValueException("response_status_reason_missing");

+			}

+			$reason=TPropertyValue::ensureString($reason);

+			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {

+				throw new TInvalidDataValueException("response_status_reason_barchars");

+			}

+			$this->_reason=$reason;

+		}

+		$this->_status=$status;

+	}

+

+	/**

+	 * @param string HTTP status reason

+	 */

+	public function getStatusReason() {

+		return $this->_reason;

+	}

+

+	/**

+	 * @return THttpCookieCollection list of output cookies

+	 */

+	public function getCookies()

+	{

+		if($this->_cookies===null)

+			$this->_cookies=new THttpCookieCollection($this);

+		return $this->_cookies;

+	}

+

+	/**

+	 * Outputs a string.

+	 * It may not be sent back to user immediately if output buffer is enabled.

+	 * @param string string to be output

+	 */

+	public function write($str)

+	{

+		echo $str;

+	}

+

+	/**

+	 * Sends a file back to user.

+	 * Make sure not to output anything else after calling this method.

+	 * @param string file name

+	 * @param string content to be set. If null, the content will be read from the server file pointed to by $fileName.

+	 * @param string mime type of the content.

+	 * @param array list of headers to be sent. Each array element represents a header string (e.g. 'Content-Type: text/plain').

+	 * @throws TInvalidDataValueException if the file cannot be found

+	 */

+	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null)

+	{

+		static $defaultMimeTypes=array(

+			'css'=>'text/css',

+			'gif'=>'image/gif',

+			'jpg'=>'image/jpeg',

+			'jpeg'=>'image/jpeg',

+			'htm'=>'text/html',

+			'html'=>'text/html',

+			'js'=>'javascript/js',

+			'pdf'=>'application/pdf',

+			'xls'=>'application/vnd.ms-excel',

+		);

+

+		if($mimeType===null)

+		{

+			$mimeType='text/plain';

+			if(function_exists('mime_content_type'))

+				$mimeType=mime_content_type($fileName);

+			else if(($ext=strrchr($fileName,'.'))!==false)

+			{

+				$ext=substr($ext,1);

+				if(isset($defaultMimeTypes[$ext]))

+					$mimeType=$defaultMimeTypes[$ext];

+			}

+		}

+		$fn=basename($fileName);

+		$this->sendHttpHeader();

+		if(is_array($headers))

+		{

+			foreach($headers as $h)

+				header($h);

+		}

+		else

+		{

+			header('Pragma: public');

+			header('Expires: 0');

+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');

+		}

+		header("Content-type: $mimeType");

+		header('Content-Length: '.($content===null?filesize($fileName):strlen($content)));

+		header("Content-Disposition: attachment; filename=\"$fn\"");

+		header('Content-Transfer-Encoding: binary');

+		if($content===null)

+			readfile($fileName);

+		else

+			echo $content;

+	}

+

+	/**

+	 * Redirects the browser to the specified URL.

+	 * The current application will be terminated after this method is invoked.

+	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of

+	 * the current request will be inserted at the beginning.

+	 */

+	public function redirect($url)

+	{

+		if($this->getHasAdapter())

+			$this->_adapter->httpRedirect($url);

+		else

+			$this->httpRedirect($url);

+	}

+

+	/**

+	 * Redirect the browser to another URL and exists the current application.

+	 * This method is used internally. Please use {@link redirect} instead.

+	 *

+	 * @since 3.1.5

+	 * You can set the set {@link setStatusCode StatusCode} to a value between 300 and 399 before

+	 * calling this function to change the type of redirection.

+	 * If not specified, StatusCode will be 302 (Found) by default

+	 * 

+	 * @param string URL to be redirected to. If the URL is a relative one, the base URL of

+	 * the current request will be inserted at the beginning.

+	 */

+	public function httpRedirect($url)

+	{

+		if(!$this->getApplication()->getRequestCompleted())

+			$this->getApplication()->onEndRequest();

+		if($url[0]==='/')

+			$url=$this->getRequest()->getBaseUrl().$url;

+		if ($this->_status >= 300 && $this->_status < 400)

+			// The status code has been modified to a valid redirection status, send it

+			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);

+		else

+			header('Location: '.str_replace('&amp;','&',$url));

+		

+		exit();

+	}

+

+	/**

+	 * Reloads the current page.

+	 * The effect of this method call is the same as user pressing the

+	 * refresh button on his browser (without post data).

+	 **/

+	public function reload()

+	{

+		$this->redirect($this->getRequest()->getRequestUri());

+	}

+

+	/**

+	 * Flush the response contents and headers.

+	 */

+	public function flush()

+	{

+		if($this->getHasAdapter())

+			$this->_adapter->flushContent();

+		else

+			$this->flushContent();

+	}

+

+	/**

+	 * Outputs the buffered content, sends content-type and charset header.

+	 * This method is used internally. Please use {@link flush} instead.

+	 */

+	public function flushContent()

+	{

+		Prado::trace("Flushing output",'System.Web.THttpResponse');

+		$this->sendHttpHeader();

+		$this->sendContentTypeHeader();

+		if($this->_bufferOutput)

+			ob_flush();

+	}

+	

+	/**

+	 * Send the HTTP header with the status code (defaults to 200) and status reason (defaults to OK)

+	 */

+	protected function sendHttpHeader ()

+	{

+		if (($version=$this->getRequest()->getHttpProtocolVersion())==='')

+			header (' ', true, $this->_status);

+		else

+			header($version.' '.$this->_status.' '.$this->_reason, true, $this->_status);

+	}

+

+	/**

+	 * Sends content type header if charset is not empty.

+	 */

+	protected function sendContentTypeHeader()

+	{

+		$charset=$this->getCharset();

+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)

+			$charset=$globalization->getCharset();

+		if($charset!=='')

+		{

+			$contentType=$this->_contentType===null?'text/html':$this->_contentType;

+			$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);

+		}

+		else if($this->_contentType!==null)

+			$this->appendHeader('Content-Type: '.$this->_contentType.';charset=UTF-8');

+	}

+

+	/**

+	 * Returns the content in the output buffer.

+	 * The buffer will NOT be cleared after calling this method.

+	 * Use {@link clear()} is you want to clear the buffer.

+	 * @return string output that is in the buffer.

+	 */

+	public function getContents()

+	{

+		Prado::trace("Retrieving output",'System.Web.THttpResponse');

+		return $this->_bufferOutput?ob_get_contents():'';

+	}

+

+	/**

+	 * Clears any existing buffered content.

+	 */

+	public function clear()

+	{

+		if($this->_bufferOutput)

+			ob_clean();

+		Prado::trace("Clearing output",'System.Web.THttpResponse');

+	}

+

+	/**

+	 * Sends a header.

+	 * @param string header

+	 */

+	public function appendHeader($value)

+	{

+		Prado::trace("Sending header '$value'",'System.Web.THttpResponse');

+		header($value);

+	}

+

+	/**

+	 * Writes a log message into error log.

+	 * This method is simple wrapper of PHP function error_log.

+	 * @param string The error message that should be logged

+	 * @param integer where the error should go

+	 * @param string The destination. Its meaning depends on the message parameter as described above

+	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.

+	 * @see http://us2.php.net/manual/en/function.error-log.php

+	 */

+	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')

+	{

+		error_log($message,$messageType,$destination,$extraHeaders);

+	}

+

+	/**

+	 * Sends a cookie.

+	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.

+	 * @param THttpCookie cook to be sent

+	 */

+	public function addCookie($cookie)

+	{

+		$request=$this->getRequest();

+		if($request->getEnableCookieValidation())

+		{

+			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());

+			setcookie($cookie->getName(),$value,$cookie->getExpire(),$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());

+		}

+		else

+			setcookie($cookie->getName(),$cookie->getValue(),$cookie->getExpire(),$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());

+	}

+

+	/**

+	 * Deletes a cookie.

+	 * Do not call this method directly. Operate with the result of {@link getCookies} instead.

+	 * @param THttpCookie cook to be deleted

+	 */

+	public function removeCookie($cookie)

+	{

+		setcookie($cookie->getName(),null,0,$cookie->getPath(),$cookie->getDomain(),$cookie->getSecure());

+	}

+

+	/**

+	 * @return string the type of HTML writer to be used, defaults to THtmlWriter

+	 */

+	public function getHtmlWriterType()

+	{

+		return $this->_htmlWriterType;

+	}

+

+	/**

+	 * @param string the type of HTML writer to be used, may be the class name or the namespace

+	 */

+	public function setHtmlWriterType($value)

+	{

+		$this->_htmlWriterType=$value;

+	}

+

+	/**

+	 * Creates a new instance of HTML writer.

+	 * If the type of the HTML writer is not supplied, {@link getHtmlWriterType HtmlWriterType} will be assumed.

+	 * @param string type of the HTML writer to be created. If null, {@link getHtmlWriterType HtmlWriterType} will be assumed.

+	 */

+	public function createHtmlWriter($type=null)

+	{

+		if($type===null)

+			$type=$this->getHtmlWriterType();

+		if($this->getHasAdapter())

+			return $this->_adapter->createNewHtmlWriter($type, $this);

+		else

+		 	return $this->createNewHtmlWriter($type, $this);

+	}

+

+	/**

+	 * Create a new html writer instance.

+	 * This method is used internally. Please use {@link createHtmlWriter} instead.

+	 * @param string type of HTML writer to be created.

+	 * @param ITextWriter text writer holding the contents.

+	 */

+	public function createNewHtmlWriter($type, $writer)

+	{

+		return Prado::createComponent($type, $writer);

+	}

+}

+

diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 34872f98..8c6ba430 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -64,7 +64,7 @@ class TActiveControlAdapter extends TControlAdapter
 	 */

 	protected function setBaseControlClass($type)

 	{

-		if(is_null($type))

+		if($type===null)

 		{

 			if($this->getControl() instanceof ICallbackEventHandler)

 				$this->_activeControlType = 'TBaseActiveCallbackControl';

@@ -117,7 +117,7 @@ class TActiveControlAdapter extends TControlAdapter
 	 */

 	public function getBaseActiveControl()

 	{

-		if(is_null($this->_baseActiveControl))

+		if($this->_baseActiveControl===null)

 		{

 			$type = $this->_activeControlType;

 			$this->_baseActiveControl = new $type($this->getControl());

@@ -161,7 +161,7 @@ class TActiveControlAdapter extends TControlAdapter
 	 */

 	public function saveState()

 	{

-		if(!is_null($this->_stateTracker)

+		if(($this->_stateTracker!==null)

 			&& $this->getControl()->getActiveControl()->canUpdateClientSide())

 		{

 			$this->_stateTracker->respondToChanges();

@@ -353,7 +353,7 @@ class TCallbackPageStateTracker
 	 */

 	protected function updateStyle($style)

 	{

-		if(!is_null($style['CssClass']))

+		if($style['CssClass']!==null)

 			$this->client()->setAttribute($this->_control, 'class', $style['CssClass']);

 		if(count($style['Style']) > 0)

 			$this->client()->setStyle($this->_control, $style['Style']);

@@ -487,9 +487,9 @@ class TStyleDiff extends TViewStateDiff
 	 */

 	protected function getCssClassDiff()

 	{

-		if(is_null($this->_old))

+		if($this->_old===null)

 		{

-			return !is_null($this->_new) && $this->_new->hasCssClass()

+			return ($this->_new!==null) && $this->_new->hasCssClass()

 						? $this->_new->getCssClass() : null;

 		}

 		else

@@ -515,13 +515,13 @@ class TStyleDiff extends TViewStateDiff
 	 */

 	public function getDifference()

 	{

-		if(is_null($this->_new))

+		if($this->_new===null)

 			return $this->_null;

 		else

 		{

 			$css = $this->getCssClassDiff();

 			$style = $this->getStyleDiff();

-			if(!is_null($css) || !is_null($style))

+			if(($css!==null) || ($style!==null))

 				return array('CssClass' => $css, 'Style' => $style);

 			else

 				$this->_null;

@@ -546,9 +546,9 @@ class TMapCollectionDiff extends TViewStateDiff
 	 */

 	public function getDifference()

 	{

-		if(is_null($this->_old))

+		if($this->_old===null)

 		{

-			return !is_null($this->_new) ? $this->_new->toArray() : $this->_null;

+			return ($this->_new!==null) ? $this->_new->toArray() : $this->_null;

 		}

 		else

 		{

diff --git a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
index 6c74aa7d..1f719bf6 100644
--- a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
+++ b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -236,6 +236,6 @@ class TActiveCustomValidatorClientSide extends TCallbackClientSide
 	public function getObserveChanges()

 	{

 		$changes = $this->getOption('ObserveChanges');

-		return is_null($changes) ? true : $changes;

+		return ($changes===null) ? true : $changes;

 	}

 }

diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index c52f0775..90eed970 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -1,369 +1,369 @@
-<?php
-/**
- * TActivePageAdapter, TCallbackErrorHandler and TInvalidCallbackException class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
- * @license http://www.pradosoft.com/license/
- * @version $Id$
- * @package System.Web.UI.ActiveControls
- */
-
-/**
- * Load callback response adapter class.
- */
-Prado::using('System.Web.UI.ActiveControls.TCallbackResponseAdapter');
-Prado::using('System.Web.UI.ActiveControls.TCallbackClientScript');
-Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
-
-/**
- * TActivePageAdapter class.
- *
- * Callback request handler.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id$
- * @package System.Web.UI.ActiveControls
- * @since 3.1
- */
-class TActivePageAdapter extends TControlAdapter
-{
-	/**
-	 * Callback response data header name.
-	 */
-	const CALLBACK_DATA_HEADER = 'X-PRADO-DATA';
-	/**
-	 * Callback response client-side action header name.
-	 */
-	const CALLBACK_ACTION_HEADER = 'X-PRADO-ACTIONS';
-	/**
-	 * Callback error header name.
-	 */
-	const CALLBACK_ERROR_HEADER = 'X-PRADO-ERROR';
-	/**
-	 * Callback page state header name.
-	 */
-	const CALLBACK_PAGESTATE_HEADER = 'X-PRADO-PAGESTATE';
-
-	/**
-	 * Callback redirect url header name.
-	 */
-	const CALLBACK_REDIRECT = 'X-PRADO-REDIRECT';
-
-	/**
-	 * @var ICallbackEventHandler callback event handler.
-	 */
-	private $_callbackEventTarget;
-	/**
-	 * @var mixed callback event parameter.
-	 */
-	private $_callbackEventParameter;
-	/**
-	 * @var TCallbackClientScript callback client script handler
-	 */
-	private $_callbackClient;
-
-	private $_controlsToRender=array();
-
-	/**
-	 * Constructor, trap errors and exception to let the callback response
-	 * handle them.
-	 */
-	public function __construct(TPage $control)
-	{
-		parent::__construct($control);
-
-		//TODO: can this be done later?
-		$response = $this->getApplication()->getResponse();
-		$response->setAdapter(new TCallbackResponseAdapter($response));
-
-		$this->trapCallbackErrorsExceptions();
-	}
-
-	/**
-	 * Process the callback request.
-	 * @param THtmlWriter html content writer.
-	 */
-	public function processCallbackEvent($writer)
-	{
-		Prado::trace("ActivePage raiseCallbackEvent()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		$this->raiseCallbackEvent();
-	}
-
-	/**
-	 * Register a control for defered render() call.
-	 * @param TControl control for defered rendering
-	 * @param THtmlWriter the renderer
-	 */
-	public function registerControlToRender($control,$writer)
-	{
-		$id = $control->getUniqueID();
-		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = array($control,$writer);
-	}
-
-	/**
-	 * Trap errors and exceptions to be handled by TCallbackErrorHandler.
-	 */
-	protected function trapCallbackErrorsExceptions()
-	{
-		$this->getApplication()->setErrorHandler(new TCallbackErrorHandler);
-	}
-
-	/**
-	 * Render the callback response.
-	 * @param THtmlWriter html content writer.
-	 */
-	public function renderCallbackResponse($writer)
-	{
-		Prado::trace("ActivePage renderCallbackResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)
-			$this->renderResponse($writer);
-		else
-			$this->redirect($url);
-	}
-
-	/**
-	 * Redirect url on the client-side using javascript.
-	 * @param string new url to load.
-	 */
-	protected function redirect($url)
-	{
-		Prado::trace("ActivePage redirect()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);
-		//$this->getResponse()->appendHeader(self::CALLBACK_REDIRECT.': '.$url);
-	}
-
-	/**
-	 * Renders the callback response by adding additional callback data and
-	 * javascript actions in the header and page state if required.
-	 * @param THtmlWriter html content writer.
-	 */
-	protected function renderResponse($writer)
-	{
-		Prado::trace("ActivePage renderResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');
-		//renders all the defered render() calls.
-		foreach($this->_controlsToRender as $rid => $forRender)
-			$forRender[0]->render($forRender[1]);
-
-		$response = $this->getResponse();
-
-		//send response data in header
-		if($response->getHasAdapter())
-		{
-			$responseData = $response->getAdapter()->getResponseData();
-			if(!is_null($responseData))
-			{
-				$data = TJavaScript::jsonEncode($responseData);
-
-				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
-				//$response->appendHeader(self::CALLBACK_DATA_HEADER.': '.$data);
-			}
-		}
-
-		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
-		{
-			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
-			{
-				$pagestate = $this->getPage()->getClientState();
-				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
-				//$response->appendHeader(self::CALLBACK_PAGESTATE_HEADER.': '.$pagestate);
-			}
-		}
-
-		//safari must receive at least 1 byte of data.
-		$writer->write(" ");
-
-		//output the end javascript
-		if($this->getPage()->getClientScript()->hasEndScripts())
-		{
-			$writer = $response->createHtmlWriter();
-			$this->getPage()->getClientScript()->renderEndScripts($writer);
-			$this->getPage()->getCallbackClient()->evaluateScript($writer);
-		}
-
-		//output the actions
-		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
-		$actions = TJavaScript::jsonEncode($executeJavascript);
-		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
-		//$response->appendHeader(self::CALLBACK_ACTION_HEADER.': '.$actions);
-	}
-
-	/**
-	 * Appends data or javascript code to the body content surrounded with delimiters
-	 */
-	private function appendContentPart($response, $delimiter, $data)
-	{
-		$content = $response->createHtmlWriter();
-		$content->getWriter()->setBoundary($delimiter);
-		$content->write($data);
-	}
-
-	/**
-	 * Trys to find the callback event handler and raise its callback event.
-	 * @throws TInvalidCallbackException if call back target is not found.
-	 * @throws TInvalidCallbackException if the requested target does not
-	 * implement ICallbackEventHandler.
-	 */
-	private function raiseCallbackEvent()
-	{
-		 if(($callbackHandler=$this->getCallbackEventTarget())!==null)
-		 {
-			if($callbackHandler instanceof ICallbackEventHandler)
-			{
-				$param = $this->getCallbackEventParameter();
-				$result = new TCallbackEventParameter($this->getResponse(), $param);
-				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
-			{
-				throw new TInvalidCallbackException(
-					'callback_invalid_handler', $callbackHandler->getUniqueID());
-			}
-		 }
-		 else
-		 {
-		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-		 	throw new TInvalidCallbackException('callback_invalid_target', $target);
-		 }
-	}
-
-	/**
-	 * @return TControl the control responsible for the current callback event,
-	 * null if nonexistent
-	 */
-	public function getCallbackEventTarget()
-	{
-		if($this->_callbackEventTarget===null)
-		{
-			$eventTarget=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);
-		}
-		return $this->_callbackEventTarget;
-	}
-
-	/**
-	 * Registers a control to raise callback event in the current request.
-	 * @param TControl control registered to raise callback event.
-	 */
-	public function setCallbackEventTarget(TControl $control)
-	{
-		$this->_callbackEventTarget=$control;
-	}
-
-	/**
-	 * Gets callback parameter. JSON encoding is assumed.
-	 * @return string postback event parameter
-	 */
-	public function getCallbackEventParameter()
-	{
-		if($this->_callbackEventParameter===null)
-		{
-			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-			if(strlen($param) > 0)
-				$this->_callbackEventParameter=TJavaScript::jsonDecode((string)$param);
-		}
-		return $this->_callbackEventParameter;
-	}
-
-	/**
-	 * @param mixed postback event parameter
-	 */
-	public function setCallbackEventParameter($value)
-	{
-		$this->_callbackEventParameter=$value;
-	}
-
-	/**
-	 * Gets the callback client script handler. It handlers the javascript functions
-	 * to be executed during the callback response.
-	 * @return TCallbackClientScript callback client handler.
-	 */
-	public function getCallbackClientHandler()
-	{
-		if(is_null($this->_callbackClient))
-			$this->_callbackClient = new TCallbackClientScript;
-		return $this->_callbackClient;
-	}
-}
-
-/**
- * TCallbackErrorHandler class.
- *
- * Captures errors and exceptions and send them back during callback response.
- * When the application is in debug mode, the error and exception stack trace
- * are shown. A TJavascriptLogger must be present on the client-side to view
- * the error stack trace.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id$
- * @package System.Web.UI.ActiveControls
- * @since 3.1
- */
-class TCallbackErrorHandler extends TErrorHandler
-{
-	/**
-	 * Displays the exceptions to the client-side TJavascriptLogger.
-	 * A HTTP 500 status code is sent and the stack trace is sent as JSON encoded.
-	 * @param Exception exception details.
-	 */
-	protected function displayException($exception)
-	{
-		if($this->getApplication()->getMode()===TApplication::STATE_DEBUG)
-		{
-			$response = $this->getApplication()->getResponse();
-			$trace = TJavaScript::jsonEncode($this->getExceptionStackTrace($exception));
-			$response->appendHeader('HTTP/1.0 500 Internal Error');
-			$response->appendHeader(TActivePageAdapter::CALLBACK_ERROR_HEADER.': '.$trace);
-		}
-		else
-		{
-			error_log("Error happened while processing an existing error:\n".$exception->__toString());
-			header('HTTP/1.0 500 Internal Error');
-		}
-		$this->getApplication()->getResponse()->flush();
-	}
-
-	/**
-	 * @param Exception exception details.
-	 * @return array exception stack trace details.
-	 */
-	private function getExceptionStackTrace($exception)
-	{
-		$data['code']=$exception->getCode() > 0 ? $exception->getCode() : 500;
-		$data['file']=$exception->getFile();
-		$data['line']=$exception->getLine();
-		$data['trace']=$exception->getTrace();
-		if($exception instanceof TPhpErrorException)
-		{
-			// if PHP exception, we want to show the 2nd stack level context
-			// because the 1st stack level is of little use (it's in error handler)
-			if(isset($trace[0]) && isset($trace[0]['file']) && isset($trace[0]['line']))
-			{
-				$data['file']=$trace[0]['file'];
-				$data['line']=$trace[0]['line'];
-			}
-		}
-		$data['type']=get_class($exception);
-		$data['message']=$exception->getMessage();
-		$data['version']=$_SERVER['SERVER_SOFTWARE'].' '.Prado::getVersion();
-		$data['time']=@strftime('%Y-%m-%d %H:%M',time());
-		return $data;
-	}
-}
-
-/**
- * TInvalidCallbackException class.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id$
- * @package System.Web.UI.ActiveControls
- * @since 3.1
- */
-class TInvalidCallbackException extends TException
-{
-}
-
+<?php

+/**

+ * TActivePageAdapter, TCallbackErrorHandler and TInvalidCallbackException class file.

+ *

+ * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2005-2008 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Id$

+ * @package System.Web.UI.ActiveControls

+ */

+

+/**

+ * Load callback response adapter class.

+ */

+Prado::using('System.Web.UI.ActiveControls.TCallbackResponseAdapter');

+Prado::using('System.Web.UI.ActiveControls.TCallbackClientScript');

+Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');

+

+/**

+ * TActivePageAdapter class.

+ *

+ * Callback request handler.

+ *

+ * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

+ * @version $Id$

+ * @package System.Web.UI.ActiveControls

+ * @since 3.1

+ */

+class TActivePageAdapter extends TControlAdapter

+{

+	/**

+	 * Callback response data header name.

+	 */

+	const CALLBACK_DATA_HEADER = 'X-PRADO-DATA';

+	/**

+	 * Callback response client-side action header name.

+	 */

+	const CALLBACK_ACTION_HEADER = 'X-PRADO-ACTIONS';

+	/**

+	 * Callback error header name.

+	 */

+	const CALLBACK_ERROR_HEADER = 'X-PRADO-ERROR';

+	/**

+	 * Callback page state header name.

+	 */

+	const CALLBACK_PAGESTATE_HEADER = 'X-PRADO-PAGESTATE';

+

+	/**

+	 * Callback redirect url header name.

+	 */

+	const CALLBACK_REDIRECT = 'X-PRADO-REDIRECT';

+

+	/**

+	 * @var ICallbackEventHandler callback event handler.

+	 */

+	private $_callbackEventTarget;

+	/**

+	 * @var mixed callback event parameter.

+	 */

+	private $_callbackEventParameter;

+	/**

+	 * @var TCallbackClientScript callback client script handler

+	 */

+	private $_callbackClient;

+

+	private $_controlsToRender=array();

+

+	/**

+	 * Constructor, trap errors and exception to let the callback response

+	 * handle them.

+	 */

+	public function __construct(TPage $control)

+	{

+		parent::__construct($control);

+

+		//TODO: can this be done later?

+		$response = $this->getApplication()->getResponse();

+		$response->setAdapter(new TCallbackResponseAdapter($response));

+

+		$this->trapCallbackErrorsExceptions();

+	}

+

+	/**

+	 * Process the callback request.

+	 * @param THtmlWriter html content writer.

+	 */

+	public function processCallbackEvent($writer)

+	{

+		Prado::trace("ActivePage raiseCallbackEvent()",'System.Web.UI.ActiveControls.TActivePageAdapter');

+		$this->raiseCallbackEvent();

+	}

+

+	/**

+	 * Register a control for defered render() call.

+	 * @param TControl control for defered rendering

+	 * @param THtmlWriter the renderer

+	 */

+	public function registerControlToRender($control,$writer)

+	{

+		$id = $control->getUniqueID();

+		if(!isset($this->_controlsToRender[$id]))

+			$this->_controlsToRender[$id] = array($control,$writer);

+	}

+

+	/**

+	 * Trap errors and exceptions to be handled by TCallbackErrorHandler.

+	 */

+	protected function trapCallbackErrorsExceptions()

+	{

+		$this->getApplication()->setErrorHandler(new TCallbackErrorHandler);

+	}

+

+	/**

+	 * Render the callback response.

+	 * @param THtmlWriter html content writer.

+	 */

+	public function renderCallbackResponse($writer)

+	{

+		Prado::trace("ActivePage renderCallbackResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');

+		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)

+			$this->renderResponse($writer);

+		else

+			$this->redirect($url);

+	}

+

+	/**

+	 * Redirect url on the client-side using javascript.

+	 * @param string new url to load.

+	 */

+	protected function redirect($url)

+	{

+		Prado::trace("ActivePage redirect()",'System.Web.UI.ActiveControls.TActivePageAdapter');

+		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);

+		//$this->getResponse()->appendHeader(self::CALLBACK_REDIRECT.': '.$url);

+	}

+

+	/**

+	 * Renders the callback response by adding additional callback data and

+	 * javascript actions in the header and page state if required.

+	 * @param THtmlWriter html content writer.

+	 */

+	protected function renderResponse($writer)

+	{

+		Prado::trace("ActivePage renderResponse()",'System.Web.UI.ActiveControls.TActivePageAdapter');

+		//renders all the defered render() calls.

+		foreach($this->_controlsToRender as $rid => $forRender)

+			$forRender[0]->render($forRender[1]);

+

+		$response = $this->getResponse();

+

+		//send response data in header

+		if($response->getHasAdapter())

+		{

+			$responseData = $response->getAdapter()->getResponseData();

+			if($responseData!==null)

+			{

+				$data = TJavaScript::jsonEncode($responseData);

+

+				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);

+				//$response->appendHeader(self::CALLBACK_DATA_HEADER.': '.$data);

+			}

+		}

+

+		//sends page state in header

+		if(($handler = $this->getCallbackEventTarget()) !== null)

+		{

+			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())

+			{

+				$pagestate = $this->getPage()->getClientState();

+				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);

+				//$response->appendHeader(self::CALLBACK_PAGESTATE_HEADER.': '.$pagestate);

+			}

+		}

+

+		//safari must receive at least 1 byte of data.

+		$writer->write(" ");

+

+		//output the end javascript

+		if($this->getPage()->getClientScript()->hasEndScripts())

+		{

+			$writer = $response->createHtmlWriter();

+			$this->getPage()->getClientScript()->renderEndScripts($writer);

+			$this->getPage()->getCallbackClient()->evaluateScript($writer);

+		}

+

+		//output the actions

+		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();

+		$actions = TJavaScript::jsonEncode($executeJavascript);

+		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);

+		//$response->appendHeader(self::CALLBACK_ACTION_HEADER.': '.$actions);

+	}

+

+	/**

+	 * Appends data or javascript code to the body content surrounded with delimiters

+	 */

+	private function appendContentPart($response, $delimiter, $data)

+	{

+		$content = $response->createHtmlWriter();

+		$content->getWriter()->setBoundary($delimiter);

+		$content->write($data);

+	}

+

+	/**

+	 * Trys to find the callback event handler and raise its callback event.

+	 * @throws TInvalidCallbackException if call back target is not found.

+	 * @throws TInvalidCallbackException if the requested target does not

+	 * implement ICallbackEventHandler.

+	 */

+	private function raiseCallbackEvent()

+	{

+		 if(($callbackHandler=$this->getCallbackEventTarget())!==null)

+		 {

+			if($callbackHandler instanceof ICallbackEventHandler)

+			{

+				$param = $this->getCallbackEventParameter();

+				$result = new TCallbackEventParameter($this->getResponse(), $param);

+				$callbackHandler->raiseCallbackEvent($result);

+			}

+			else

+			{

+				throw new TInvalidCallbackException(

+					'callback_invalid_handler', $callbackHandler->getUniqueID());

+			}

+		 }

+		 else

+		 {

+		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);

+		 	throw new TInvalidCallbackException('callback_invalid_target', $target);

+		 }

+	}

+

+	/**

+	 * @return TControl the control responsible for the current callback event,

+	 * null if nonexistent

+	 */

+	public function getCallbackEventTarget()

+	{

+		if($this->_callbackEventTarget===null)

+		{

+			$eventTarget=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);

+			if(!empty($eventTarget))

+				$this->_callbackEventTarget=$this->getPage()->findControl($eventTarget);

+		}

+		return $this->_callbackEventTarget;

+	}

+

+	/**

+	 * Registers a control to raise callback event in the current request.

+	 * @param TControl control registered to raise callback event.

+	 */

+	public function setCallbackEventTarget(TControl $control)

+	{

+		$this->_callbackEventTarget=$control;

+	}

+

+	/**

+	 * Gets callback parameter. JSON encoding is assumed.

+	 * @return string postback event parameter

+	 */

+	public function getCallbackEventParameter()

+	{

+		if($this->_callbackEventParameter===null)

+		{

+			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);

+			if(strlen($param) > 0)

+				$this->_callbackEventParameter=TJavaScript::jsonDecode((string)$param);

+		}

+		return $this->_callbackEventParameter;

+	}

+

+	/**

+	 * @param mixed postback event parameter

+	 */

+	public function setCallbackEventParameter($value)

+	{

+		$this->_callbackEventParameter=$value;

+	}

+

+	/**

+	 * Gets the callback client script handler. It handlers the javascript functions

+	 * to be executed during the callback response.

+	 * @return TCallbackClientScript callback client handler.

+	 */

+	public function getCallbackClientHandler()

+	{

+		if($this->_callbackClient===null)

+			$this->_callbackClient = new TCallbackClientScript;

+		return $this->_callbackClient;

+	}

+}

+

+/**

+ * TCallbackErrorHandler class.

+ *

+ * Captures errors and exceptions and send them back during callback response.

+ * When the application is in debug mode, the error and exception stack trace

+ * are shown. A TJavascriptLogger must be present on the client-side to view

+ * the error stack trace.

+ *

+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

+ * @version $Id$

+ * @package System.Web.UI.ActiveControls

+ * @since 3.1

+ */

+class TCallbackErrorHandler extends TErrorHandler

+{

+	/**

+	 * Displays the exceptions to the client-side TJavascriptLogger.

+	 * A HTTP 500 status code is sent and the stack trace is sent as JSON encoded.

+	 * @param Exception exception details.

+	 */

+	protected function displayException($exception)

+	{

+		if($this->getApplication()->getMode()===TApplication::STATE_DEBUG)

+		{

+			$response = $this->getApplication()->getResponse();

+			$trace = TJavaScript::jsonEncode($this->getExceptionStackTrace($exception));

+			$response->appendHeader('HTTP/1.0 500 Internal Error');

+			$response->appendHeader(TActivePageAdapter::CALLBACK_ERROR_HEADER.': '.$trace);

+		}

+		else

+		{

+			error_log("Error happened while processing an existing error:\n".$exception->__toString());

+			header('HTTP/1.0 500 Internal Error');

+		}

+		$this->getApplication()->getResponse()->flush();

+	}

+

+	/**

+	 * @param Exception exception details.

+	 * @return array exception stack trace details.

+	 */

+	private function getExceptionStackTrace($exception)

+	{

+		$data['code']=$exception->getCode() > 0 ? $exception->getCode() : 500;

+		$data['file']=$exception->getFile();

+		$data['line']=$exception->getLine();

+		$data['trace']=$exception->getTrace();

+		if($exception instanceof TPhpErrorException)

+		{

+			// if PHP exception, we want to show the 2nd stack level context

+			// because the 1st stack level is of little use (it's in error handler)

+			if(isset($trace[0]) && isset($trace[0]['file']) && isset($trace[0]['line']))

+			{

+				$data['file']=$trace[0]['file'];

+				$data['line']=$trace[0]['line'];

+			}

+		}

+		$data['type']=get_class($exception);

+		$data['message']=$exception->getMessage();

+		$data['version']=$_SERVER['SERVER_SOFTWARE'].' '.Prado::getVersion();

+		$data['time']=@strftime('%Y-%m-%d %H:%M',time());

+		return $data;

+	}

+}

+

+/**

+ * TInvalidCallbackException class.

+ *

+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

+ * @version $Id$

+ * @package System.Web.UI.ActiveControls

+ * @since 3.1

+ */

+class TInvalidCallbackException extends TException

+{

+}

+

diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index 5a3633ec..13200e51 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -235,7 +235,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	 */

 	public function getResultPanel()

 	{

-		if(is_null($this->_resultPanel))

+		if($this->_resultPanel===null)

 			$this->_resultPanel = $this->createResultPanel();

 		return $this->_resultPanel;

 	}

@@ -256,7 +256,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 	 */

 	public function getSuggestions()

 	{

-		if(is_null($this->_repeater))

+		if($this->_repeater===null)

 			$this->_repeater = $this->createRepeater();

 		return $this->_repeater;

 	}

diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index 8f55e27b..f301f2c3 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -58,8 +58,8 @@ class TBaseActiveControl extends TComponent
 	 */

 	protected function setOption($name,$value,$default=null)

 	{

-		$value = is_null($value) ? $default : $value;

-		if(!is_null($value))

+		$value = ($value===null) ? $default : $value;

+		if($value!==null)

 			$this->_options->add($name,$value);

 	}

 

@@ -73,7 +73,7 @@ class TBaseActiveControl extends TComponent
 	protected function getOption($name,$default=null)

 	{

 		$item = $this->_options->itemAt($name);

-		return is_null($item) ? $default : $item;

+		return ($item===null) ? $default : $item;

 	}

 

 	/**

@@ -168,7 +168,7 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
 	 */

 	public function getClientSide()

 	{

-		if(is_null($client = $this->getOption('ClientSide')))

+		if(($client = $this->getOption('ClientSide'))===null)

 		{

 			$client = $this->createClientSide();

 			$this->setOption('ClientSide', $client);

@@ -182,7 +182,7 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
 	 */

 	public function setClientSide($client)

 	{

-		if(is_null($this->getOption('ClientSide')))

+		if( $this->getOption('ClientSide')===null)

 			$this->setOption('ClientSide', $client);

 		else

 			throw new TConfigurationException(

diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index 8f275ef8..1b9f1ca6 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -104,7 +104,7 @@ class TCallbackClientScript extends TApplicationComponent
 	{

 		$method = TPropertyValue::ensureEnum($method,

 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');

-		$type = is_null($type) ? $this->getSelectionControlType($control) : $type;

+		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;

 		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;

 		$this->callClientFunction('Prado.Element.select',

 				array($control, $type.$method, $value, $total));

@@ -164,8 +164,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function setAttribute($control, $name, $value)

 	{

-        if ($control instanceof ISurroundable) 
-            $control=$control->getSurroundingTagID();
+        if ($control instanceof ISurroundable) 

+            $control=$control->getSurroundingTagID();

 		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));

 	}

 

@@ -193,8 +193,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function show($element)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.show', $element);

 	}

 

@@ -204,8 +204,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function hide($element)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.hide', $element);

 	}

 

@@ -217,8 +217,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function toggle($element, $effect=null, $options=array())

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.toggle', array($element,$effect,$options));

 	}

 

@@ -228,8 +228,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function remove($element)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.remove', $element);

 	}

 

@@ -246,8 +246,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function update($element, $content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content, 'Element.update');

 	}

 

@@ -258,8 +258,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function addCssClass($element, $cssClass)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.addClassName', array($element, $cssClass));

 	}

 

@@ -270,8 +270,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function removeCssClass($element, $cssClass)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.removeClassName', array($element, $cssClass));

 	}

 

@@ -292,8 +292,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function scrollTo($element)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Element.scrollTo', $element);

 	}

 

@@ -313,9 +313,9 @@ class TCallbackClientScript extends TApplicationComponent
 	 * @param array list of key-value pairs as style property and style value.

 	 */

 	public function setStyle($element, $styles)

-	{
-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+	{

+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction('Prado.Element.setStyle', array($element, $styles));

 	}

 

@@ -326,8 +326,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function appendContent($element, $content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content, 'Prado.Element.Insert.append');

 	}

 

@@ -338,8 +338,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function prependContent($element, $content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content, 'Prado.Element.Insert.prepend');

 	}

 

@@ -350,8 +350,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function insertContentAfter($element, $content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content, 'Prado.Element.Insert.after');

 	}

 

@@ -362,8 +362,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function insertContentBefore($element, $content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content, 'Prado.Element.Insert.before');

 	}

 

@@ -406,8 +406,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function replaceContent($element,$content)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->replace($element, $content);

 	}

 

@@ -458,8 +458,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function visualEffect($type, $element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->callClientFunction($type, array($element, $options));

 	}

 

@@ -470,8 +470,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function appear($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Appear', $element, $options);

 	}

 

@@ -482,8 +482,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function blindDown($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.BlindDown', $element, $options);

 	}

 

@@ -494,8 +494,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function blindUp($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.BlindUp', $element, $options);

 

 	}

@@ -507,8 +507,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function dropOut($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.DropOut', $element, $options);

 	}

 

@@ -519,8 +519,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function fade($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Fade', $element, $options);

 	}

 

@@ -531,8 +531,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function fold($element, $options = null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Fold', $element, $options);

 	}

 

@@ -543,8 +543,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function grow($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Grow', $element, $options);

 	}

 

@@ -555,8 +555,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function puff($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Puff', $element, $options);

 	}

 

@@ -567,8 +567,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function pulsate($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Pulsate', $element, $options);

 	}

 

@@ -579,8 +579,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function shake($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Shake', $element, $options);

 	}

 

@@ -591,8 +591,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function shrink($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Shrink', $element, $options);

 	}

 

@@ -603,8 +603,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function slideDown($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.SlideDown', $element, $options);

 	}

 

@@ -615,8 +615,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function slideUp($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.SlideUp', $element, $options);

 	}

 

@@ -627,8 +627,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function squish($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.Squish', $element, $options);

 	}

 

@@ -639,8 +639,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function switchOff($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Effect.SwitchOff', $element, $options);

 	}

 

@@ -651,8 +651,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function highlight($element, $options=null)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$this->visualEffect('Prado.Effect.Highlight', $element, $options);

 	}

 

@@ -663,8 +663,8 @@ class TCallbackClientScript extends TApplicationComponent
 	 */

 	public function setOpacity($element, $value)

 	{

-        if ($element instanceof ISurroundable) 
-            $element=$element->getSurroundingTagID();
+        if ($element instanceof ISurroundable) 

+            $element=$element->getSurroundingTagID();

 		$value = TPropertyValue::ensureFloat($value);

 		$this->callClientFunction('Element.setOpacity', array($element,$value));

 	}

diff --git a/framework/Web/UI/ActiveControls/TCallbackClientSide.php b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
index 57436278..31b806c3 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientSide.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -22,13 +22,13 @@
  * - <b>onLoaded</b>* executed when callback request begins.

  * - <b>onInteractive</b> executed when callback request is in progress.

  * - <b>onComplete</b>executed when callback response returns.

- *
- * * Note that theses 2 events are not fired correctly by Opera. To make
- *   them work in this browser, Prado will fire them just after onPreDispatch.
- * 
- * In a general way, onUninitialized, onLoading, onLoaded and onInteractive events 
- * are not implemented consistently in all browsers.When cross browser compatibility is
- * needed, it is best to avoid use them
+ *

+ * * Note that theses 2 events are not fired correctly by Opera. To make

+ *   them work in this browser, Prado will fire them just after onPreDispatch.

+ * 

+ * In a general way, onUninitialized, onLoading, onLoaded and onInteractive events 

+ * are not implemented consistently in all browsers.When cross browser compatibility is

+ * needed, it is best to avoid use them

  * 

  * The OnSuccess and OnFailure events are raised when the

  * response is returned. A successful request/response will raise

@@ -247,7 +247,7 @@ class TCallbackClientSide extends TClientSideOptions
 	public function getHasPriority()

 	{

 		$option =  $this->getOption('HasPriority');

-		return is_null($option) ? true : $option;

+		return ($option===null) ? true : $option;

 	}

 

 	/**

@@ -284,7 +284,7 @@ class TCallbackClientSide extends TClientSideOptions
 	public function getEnablePageStateUpdate()

 	{

 		$option = $this->getOption('EnablePageStateUpdate');

-		return is_null($option) ? true : $option;

+		return ($option===null) ? true : $option;

 	}

 

 	/**

diff --git a/framework/Web/UI/ActiveControls/TCallbackOptions.php b/framework/Web/UI/ActiveControls/TCallbackOptions.php
index 7c48b795..c9b649d8 100644
--- a/framework/Web/UI/ActiveControls/TCallbackOptions.php
+++ b/framework/Web/UI/ActiveControls/TCallbackOptions.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -37,7 +37,7 @@ class TCallbackOptions extends TControl
 	 */

 	public function getClientSide()

 	{

-		if(is_null($this->_clientSide))

+		if($this->_clientSide===null)

 			$this->_clientSide = $this->createClientSide();

 		return $this->_clientSide;

 	}

diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index 6e1c6b7a..b8dd666b 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -35,9 +35,9 @@ Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
  * After the callback request returns sucessfully, the textbox is enabled.

  * If the {@link setAutoHideTextBox AutoHideTextBox} property is true, then

  * the textbox will be hidden and the label is then shown.

- *
- * Since 3.1.2, you can set the {@link setReadOnly ReadOnly} property to make
- * the control not editable. This property can be also changed on callback
+ *

+ * Since 3.1.2, you can set the {@link setReadOnly ReadOnly} property to make

+ * the control not editable. This property can be also changed on callback

  * 

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @version $Id$

@@ -124,7 +124,7 @@ class TInPlaceTextBox extends TActiveTextBox
 	protected function getExternalControlID()

 	{

 		$extID = $this->getEditTriggerControlID();

-		if(is_null($extID)) return '';

+		if($extID===null) return '';

 		if(($control = $this->findControl($extID))!==null)

 			return $control->getClientID();

 		return $extID;

@@ -144,21 +144,21 @@ class TInPlaceTextBox extends TActiveTextBox
 			$client->update($this->getLabelClientID(), $value);

 			$client->setValue($this, $value);

 		}

-	}
-	
-	/**
-	 * Update ClientSide Readonly property
-	 * @param boolean value
-	 * @since 3.1.2
-	 */
-	public function setReadOnly ($value)
-	{
-		$value=TPropertyValue::ensureBoolean($value);
-		TTextBox::setReadOnly($value);
-		if ($this->getActiveControl()->canUpdateClientSide())
-		{
-			$this->callClientFunction('setReadOnly', $value);
-		}
+	}

+	

+	/**

+	 * Update ClientSide Readonly property

+	 * @param boolean value

+	 * @since 3.1.2

+	 */

+	public function setReadOnly ($value)

+	{

+		$value=TPropertyValue::ensureBoolean($value);

+		TTextBox::setReadOnly($value);

+		if ($this->getActiveControl()->canUpdateClientSide())

+		{

+			$this->callClientFunction('setReadOnly', $value);

+		}

 	}

 

 	/**

@@ -231,8 +231,8 @@ class TInPlaceTextBox extends TActiveTextBox
 		}

 

 		if($this->hasEventHandler('OnLoadingText'))

-			$options['LoadTextOnEdit'] = true;
-			
+			$options['LoadTextOnEdit'] = true;

+			

 		$options['ReadOnly']=$this->getReadOnly();

 		return $options;

 	}

diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index b418885c..e276bb55 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -1,733 +1,733 @@
-<?php
-/**
- * TBaseValidator class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
- * @license http://www.pradosoft.com/license/
- * @version $Id$
- * @package System.Web.UI.WebControls
- */
-
-/**
- * Using TLabel class
- */
-Prado::using('System.Web.UI.WebControls.TLabel');
-
-/**
- * TBaseValidator class
- *
- * TBaseValidator serves as the base class for validator controls.
- *
- * Validation is performed when a postback control, such as a TButton, a TLinkButton
- * or a TTextBox (under AutoPostBack mode) is submitting the page and
- * its <b>CausesValidation</b> property is true.
- * You can also manually perform validation by calling {@link TPage::validate()}.
- * The input control to be validated is specified by {@link setControlToValidate ControlToValidate}.
- *
- * Validator controls always validate the associated input control on the serve side.
- * In addition, if {@link getEnableClientScript EnableClientScript} is true,
- * validation will also be performed on the client-side using javascript.
- * Client-side validation will validate user input before it is sent to the server.
- * The form data will not be submitted if any error is detected. This avoids
- * the round-trip of information necessary for server-side validation.
- *
- * You can use multiple validator controls to validate a single input control,
- * each responsible for validating against a different criteria.
- * For example, on a user registration form, you may want to make sure the user
- * enters a value in the username text box, and the input must consist of only word
- * characters. You can use a {@link TRequiredFieldValidator} to ensure the input
- * of username and a {@link TRegularExpressionValidator} to ensure the proper input.
- *
- * If an input control fails validation, the text specified by the {@link setErrorMessage ErrorMessage}
- * property is displayed in the validation control. However, if the {@link setText Text}
- * property is set, it will be displayed instead. If both {@link setErrorMessage ErrorMessage}
- * and {@link setText Text} are empty, the body content of the validator will
- * be displayed. Error display is controlled by {@link setDisplay Display} property.
- *
- * You can also customized the client-side behaviour by adding javascript
- * code to the subproperties of the {@link getClientSide ClientSide}
- * property. See quickstart documentation for further details.
- *
- * You can also place a {@link TValidationSummary} control on a page to display error messages
- * from the validators together. In this case, only the {@link setErrorMessage ErrorMessage}
- * property of the validators will be displayed in the {@link TValidationSummary} control.
- *
- * Validators can be partitioned into validation groups by setting their
- * {@link setValidationGroup ValidationGroup} property. If the control causing the
- * validation also sets its ValidationGroup property, only those validators having
- * the same ValidationGroup value will do input validation.
- *
- * Note, the {@link TPage::getIsValid IsValid} property of the current {@link TPage}
- * instance will be automatically updated by the validation process which occurs
- * after {@link TPage::onLoad onLoad} of {@link TPage} and before the postback events.
- * Therefore, if you use the {@link TPage::getIsValid()} property in
- * the {@link TPage::onLoad()} method, you must first explicitly call
- * the {@link TPage::validate()} method.
- *
- * <b>Notes to Inheritors</b>  When you inherit from TBaseValidator, you must
- * override the method {@link evaluateIsValid}.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id$
- * @package System.Web.UI.WebControls
- * @since 3.0
- */
-abstract class TBaseValidator extends TLabel implements IValidator
-{
-	/**
-	 * @var boolean whether the validation succeeds
-	 */
-	private $_isValid=true;
-	/**
-	 * @var boolean whether the validator has been registered with the page
-	 */
-	private $_registered=false;
-	/**
-	 * @var TValidatorClientSide validator client-script options.
-	 */
-	private $_clientSide;
-	/**
-	 * Controls for which the client-side validation3.js file needs to handle
-	 * them specially.
-	 * @var array list of control class names
-	 */
-	private static $_clientClass = array('THtmlArea', 'TDatePicker', 'TListBox', 'TCheckBoxList');
-
-	/**
-	 * Constructor.
-	 * This method sets the foreground color to red.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setForeColor('red');
-	}
-
-	/**
-	 * Registers the validator with page.
-	 * @param mixed event parameter
-	 */
-	public function onInit($param)
-	{
-		parent::onInit($param);
-		$this->getPage()->getValidators()->add($this);
-		$this->_registered=true;
-	}
-
-	/**
-	 * Unregisters the validator from page.
-	 * @param mixed event parameter
-	 */
-	public function onUnload($param)
-	{
-		if($this->_registered && ($page=$this->getPage())!==null)
-			$page->getValidators()->remove($this);
-		$this->_registered=false;
-		parent::onUnload($param);
-	}
-
-	/**
-	 * Adds attributes to renderer. Calls parent implementation and renders the
-	 * client control scripts.
-	 * @param THtmlWriter the renderer
-	 */
-	protected function addAttributesToRender($writer)
-	{
-		$display=$this->getDisplay();
-		$visible=$this->getEnabled(true) && !$this->getIsValid();
-		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display','none');
-		else if(!$visible)
-			$writer->addStyleAttribute('visibility','hidden');
-		$writer->addAttribute('id',$this->getClientID());
-		parent::addAttributesToRender($writer);
-		$this->renderClientControlScript($writer);
-	}
-
-	/**
-	 * Returns an array of javascript validator options.
-	 * @return array javascript validator options.
-	 */
-	protected function getClientScriptOptions()
-	{
-		$control = $this->getValidationTarget();
-		$options['ID'] = $this->getClientID();
-		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		$options['Display'] = $this->getDisplay();
-		$options['ErrorMessage'] = $this->getErrorMessage();
-		if($this->getFocusOnError())
-		{
-			$options['FocusOnError'] = $this->getFocusOnError();
-			$options['FocusElementID'] = $this->getFocusElementID();
-		}
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['ControlToValidate'] = $control->getClientID();
-		$options['ControlCssClass'] = $this->getControlCssClass();
-
-		$options['ControlType'] = $this->getClientControlClass($control);
-
-		//get date format from date picker target control
-		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
-
-		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());
-
-		return $options;
-	}
-
-	/**
-	 * Gets the Control type for client-side validation. If new cases exists in
-	 * TBaseValidator::$_clientClass, be sure to update the corresponding
-	 * "Javascript/validation3.js" file as well.
-	 * @param TControl control to validate.
-	 * @return string control type for client-side validation.
-	 */
-	private function getClientControlClass($control)
-	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
-				return $type;
-		return get_class($control);
-	}
-
-	/**
-	 * Gets the TValidatorClientSide that allows modification of the client-
-	 * side validator events.
-	 *
-	 * The client-side validator supports the following events.
-	 * # <tt>OnValidate</tt> -- raised before client-side validation is
-	 * executed.
-	 * # <tt>OnValidationSuccess</tt> -- raised after client-side validation is completed
-	 * and is successfull, overrides default validator error messages updates.
-	 * # <tt>OnValidationError</tt> -- raised after client-side validation is completed
-	 * and failed, overrides default validator error message updates.
-	 *
-	 * You can attach custom javascript code to each of these events
-	 *
-	 * @return TValidatorClientSide javascript validator event options.
-	 */
-	public function getClientSide()
-	{
-		if(is_null($this->_clientSide))
-			$this->_clientSide = $this->createClientSide();
-		return $this->_clientSide;
-	}
-
-	/**
-	 * @return TValidatorClientSide javascript validator event options.
-	 */
-	protected function createClientSide()
-	{
-		return new TValidatorClientSide;
-	}
-
-	/**
-	 * Renders the javascript code to the end script.
-	 * If you override this method, be sure to call the parent implementation
-	 * so that the event handlers can be invoked.
-	 * @param THtmlWriter the renderer
-	 */
-	public function renderClientControlScript($writer)
-	{
-		$scripts = $this->getPage()->getClientScript();
-		$formID=$this->getPage()->getForm()->getClientID();
-		$scriptKey = "TBaseValidator:$formID";
-		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
-		{
-			$manager['FormID'] = $formID;
-			$options = TJavaScript::encode($manager);
-			$scripts->registerPradoScript('validator');
-			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
-		}
-		if($this->getEnableClientScript() & $this->getEnabled(true))
-			$this->registerClientScriptValidator();
-	}
-
-	/**
-	 * Override parent implementation to update the control CSS Class before 
-	 * the validated control is rendered 
-	 */
-	public function onPreRender ($param)
-	{
-		parent::onPreRender($param);
-		$this->updateControlCssClass();
-	}
-	
-	/**
-	 * Update the ControlToValidate component's css class depending
-	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
-	 */
-	protected function updateControlCssClass()
-	{
-		if(($cssClass=$this->getControlCssClass())!=='')
-		{
-			$control=$this->getValidationTarget();
-			if($control instanceof TWebControl)
-			{
-				$class = preg_replace ('/ '.preg_quote($cssClass).'/', '',$control->getCssClass());
-				if(!$this->getIsValid())
-				{
-					$class .= ' '.$cssClass;
-					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
-					$control->setCssClass($class);
-			}
-		}
-	}
-
-	/**
-	 * Registers the individual validator client-side javascript code.
-	 */
-	protected function registerClientScriptValidator()
-	{
-		$key = 'prado:'.$this->getClientID();
-		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
-		{
-			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new '.$this->getClientClassName().'('.$options.');';
-			$this->getPage()->getClientScript()->registerEndScript($key, $script);
-		}
-	}
-
-	/**
-	 * Gets the name of the javascript class responsible for performing validation for this control.
-	 * This method overrides the parent implementation.
-	 * @return string the javascript class name
-	 */
-	abstract protected function getClientClassName();
-
-	/**
-	 * This method overrides the parent implementation to forbid setting ForControl.
-	 * @param string the associated control ID
-	 * @throws TNotSupportedException whenever this method is called
-	 */
-	public function setForControl($value)
-	{
-		throw new TNotSupportedException('basevalidator_forcontrol_unsupported',get_class($this));
-	}
-
-	/**
-	 * This method overrides parent's implementation by setting {@link setIsValid IsValid} to true if disabled.
-	 * @param boolean whether the validator is enabled.
-	 */
-	public function setEnabled($value)
-	{
-		$value=TPropertyValue::ensureBoolean($value);
-		parent::setEnabled($value);
-		if(!$value)
-			$this->_isValid=true;
-	}
-
-	/**
-	 * @return TValidatorDisplayStyle the style of displaying the error message. Defaults to TValidatorDisplayStyle::Fixed.
-	 */
-	public function getDisplay()
-	{
-		return $this->getViewState('Display',TValidatorDisplayStyle::Fixed);
-	}
-
-	/**
-	 * @param TValidatorDisplayStyle the style of displaying the error message
-	 */
-	public function setDisplay($value)
-	{
-		$this->setViewState('Display',TPropertyValue::ensureEnum($value,'TValidatorDisplayStyle'),TValidatorDisplayStyle::Fixed);
-	}
-
-	/**
-	 * @return boolean whether client-side validation is enabled.
-	 */
-	public function getEnableClientScript()
-	{
-		return $this->getViewState('EnableClientScript',true);
-	}
-
-	/**
-	 * @param boolean whether client-side validation is enabled.
-	 */
-	public function setEnableClientScript($value)
-	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
-	}
-
-	/**
-	 * @return string the text for the error message.
-	 */
-	public function getErrorMessage()
-	{
-		return $this->getViewState('ErrorMessage','');
-	}
-
-	/**
-	 * Sets the text for the error message.
-	 * @param string the error message
-	 */
-	public function setErrorMessage($value)
-	{
-		$this->setViewState('ErrorMessage',$value,'');
-	}
-
-	/**
-	 * @return string the ID path of the input control to validate
-	 */
-	public function getControlToValidate()
-	{
-		return $this->getViewState('ControlToValidate','');
-	}
-
-	/**
-	 * Sets the ID path of the input control to validate.
-	 * The ID path is the dot-connected IDs of the controls reaching from
-	 * the validator's naming container to the target control.
-	 * @param string the ID path
-	 */
-	public function setControlToValidate($value)
-	{
-		$this->setViewState('ControlToValidate',$value,'');
-	}
-
-	/**
-	 * @return boolean whether to set focus at the validating place if the validation fails. Defaults to false.
-	 */
-	public function getFocusOnError()
-	{
-		return $this->getViewState('FocusOnError',false);
-	}
-
-	/**
-	 * @param boolean whether to set focus at the validating place if the validation fails
-	 */
-	public function setFocusOnError($value)
-	{
-		$this->setViewState('FocusOnError',TPropertyValue::ensureBoolean($value),false);
-	}
-
-	/**
-	 * Gets the ID of the HTML element that will receive focus if validation fails and {@link getFocusOnError FocusOnError} is true.
-	 * Defaults to the client ID of the {@link getControlToValidate ControlToValidate}.
-	 * @return string the ID of the HTML element to receive focus
-	 */
-	public function getFocusElementID()
-	{
-		if(($id=$this->getViewState('FocusElementID',''))==='')
-			$id=$this->getValidationTarget()->getClientID();
-		return $id;
-	}
-
-	/**
-	 * Sets the ID of the HTML element that will receive focus if validation fails and {@link getFocusOnError FocusOnError} is true.
-	 * @param string the ID of the HTML element to receive focus
-	 */
-	public function setFocusElementID($value)
-	{
-		$this->setViewState('FocusElementID', $value, '');
-	}
-
-	/**
-	 * @return string the group which this validator belongs to
-	 */
-	public function getValidationGroup()
-	{
-		return $this->getViewState('ValidationGroup','');
-	}
-
-	/**
-	 * @param string the group which this validator belongs to
-	 */
-	public function setValidationGroup($value)
-	{
-		$this->setViewState('ValidationGroup',$value,'');
-	}
-
-	/**
-	 * @return boolean whether the validation succeeds
-	 */
-	public function getIsValid()
-	{
-		return $this->_isValid;
-	}
-
-	/**
-	 * Sets the value indicating whether the validation succeeds
-	 * @param boolean whether the validation succeeds
-	 */
-	public function setIsValid($value)
-	{
-		$this->_isValid=TPropertyValue::ensureBoolean($value);
-	}
-
-	/**
-	 * @return TControl control to be validated. Null if no control is found.
-	 * @throws TConfigurationException if {@link getControlToValidate
-	 * ControlToValidate} is empty or does not point to a valid control
-	 */
-	protected function getValidationTarget()
-	{
-		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
-			return $control;
-		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
-	}
-
-	/**
-	 * Retrieves the property value of the control being validated.
-	 * @param TControl control being validated
-	 * @return string property value to be validated
-	 * @throws TInvalidDataTypeException if the control to be validated does not implement {@link IValidatable}.
-	 */
-	protected function getValidationValue($control)
-	{
-		if($control instanceof IValidatable)
-			return $control->getValidationPropertyValue();
-		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
-	}
-
-	/**
-	 * Validates the specified control.
-	 * Do not override this method. Override {@link evaluateIsValid} instead.
-	 * @return boolean whether the validation succeeds
-	 */
-	public function validate()
-	{
-		$this->setIsValid(true);
-		$this->onValidate();
-		if($this->getVisible(true) && $this->getEnabled(true))
-		{			
-			// if the target is not a disabled web control
-			if(($target=$this->getValidationTarget())!==null && !($target instanceof TWebControl && !$target->getEnabled(true)))
-			{
-				if($this->evaluateIsValid())
-				{
-					$this->setIsValid(true);
-					$this->onValidationSuccess();
-				}
-				else
-				{
-					$target->setIsValid(false);
-					$this->setIsValid(false);
-					$this->onValidationError();
-				}
-			}
-			else
-			{
-				$this->evaluateIsValid();
-				$this->setIsValid(true);
-				$this->onValidationSuccess();
-			}
-		}
-		return $this->getIsValid();
-	}
-
-	/**
-	 * @return string the css class that is applied to the control being validated in case the validation fails
-	 */
-	public function getControlCssClass()
-	{
-		return $this->getViewState('ControlCssClass','');
-	}
-
-	/**
-	 * @param string the css class that is applied to the control being validated in case the validation fails
-	 */
-	public function setControlCssClass($value)
-	{
-		$this->setViewState('ControlCssClass',$value,'');
-	}
-
-	/**
-	 * This is the major method for validation.
-	 * Derived classes should implement this method to provide customized validation.
-	 * @return boolean whether the validation succeeds
-	 */
-	abstract protected function evaluateIsValid();
-
-	/**
-	 * This event is raised when the validator succeeds in validation.
-	 */
-	public function onValidationSuccess()
-	{
-		$this->raiseEvent('OnValidationSuccess',$this,null);
-	}
-
-	/**
-	 * This event is raised when the validator fails in validation.
-	 */
-	public function onValidationError()
-	{
-		$this->raiseEvent('OnValidationError',$this,null);
-	}
-
-	/**
-	 * This event is raised right before the validator starts to perform validation.
-	 * You may use this event to change the behavior of validation.
-	 * For example, you may disable the validator if certain condition is satisfied.
-	 * Note, the event will NOT be raised if the validator is invisible.
-	 */
-	public function onValidate()
-	{
-		$this->raiseEvent('OnValidate',$this,null);
-	}
-
-	/**
-	 * Renders the validator control.
-	 * @param THtmlWriter writer for the rendering purpose
-	 */
-	public function renderContents($writer)
-	{
-		if(($text=$this->getText())!=='')
-			$writer->write($text);
-		else if(($text=$this->getErrorMessage())!=='')
-			$writer->write($text);
-		else
-			parent::renderContents($writer);
-	}
-}
-
-/**
- * TValidatorClientSide class.
- *
- * Client-side validator events can be modified through the {@link
- * TBaseValidator::getClientSide ClientSide} property of a validator. The
- * subproperties of ClientSide are those of the TValidatorClientSide
- * properties. The client-side validator supports the following events.
- *
- * The <tt>OnValidate</tt> event is raise before the validator validation
- * functions are called.
- *
- * The <tt>OnValidationSuccess</tt> event is raised after the validator has successfully
- * validate the control.
- *
- * The <tt>OnValidationError</tt> event is raised after the validator fails validation.
- *
- * See the quickstart documentation for further details.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id$
- * @package System.Web.UI.WebControls
- * @since 3.0
- */
-class TValidatorClientSide extends TClientSideOptions
-{
-	/**
-	 * @return string javascript code for client-side OnValidate event.
-	 */
-	public function getOnValidate()
-	{
-		return $this->getOption('OnValidate');
-	}
-
-	/**
-	 * Client-side OnValidate validator event is raise before the validators
-	 * validation functions are called.
-	 * @param string javascript code for client-side OnValidate event.
-	 */
-	public function setOnValidate($javascript)
-	{
-		$this->setFunction('OnValidate', $javascript);
-	}
-
-	/**
-	 * Client-side OnSuccess event is raise after validation is successfull.
-	 * This will override the default client-side validator behaviour.
-	 * @param string javascript code for client-side OnSuccess event.
-	 */
-	public function setOnValidationSuccess($javascript)
-	{
-		$this->setFunction('OnValidationSuccess', $javascript);
-	}
-
-	/**
-	 * @return string javascript code for client-side OnSuccess event.
-	 */
-	public function getOnValidationSuccess()
-	{
-		return $this->getOption('OnValidationSuccess');
-	}
-
-	/**
-	 * Client-side OnError event is raised after validation failure.
-	 * This will override the default client-side validator behaviour.
-	 * @param string javascript code for client-side OnError event.
-	 */
-	public function setOnValidationError($javascript)
-	{
-		$this->setFunction('OnValidationError', $javascript);
-	}
-
-	/**
-	 * @return string javascript code for client-side OnError event.
-	 */
-	public function getOnValidationError()
-	{
-		return $this->getOption('OnValidationError');
-	}
-
-	/**
-	 * @param boolean true to revalidate when the control to validate changes value.
-	 */
-	public function setObserveChanges($value)
-	{
-		$this->setOption('ObserveChanges', TPropertyValue::ensureBoolean($value));
-	}
-
-	/**
-	 * @return boolean true to observe changes.
-	 */
-	public function getObserveChanges()
-	{
-		$changes = $this->getOption('ObserveChanges');
-		return is_null($changes) ? true : $changes;
-	}
-}
-
-
-/**
- * TValidatorDisplayStyle class.
- * TValidatorDisplayStyle defines the enumerable type for the possible styles
- * that a validator control can display the error message.
- *
- * The following enumerable values are defined:
- * - None: the error message is not displayed
- * - Dynamic: the error message dynamically appears when the validator fails validation
- * - Fixed: Similar to Dynamic except that the error message physically occupies the page layout (even though it may not be visible)
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id$
- * @package System.Web.UI.WebControls
- * @since 3.0.4
- */
-class TValidatorDisplayStyle extends TEnumerable
-{
-	const None='None';
-	const Dynamic='Dynamic';
-	const Fixed='Fixed';
-}
-
-/**
- * TValidationDataType class.
- * TValidationDataType defines the enumerable type for the possible data types that
- * a comparison validator can validate upon.
- *
- * The following enumerable values are defined:
- * - Integer
- * - Float
- * - Date
- * - String
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id$
- * @package System.Web.UI.WebControls
- * @since 3.0.4
- */
-class TValidationDataType extends TEnumerable
-{
-	const Integer='Integer';
-	const Float='Float';
-	const Date='Date';
-	const String='String';
-}
-
+<?php

+/**

+ * TBaseValidator class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2005-2008 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ */

+

+/**

+ * Using TLabel class

+ */

+Prado::using('System.Web.UI.WebControls.TLabel');

+

+/**

+ * TBaseValidator class

+ *

+ * TBaseValidator serves as the base class for validator controls.

+ *

+ * Validation is performed when a postback control, such as a TButton, a TLinkButton

+ * or a TTextBox (under AutoPostBack mode) is submitting the page and

+ * its <b>CausesValidation</b> property is true.

+ * You can also manually perform validation by calling {@link TPage::validate()}.

+ * The input control to be validated is specified by {@link setControlToValidate ControlToValidate}.

+ *

+ * Validator controls always validate the associated input control on the serve side.

+ * In addition, if {@link getEnableClientScript EnableClientScript} is true,

+ * validation will also be performed on the client-side using javascript.

+ * Client-side validation will validate user input before it is sent to the server.

+ * The form data will not be submitted if any error is detected. This avoids

+ * the round-trip of information necessary for server-side validation.

+ *

+ * You can use multiple validator controls to validate a single input control,

+ * each responsible for validating against a different criteria.

+ * For example, on a user registration form, you may want to make sure the user

+ * enters a value in the username text box, and the input must consist of only word

+ * characters. You can use a {@link TRequiredFieldValidator} to ensure the input

+ * of username and a {@link TRegularExpressionValidator} to ensure the proper input.

+ *

+ * If an input control fails validation, the text specified by the {@link setErrorMessage ErrorMessage}

+ * property is displayed in the validation control. However, if the {@link setText Text}

+ * property is set, it will be displayed instead. If both {@link setErrorMessage ErrorMessage}

+ * and {@link setText Text} are empty, the body content of the validator will

+ * be displayed. Error display is controlled by {@link setDisplay Display} property.

+ *

+ * You can also customized the client-side behaviour by adding javascript

+ * code to the subproperties of the {@link getClientSide ClientSide}

+ * property. See quickstart documentation for further details.

+ *

+ * You can also place a {@link TValidationSummary} control on a page to display error messages

+ * from the validators together. In this case, only the {@link setErrorMessage ErrorMessage}

+ * property of the validators will be displayed in the {@link TValidationSummary} control.

+ *

+ * Validators can be partitioned into validation groups by setting their

+ * {@link setValidationGroup ValidationGroup} property. If the control causing the

+ * validation also sets its ValidationGroup property, only those validators having

+ * the same ValidationGroup value will do input validation.

+ *

+ * Note, the {@link TPage::getIsValid IsValid} property of the current {@link TPage}

+ * instance will be automatically updated by the validation process which occurs

+ * after {@link TPage::onLoad onLoad} of {@link TPage} and before the postback events.

+ * Therefore, if you use the {@link TPage::getIsValid()} property in

+ * the {@link TPage::onLoad()} method, you must first explicitly call

+ * the {@link TPage::validate()} method.

+ *

+ * <b>Notes to Inheritors</b>  When you inherit from TBaseValidator, you must

+ * override the method {@link evaluateIsValid}.

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ * @since 3.0

+ */

+abstract class TBaseValidator extends TLabel implements IValidator

+{

+	/**

+	 * @var boolean whether the validation succeeds

+	 */

+	private $_isValid=true;

+	/**

+	 * @var boolean whether the validator has been registered with the page

+	 */

+	private $_registered=false;

+	/**

+	 * @var TValidatorClientSide validator client-script options.

+	 */

+	private $_clientSide;

+	/**

+	 * Controls for which the client-side validation3.js file needs to handle

+	 * them specially.

+	 * @var array list of control class names

+	 */

+	private static $_clientClass = array('THtmlArea', 'TDatePicker', 'TListBox', 'TCheckBoxList');

+

+	/**

+	 * Constructor.

+	 * This method sets the foreground color to red.

+	 */

+	public function __construct()

+	{

+		parent::__construct();

+		$this->setForeColor('red');

+	}

+

+	/**

+	 * Registers the validator with page.

+	 * @param mixed event parameter

+	 */

+	public function onInit($param)

+	{

+		parent::onInit($param);

+		$this->getPage()->getValidators()->add($this);

+		$this->_registered=true;

+	}

+

+	/**

+	 * Unregisters the validator from page.

+	 * @param mixed event parameter

+	 */

+	public function onUnload($param)

+	{

+		if($this->_registered && ($page=$this->getPage())!==null)

+			$page->getValidators()->remove($this);

+		$this->_registered=false;

+		parent::onUnload($param);

+	}

+

+	/**

+	 * Adds attributes to renderer. Calls parent implementation and renders the

+	 * client control scripts.

+	 * @param THtmlWriter the renderer

+	 */

+	protected function addAttributesToRender($writer)

+	{

+		$display=$this->getDisplay();

+		$visible=$this->getEnabled(true) && !$this->getIsValid();

+		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))

+			$writer->addStyleAttribute('display','none');

+		else if(!$visible)

+			$writer->addStyleAttribute('visibility','hidden');

+		$writer->addAttribute('id',$this->getClientID());

+		parent::addAttributesToRender($writer);

+		$this->renderClientControlScript($writer);

+	}

+

+	/**

+	 * Returns an array of javascript validator options.

+	 * @return array javascript validator options.

+	 */

+	protected function getClientScriptOptions()

+	{

+		$control = $this->getValidationTarget();

+		$options['ID'] = $this->getClientID();

+		$options['FormID'] = $this->getPage()->getForm()->getClientID();

+		$options['Display'] = $this->getDisplay();

+		$options['ErrorMessage'] = $this->getErrorMessage();

+		if($this->getFocusOnError())

+		{

+			$options['FocusOnError'] = $this->getFocusOnError();

+			$options['FocusElementID'] = $this->getFocusElementID();

+		}

+		$options['ValidationGroup'] = $this->getValidationGroup();

+		$options['ControlToValidate'] = $control->getClientID();

+		$options['ControlCssClass'] = $this->getControlCssClass();

+

+		$options['ControlType'] = $this->getClientControlClass($control);

+

+		//get date format from date picker target control

+		if($control instanceof TDatePicker)

+			$options['DateFormat'] = $control->getDateFormat();

+

+		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());

+

+		return $options;

+	}

+

+	/**

+	 * Gets the Control type for client-side validation. If new cases exists in

+	 * TBaseValidator::$_clientClass, be sure to update the corresponding

+	 * "Javascript/validation3.js" file as well.

+	 * @param TControl control to validate.

+	 * @return string control type for client-side validation.

+	 */

+	private function getClientControlClass($control)

+	{

+		foreach(self::$_clientClass as $type)

+			if($control instanceof $type)

+				return $type;

+		return get_class($control);

+	}

+

+	/**

+	 * Gets the TValidatorClientSide that allows modification of the client-

+	 * side validator events.

+	 *

+	 * The client-side validator supports the following events.

+	 * # <tt>OnValidate</tt> -- raised before client-side validation is

+	 * executed.

+	 * # <tt>OnValidationSuccess</tt> -- raised after client-side validation is completed

+	 * and is successfull, overrides default validator error messages updates.

+	 * # <tt>OnValidationError</tt> -- raised after client-side validation is completed

+	 * and failed, overrides default validator error message updates.

+	 *

+	 * You can attach custom javascript code to each of these events

+	 *

+	 * @return TValidatorClientSide javascript validator event options.

+	 */

+	public function getClientSide()

+	{

+		if($this->_clientSide===null)

+			$this->_clientSide = $this->createClientSide();

+		return $this->_clientSide;

+	}

+

+	/**

+	 * @return TValidatorClientSide javascript validator event options.

+	 */

+	protected function createClientSide()

+	{

+		return new TValidatorClientSide;

+	}

+

+	/**

+	 * Renders the javascript code to the end script.

+	 * If you override this method, be sure to call the parent implementation

+	 * so that the event handlers can be invoked.

+	 * @param THtmlWriter the renderer

+	 */

+	public function renderClientControlScript($writer)

+	{

+		$scripts = $this->getPage()->getClientScript();

+		$formID=$this->getPage()->getForm()->getClientID();

+		$scriptKey = "TBaseValidator:$formID";

+		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))

+		{

+			$manager['FormID'] = $formID;

+			$options = TJavaScript::encode($manager);

+			$scripts->registerPradoScript('validator');

+			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");

+		}

+		if($this->getEnableClientScript() & $this->getEnabled(true))

+			$this->registerClientScriptValidator();

+	}

+

+	/**

+	 * Override parent implementation to update the control CSS Class before 

+	 * the validated control is rendered 

+	 */

+	public function onPreRender ($param)

+	{

+		parent::onPreRender($param);

+		$this->updateControlCssClass();

+	}

+	

+	/**

+	 * Update the ControlToValidate component's css class depending

+	 * if the ControlCssClass property is set, and whether this is valid.

+	 * @return boolean true if change, false otherwise.

+	 */

+	protected function updateControlCssClass()

+	{

+		if(($cssClass=$this->getControlCssClass())!=='')

+		{

+			$control=$this->getValidationTarget();

+			if($control instanceof TWebControl)

+			{

+				$class = preg_replace ('/ '.preg_quote($cssClass).'/', '',$control->getCssClass());

+				if(!$this->getIsValid())

+				{

+					$class .= ' '.$cssClass;

+					$control->setCssClass($class);

+				} elseif ($control->getIsValid())

+					$control->setCssClass($class);

+			}

+		}

+	}

+

+	/**

+	 * Registers the individual validator client-side javascript code.

+	 */

+	protected function registerClientScriptValidator()

+	{

+		$key = 'prado:'.$this->getClientID();

+		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))

+		{

+			$options = TJavaScript::encode($this->getClientScriptOptions());

+			$script = 'new '.$this->getClientClassName().'('.$options.');';

+			$this->getPage()->getClientScript()->registerEndScript($key, $script);

+		}

+	}

+

+	/**

+	 * Gets the name of the javascript class responsible for performing validation for this control.

+	 * This method overrides the parent implementation.

+	 * @return string the javascript class name

+	 */

+	abstract protected function getClientClassName();

+

+	/**

+	 * This method overrides the parent implementation to forbid setting ForControl.

+	 * @param string the associated control ID

+	 * @throws TNotSupportedException whenever this method is called

+	 */

+	public function setForControl($value)

+	{

+		throw new TNotSupportedException('basevalidator_forcontrol_unsupported',get_class($this));

+	}

+

+	/**

+	 * This method overrides parent's implementation by setting {@link setIsValid IsValid} to true if disabled.

+	 * @param boolean whether the validator is enabled.

+	 */

+	public function setEnabled($value)

+	{

+		$value=TPropertyValue::ensureBoolean($value);

+		parent::setEnabled($value);

+		if(!$value)

+			$this->_isValid=true;

+	}

+

+	/**

+	 * @return TValidatorDisplayStyle the style of displaying the error message. Defaults to TValidatorDisplayStyle::Fixed.

+	 */

+	public function getDisplay()

+	{

+		return $this->getViewState('Display',TValidatorDisplayStyle::Fixed);

+	}

+

+	/**

+	 * @param TValidatorDisplayStyle the style of displaying the error message

+	 */

+	public function setDisplay($value)

+	{

+		$this->setViewState('Display',TPropertyValue::ensureEnum($value,'TValidatorDisplayStyle'),TValidatorDisplayStyle::Fixed);

+	}

+

+	/**

+	 * @return boolean whether client-side validation is enabled.

+	 */

+	public function getEnableClientScript()

+	{

+		return $this->getViewState('EnableClientScript',true);

+	}

+

+	/**

+	 * @param boolean whether client-side validation is enabled.

+	 */

+	public function setEnableClientScript($value)

+	{

+		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);

+	}

+

+	/**

+	 * @return string the text for the error message.

+	 */

+	public function getErrorMessage()

+	{

+		return $this->getViewState('ErrorMessage','');

+	}

+

+	/**

+	 * Sets the text for the error message.

+	 * @param string the error message

+	 */

+	public function setErrorMessage($value)

+	{

+		$this->setViewState('ErrorMessage',$value,'');

+	}

+

+	/**

+	 * @return string the ID path of the input control to validate

+	 */

+	public function getControlToValidate()

+	{

+		return $this->getViewState('ControlToValidate','');

+	}

+

+	/**

+	 * Sets the ID path of the input control to validate.

+	 * The ID path is the dot-connected IDs of the controls reaching from

+	 * the validator's naming container to the target control.

+	 * @param string the ID path

+	 */

+	public function setControlToValidate($value)

+	{

+		$this->setViewState('ControlToValidate',$value,'');

+	}

+

+	/**

+	 * @return boolean whether to set focus at the validating place if the validation fails. Defaults to false.

+	 */

+	public function getFocusOnError()

+	{

+		return $this->getViewState('FocusOnError',false);

+	}

+

+	/**

+	 * @param boolean whether to set focus at the validating place if the validation fails

+	 */

+	public function setFocusOnError($value)

+	{

+		$this->setViewState('FocusOnError',TPropertyValue::ensureBoolean($value),false);

+	}

+

+	/**

+	 * Gets the ID of the HTML element that will receive focus if validation fails and {@link getFocusOnError FocusOnError} is true.

+	 * Defaults to the client ID of the {@link getControlToValidate ControlToValidate}.

+	 * @return string the ID of the HTML element to receive focus

+	 */

+	public function getFocusElementID()

+	{

+		if(($id=$this->getViewState('FocusElementID',''))==='')

+			$id=$this->getValidationTarget()->getClientID();

+		return $id;

+	}

+

+	/**

+	 * Sets the ID of the HTML element that will receive focus if validation fails and {@link getFocusOnError FocusOnError} is true.

+	 * @param string the ID of the HTML element to receive focus

+	 */

+	public function setFocusElementID($value)

+	{

+		$this->setViewState('FocusElementID', $value, '');

+	}

+

+	/**

+	 * @return string the group which this validator belongs to

+	 */

+	public function getValidationGroup()

+	{

+		return $this->getViewState('ValidationGroup','');

+	}

+

+	/**

+	 * @param string the group which this validator belongs to

+	 */

+	public function setValidationGroup($value)

+	{

+		$this->setViewState('ValidationGroup',$value,'');

+	}

+

+	/**

+	 * @return boolean whether the validation succeeds

+	 */

+	public function getIsValid()

+	{

+		return $this->_isValid;

+	}

+

+	/**

+	 * Sets the value indicating whether the validation succeeds

+	 * @param boolean whether the validation succeeds

+	 */

+	public function setIsValid($value)

+	{

+		$this->_isValid=TPropertyValue::ensureBoolean($value);

+	}

+

+	/**

+	 * @return TControl control to be validated. Null if no control is found.

+	 * @throws TConfigurationException if {@link getControlToValidate

+	 * ControlToValidate} is empty or does not point to a valid control

+	 */

+	protected function getValidationTarget()

+	{

+		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)

+			return $control;

+		else

+			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));

+	}

+

+	/**

+	 * Retrieves the property value of the control being validated.

+	 * @param TControl control being validated

+	 * @return string property value to be validated

+	 * @throws TInvalidDataTypeException if the control to be validated does not implement {@link IValidatable}.

+	 */

+	protected function getValidationValue($control)

+	{

+		if($control instanceof IValidatable)

+			return $control->getValidationPropertyValue();

+		else

+			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));

+	}

+

+	/**

+	 * Validates the specified control.

+	 * Do not override this method. Override {@link evaluateIsValid} instead.

+	 * @return boolean whether the validation succeeds

+	 */

+	public function validate()

+	{

+		$this->setIsValid(true);

+		$this->onValidate();

+		if($this->getVisible(true) && $this->getEnabled(true))

+		{			

+			// if the target is not a disabled web control

+			if(($target=$this->getValidationTarget())!==null && !($target instanceof TWebControl && !$target->getEnabled(true)))

+			{

+				if($this->evaluateIsValid())

+				{

+					$this->setIsValid(true);

+					$this->onValidationSuccess();

+				}

+				else

+				{

+					$target->setIsValid(false);

+					$this->setIsValid(false);

+					$this->onValidationError();

+				}

+			}

+			else

+			{

+				$this->evaluateIsValid();

+				$this->setIsValid(true);

+				$this->onValidationSuccess();

+			}

+		}

+		return $this->getIsValid();

+	}

+

+	/**

+	 * @return string the css class that is applied to the control being validated in case the validation fails

+	 */

+	public function getControlCssClass()

+	{

+		return $this->getViewState('ControlCssClass','');

+	}

+

+	/**

+	 * @param string the css class that is applied to the control being validated in case the validation fails

+	 */

+	public function setControlCssClass($value)

+	{

+		$this->setViewState('ControlCssClass',$value,'');

+	}

+

+	/**

+	 * This is the major method for validation.

+	 * Derived classes should implement this method to provide customized validation.

+	 * @return boolean whether the validation succeeds

+	 */

+	abstract protected function evaluateIsValid();

+

+	/**

+	 * This event is raised when the validator succeeds in validation.

+	 */

+	public function onValidationSuccess()

+	{

+		$this->raiseEvent('OnValidationSuccess',$this,null);

+	}

+

+	/**

+	 * This event is raised when the validator fails in validation.

+	 */

+	public function onValidationError()

+	{

+		$this->raiseEvent('OnValidationError',$this,null);

+	}

+

+	/**

+	 * This event is raised right before the validator starts to perform validation.

+	 * You may use this event to change the behavior of validation.

+	 * For example, you may disable the validator if certain condition is satisfied.

+	 * Note, the event will NOT be raised if the validator is invisible.

+	 */

+	public function onValidate()

+	{

+		$this->raiseEvent('OnValidate',$this,null);

+	}

+

+	/**

+	 * Renders the validator control.

+	 * @param THtmlWriter writer for the rendering purpose

+	 */

+	public function renderContents($writer)

+	{

+		if(($text=$this->getText())!=='')

+			$writer->write($text);

+		else if(($text=$this->getErrorMessage())!=='')

+			$writer->write($text);

+		else

+			parent::renderContents($writer);

+	}

+}

+

+/**

+ * TValidatorClientSide class.

+ *

+ * Client-side validator events can be modified through the {@link

+ * TBaseValidator::getClientSide ClientSide} property of a validator. The

+ * subproperties of ClientSide are those of the TValidatorClientSide

+ * properties. The client-side validator supports the following events.

+ *

+ * The <tt>OnValidate</tt> event is raise before the validator validation

+ * functions are called.

+ *

+ * The <tt>OnValidationSuccess</tt> event is raised after the validator has successfully

+ * validate the control.

+ *

+ * The <tt>OnValidationError</tt> event is raised after the validator fails validation.

+ *

+ * See the quickstart documentation for further details.

+ *

+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ * @since 3.0

+ */

+class TValidatorClientSide extends TClientSideOptions

+{

+	/**

+	 * @return string javascript code for client-side OnValidate event.

+	 */

+	public function getOnValidate()

+	{

+		return $this->getOption('OnValidate');

+	}

+

+	/**

+	 * Client-side OnValidate validator event is raise before the validators

+	 * validation functions are called.

+	 * @param string javascript code for client-side OnValidate event.

+	 */

+	public function setOnValidate($javascript)

+	{

+		$this->setFunction('OnValidate', $javascript);

+	}

+

+	/**

+	 * Client-side OnSuccess event is raise after validation is successfull.

+	 * This will override the default client-side validator behaviour.

+	 * @param string javascript code for client-side OnSuccess event.

+	 */

+	public function setOnValidationSuccess($javascript)

+	{

+		$this->setFunction('OnValidationSuccess', $javascript);

+	}

+

+	/**

+	 * @return string javascript code for client-side OnSuccess event.

+	 */

+	public function getOnValidationSuccess()

+	{

+		return $this->getOption('OnValidationSuccess');

+	}

+

+	/**

+	 * Client-side OnError event is raised after validation failure.

+	 * This will override the default client-side validator behaviour.

+	 * @param string javascript code for client-side OnError event.

+	 */

+	public function setOnValidationError($javascript)

+	{

+		$this->setFunction('OnValidationError', $javascript);

+	}

+

+	/**

+	 * @return string javascript code for client-side OnError event.

+	 */

+	public function getOnValidationError()

+	{

+		return $this->getOption('OnValidationError');

+	}

+

+	/**

+	 * @param boolean true to revalidate when the control to validate changes value.

+	 */

+	public function setObserveChanges($value)

+	{

+		$this->setOption('ObserveChanges', TPropertyValue::ensureBoolean($value));

+	}

+

+	/**

+	 * @return boolean true to observe changes.

+	 */

+	public function getObserveChanges()

+	{

+		$changes = $this->getOption('ObserveChanges');

+		return ($changes===null) ? true : $changes;

+	}

+}

+

+

+/**

+ * TValidatorDisplayStyle class.

+ * TValidatorDisplayStyle defines the enumerable type for the possible styles

+ * that a validator control can display the error message.

+ *

+ * The following enumerable values are defined:

+ * - None: the error message is not displayed

+ * - Dynamic: the error message dynamically appears when the validator fails validation

+ * - Fixed: Similar to Dynamic except that the error message physically occupies the page layout (even though it may not be visible)

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ * @since 3.0.4

+ */

+class TValidatorDisplayStyle extends TEnumerable

+{

+	const None='None';

+	const Dynamic='Dynamic';

+	const Fixed='Fixed';

+}

+

+/**

+ * TValidationDataType class.

+ * TValidationDataType defines the enumerable type for the possible data types that

+ * a comparison validator can validate upon.

+ *

+ * The following enumerable values are defined:

+ * - Integer

+ * - Float

+ * - Date

+ * - String

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ * @since 3.0.4

+ */

+class TValidationDataType extends TEnumerable

+{

+	const Integer='Integer';

+	const Float='Float';

+	const Date='Date';

+	const String='String';

+}

+

diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index 67a4ccfe..0fc7eef4 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -112,7 +112,7 @@ class TColorPicker extends TTextBox
 	 */

 	public function getClientSide()

 	{

-		if(is_null($this->_clientSide))

+		if($this->_clientSide===null)

 			$this->_clientSide = $this->createClientSide();

 		return $this->_clientSide;

 	}

diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 770099eb..e678b046 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -366,7 +366,7 @@ class TDatePicker extends TTextBox
 	 */

 	public function getClientSide()

 	{

-		if(is_null($this->_clientScript))

+		if($this->_clientScript===null)

 			$this->_clientScript = $this->createClientScript();

 		return $this->_clientScript;

 	}

@@ -529,7 +529,7 @@ class TDatePicker extends TTextBox
 		$options['PositionMode'] = $this->getPositionMode();

 

 		$options = array_merge($options, $this->getCulturalOptions());

-		if(!is_null($this->_clientScript))

+		if($this->_clientScript!==null)

 			$options = array_merge($options,

 				$this->_clientScript->getOptions()->toArray());

 		return $options;

@@ -610,7 +610,7 @@ class TDatePicker extends TTextBox
 	{

 		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',

 						$this->getDateFormat());

-		return !is_null($formatter->getDayPattern());

+		return ($formatter->getDayPattern()!==null);

 	}

 

 	/**

diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 7e8bc370..ce789f38 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -451,10 +451,10 @@ class THtmlArea extends TTextBox
 	protected function getLanguageSuffix($culture)

 	{

 		$app = $this->getApplication()->getGlobalization();

-		if(empty($culture) && !is_null($app))

+		if(empty($culture) && ($app!==null))

 			$culture = $app->getCulture();

 		$variants = array();

-		if(!is_null($app))

+		if($app!==null)

 			$variants = $app->getCultureVariants($culture);

 

 		foreach($variants as $variant)

diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index 55b272c6..c69b387e 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -913,7 +913,7 @@ class TListItemCollection extends TList
 	protected function createNewListItem($text=null)

 	{

 		$item =  new TListItem;

-		if(!is_null($text))

+		if($text!==null)

 			$item->setText($text);

 		return $item;

 	}

diff --git a/framework/Web/UI/WebControls/TStyle.php b/framework/Web/UI/WebControls/TStyle.php
index 7cb1d8c8..1b94cc8e 100644
--- a/framework/Web/UI/WebControls/TStyle.php
+++ b/framework/Web/UI/WebControls/TStyle.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -63,7 +63,7 @@ class TStyle extends TComponent
 	 */

 	public function __clone()

 	{

-		if(!is_null($this->_font))

+		if($this->_font!==null)

 			$this->_font = clone($this->_font);

 	}

 

@@ -157,7 +157,7 @@ class TStyle extends TComponent
 	 */

 	public function hasCssClass()

 	{

-		return !is_null($this->_class);

+		return ($this->_class!==null);

 	}

 

 	/**

diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index 95679e15..e60a40db 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -261,7 +261,7 @@ class TValidationSummary extends TWebControl
 		$options['ValidationGroup'] =  $this->getValidationGroup();

 		$options['Display'] = $this->getDisplay();

 

-		if(!is_null($this->_clientSide))

+		if($this->_clientSide!==null)

 			$options = array_merge($options,$this->_clientSide->getOptions()->toArray());

 

 		return $options;

@@ -273,7 +273,7 @@ class TValidationSummary extends TWebControl
 	 */

 	public function getClientSide()

 	{

-		if(is_null($this->_clientSide))

+		if($this->_clientSide===null)

 			$this->_clientSide = $this->createClientScript();

 		return $this->_clientSide;

 	}