Merge from 3.0 branch till 1305.

5 files changed, 159 insertions, 33 deletions

diff --git a/framework/Web/UI/WebControls/TDropDownList.php b/framework/Web/UI/WebControls/TDropDownList.php
index 860fe69c..04f3780c 100644
--- a/framework/Web/UI/WebControls/TDropDownList.php
+++ b/framework/Web/UI/WebControls/TDropDownList.php
@@ -21,6 +21,13 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * TDropDownList displays a dropdown list on a Web page.

  * It inherits all properties and events from {@link TListControl}.

  *

+ * Since v3.0.3, TDropDownList starts to support optgroup. To specify an option group for

+ * a list item, set a Group attribute with it,

+ * <code>

+ *  $listitem->Attributes->Group="Group Name";

+ *  // or <com:TListItem Attributes.Group="Group Name" .../> in template

+ * </code>

+ *

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

  * @version $Revision: $  $Date: $

  * @package System.Web.UI.WebControls

diff --git a/framework/Web/UI/WebControls/TListBox.php b/framework/Web/UI/WebControls/TListBox.php
index 972ebbcb..79b73fb6 100644
--- a/framework/Web/UI/WebControls/TListBox.php
+++ b/framework/Web/UI/WebControls/TListBox.php
@@ -24,6 +24,13 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * The property {@link setRows Rows} specifies how many rows of options are visible

  * at a time. See {@link TListControl} for inherited properties.

  *

+ * Since v3.0.3, TListBox starts to support optgroup. To specify an option group for

+ * a list item, set a Group attribute with it,

+ * <code>

+ *  $listitem->Attributes->Group="Group Name";

+ *  // or <com:TListItem Attributes.Group="Group Name" .../> in template

+ * </code>

+ *

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

  * @version $Revision: $  $Date: $

  * @package System.Web.UI.WebControls

diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index bd883590..8c1537b0 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -643,24 +643,53 @@ abstract class TListControl extends TDataBoundControl
 		if($this->_items)

 		{

 			$writer->writeLine();

+			$previousGroup=null;

 			foreach($this->_items as $item)

 			{

 				if($item->getEnabled())

 				{

-					if($item->getSelected())

-						$writer->addAttribute('selected','selected');

-					$writer->addAttribute('value',$item->getValue());

 					if($item->getHasAttributes())

 					{

+						$group=$item->getAttributes()->remove('Group');

+						if($group!==$previousGroup)

+						{

+							if($previousGroup!==null)

+							{

+								$writer->renderEndTag();

+								$writer->writeLine();

+								$previousGroup=null;

+							}

+							if($group!==null)

+							{

+								$writer->addAttribute('label',$group);

+								$writer->renderBeginTag('optgroup');

+								$writer->writeLine();

+								$previousGroup=$group;

+							}

+						}

 						foreach($item->getAttributes() as $name=>$value)

 							$writer->addAttribute($name,$value);

 					}

+					else if($previousGroup!==null)

+					{

+						$writer->renderEndTag();

+						$writer->writeLine();

+						$previousGroup=null;

+					}

+					if($item->getSelected())

+						$writer->addAttribute('selected','selected');

+					$writer->addAttribute('value',$item->getValue());

 					$writer->renderBeginTag('option');

 					$writer->write(THttpUtility::htmlEncode($item->getText()));

 					$writer->renderEndTag();

 					$writer->writeLine();

 				}

 			}

+			if($previousGroup!==null)

+			{

+				$writer->renderEndTag();

+				$writer->writeLine();

+			}

 		}

 	}

 

diff --git a/framework/Web/UI/WebControls/TRadioButton.php b/framework/Web/UI/WebControls/TRadioButton.php
index 244244cb..9b6786aa 100644
--- a/framework/Web/UI/WebControls/TRadioButton.php
+++ b/framework/Web/UI/WebControls/TRadioButton.php
@@ -68,6 +68,10 @@ class TRadioButton extends TCheckBox
 	 */

 	private $_globalID;

 	/**

+	 * @var string previous UniqueID (used to calculate UniqueGroup)

+	 */

+	private $_previousUniqueID=null;

+	/**

 	 * @var string the name used to fetch radiobutton post data

 	 */

 	private $_uniqueGroupName=null;

@@ -140,12 +144,64 @@ class TRadioButton extends TCheckBox
 	}

 

 	/**

-	 * Sets the name of the group that the radio button belongs to

+	 * Sets the name of the group that the radio button belongs to.

+	 * The group is unique among the control's naming container.

 	 * @param string the group name

+	 * @see setUniqueGroupName

 	 */

 	public function setGroupName($value)

 	{

 		$this->setViewState('GroupName',$value,'');

+		$this->_uniqueGroupName=null;

+	}

+

+	/**

+	 * @return string the name used to fetch radiobutton post data

+	 */

+	public function getUniqueGroupName()

+	{

+		if(($groupName=$this->getViewState('UniqueGroupName',''))!=='')

+			return $groupName;

+		else if(($uniqueID=$this->getUniqueID())!==$this->_previousUniqueID || $this->_uniqueGroupName===null)

+		{

+			$groupName=$this->getGroupName();

+			$this->_previousUniqueID=$uniqueID;

+			if($uniqueID!=='')

+			{

+				if(($pos=strrpos($uniqueID,TControl::ID_SEPARATOR))!==false)

+				{

+					if($groupName!=='')

+						$groupName=substr($uniqueID,0,$pos+1).$groupName;

+					else if($this->getNamingContainer() instanceof TRadioButtonList)

+						$groupName=substr($uniqueID,0,$pos);

+				}

+				if($groupName==='')

+					$groupName=$uniqueID;

+			}

+			$this->_uniqueGroupName=$groupName;

+		}

+		return $this->_uniqueGroupName;

+	}

+

+	/**

+	 * Sets the unique group name that the radio button belongs to.

+	 * A unique group is a radiobutton group unique among the whole page hierarchy,

+	 * while the {@link setGroupName GroupName} specifies a group that is unique

+	 * among the control's naming container only.

+	 * For example, each cell of a {@link TDataGrid} is a naming container.

+	 * If you specify {@link setGroupName GroupName} for a radiobutton in a cell,

+	 * it groups together radiobutton within a cell, but not the other, even though

+	 * they have the same {@link setGroupName GroupName}.

+	 * On the contratry, if {@link setUniqueGroupName UniqueGroupName} is used instead,

+	 * it will group all appropriate radio buttons on the whole page hierarchy.

+	 * Note, when both {@link setUniqueGroupName UniqueGroupName} and

+	 * {@link setGroupName GroupName}, the former takes precedence.

+	 * @param string the group name

+	 * @see setGroupName

+	 */

+	public function setUniqueGroupName($value)

+	{

+		$this->setViewState('UniqueGroupName',$value,'');

 	}

 

 	/**

@@ -178,32 +234,6 @@ class TRadioButton extends TCheckBox
 	}

 

 	/**

-	 * @return string the name used to fetch radiobutton post data

-	 */

-	private function getUniqueGroupName()

-	{

-		if($this->_uniqueGroupName===null)

-		{

-			$groupName=$this->getGroupName();

-			$uniqueID=$this->getUniqueID();

-			if($uniqueID!=='')

-			{

-				if(($pos=strrpos($uniqueID,TControl::ID_SEPARATOR))!==false)

-				{

-					if($groupName!=='')

-						$groupName=substr($uniqueID,0,$pos+1).$groupName;

-					else if($this->getNamingContainer() instanceof TRadioButtonList)

-						$groupName=substr($uniqueID,0,$pos);

-				}

-				if($groupName==='')

-					$groupName=$uniqueID;

-			}

-			$this->_uniqueGroupName=$groupName;

-		}

-		return $this->_uniqueGroupName;

-	}

-

-	/**

 	 * Renders a radiobutton input element.

 	 * @param THtmlWriter the writer for the rendering purpose

 	 * @param string checkbox id

diff --git a/framework/Web/UI/WebControls/TRangeValidator.php b/framework/Web/UI/WebControls/TRangeValidator.php
index 9d23eb5e..b54a1684 100644
--- a/framework/Web/UI/WebControls/TRangeValidator.php
+++ b/framework/Web/UI/WebControls/TRangeValidator.php
@@ -34,6 +34,13 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  *   by {@link TSimpleDateFormatter}. If the property is not set,

  *   the GNU date syntax is assumed.

  * - <b>String</b> A string data type.

+ * - <b>StringLength</b> check for string length.

+ * 

+ * The TRangeValidator allows a special DataType "StringLength" that

+ * can be used to verify minimum and maximum string length. The 

+ * {@link setCharset Charset} property can be used to force a particular 

+ * charset for comparison. Otherwise, the application charset is used and is

+ * defaulted as UTF-8.

  *

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

  * @version $Revision: $  $Date: $

@@ -96,13 +103,14 @@ class TRangeValidator extends TBaseValidator
 	}

 

 	/**

-	 * Sets the data type (Integer, Float, Date, String) that the values being

-	 * compared are converted to before the comparison is made.

+	 * Sets the data type (Integer, Float, Date, String, StringLength) that the

+	 * values being compared are converted to before the comparison is made.

 	 * @param string the data type

 	 */

 	public function setDataType($value)

 	{

-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'Integer','Float','Date','String'),'String');

+		$this->setViewState('DataType',TPropertyValue::ensureEnum(

+			$value,'Integer','Float','Date','String', 'StringLength'),'String');

 	}

 

 	/**

@@ -123,6 +131,22 @@ class TRangeValidator extends TBaseValidator
 	}

 

 	/**

+	 * @param string charset for string length comparison.

+	 */

+	public function setCharset($value)

+	{

+		$this->setViewState('Charset', $value, '');

+	}

+	

+	/**

+	 * @return string charset for string length comparison.

+	 */

+	public function getCharset()

+	{

+		return $this->getViewState('Charset', '');

+	}

+

+	/**

 	 * This method overrides the parent's implementation.

 	 * The validation succeeds if the input data is within the range.

 	 * The validation always succeeds if the input data is empty.

@@ -142,6 +166,8 @@ class TRangeValidator extends TBaseValidator
 				return $this->isValidFloat($value);

 			case 'Date':

 				return $this->isValidDate($value);

+			case 'StringLength':

+				return $this->isValidStringLength($value);

 			default:

 				return $this->isValidString($value);

 		}

@@ -238,6 +264,33 @@ class TRangeValidator extends TBaseValidator
 			$valid=$valid && (strcmp($value,$maxValue)<=0);

 		return $valid;

 	}

+	

+	/**

+	 * @param string string for comparision

+	 * @return boolean true if min and max string length are satisfied. 

+	 */

+	protected function isValidStringLength($value)

+	{

+		$minValue=$this->getMinValue();

+		$maxValue=$this->getMaxValue();

+

+		$valid=true;

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

+		if($charset==='')

+		{

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

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

+			if(!$charset)

+				$charset = 'UTF-8';

+		}

+		

+		$length = iconv_strlen($value, $charset);

+		if($minValue!=='')

+			$valid = $valid && $length >= intval($minValue);

+		if($maxValue!=='')

+			$valid = $valid && $length <= intval($maxValue);

+		return $valid;

+	}

 

 	/**

 	 * Returns an array of javascript validator options.