This commit is contained in:
Qiang Xue
2011-07-22 23:08:40 -04:00
parent 0c7a75bef7
commit af593aad5e
16 changed files with 244 additions and 357 deletions

View File

@@ -1,6 +1,6 @@
<?php
/**
* CStringValidator class file.
* StringValidator class file.
*
* @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008-2012 Yii Software LLC
@@ -10,16 +10,14 @@
namespace yii\validators;
/**
* CStringValidator validates that the attribute value is of certain length.
* StringValidator validates that the attribute value is of certain length.
*
* Note, this validator should only be used with string-typed attributes.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CStringValidator.php 3148 2011-03-31 21:44:00Z alexander.makarow $
* @package system.validators
* @since 1.0
* @since 2.0
*/
class CStringValidator extends Validator
class StringValidator extends Validator
{
/**
* @var integer maximum length. Defaults to null, meaning no maximum limit.
@@ -34,26 +32,33 @@ class CStringValidator extends Validator
*/
public $is;
/**
* @var string user-defined error message used when the value is too short.
* @var string user-defined error message used when the value is not a string
*/
public $message;
/**
* @var string user-defined error message used when the length of the value is smaller than [[min]].
*/
public $tooShort;
/**
* @var string user-defined error message used when the value is too long.
* @var string user-defined error message used when the length of the value is greater than [[max]].
*/
public $tooLong;
/**
* @var string user-defined error message used when the length of the value is not equal to [[is]].
*/
public $notEqual;
/**
* @var boolean whether the attribute value can be null or empty. Defaults to true,
* meaning that if the attribute is empty, it is considered valid.
*/
public $allowEmpty = true;
/**
* @var string the encoding of the string value to be validated (e.g. 'UTF-8').
* @var mixed the encoding of the string value to be validated (e.g. 'UTF-8').
* This property is used only when mbstring PHP extension is enabled.
* The value of this property will be used as the 2nd parameter of the
* mb_strlen() function. If this property is not set, the application charset
* will be used.
* If this property is set false, then strlen() will be used even if mbstring is enabled.
* @since 1.1.1
* will be used. If this property is set false, then strlen() will be used even
* if mbstring is enabled.
*/
public $encoding;
@@ -66,27 +71,33 @@ class CStringValidator extends Validator
public function validateAttribute($object, $attribute)
{
$value = $object->$attribute;
if ($this->allowEmpty && $this->isEmpty($value))
if ($this->allowEmpty && $this->isEmpty($value)) {
return;
}
if (function_exists('mb_strlen') && $this->encoding !== false)
if (!is_string($value)) {
$message = $this->message !== null ? $this->message : Yii::t('yii', '{attribute} must be a string.');
$this->addError($object, $attribute, $message);
return;
}
if (function_exists('mb_strlen') && $this->encoding !== false) {
$length = mb_strlen($value, $this->encoding ? $this->encoding : Yii::app()->charset);
else
}
else {
$length = strlen($value);
}
if ($this->min !== null && $length < $this->min)
{
if ($this->min !== null && $length < $this->min) {
$message = $this->tooShort !== null ? $this->tooShort : Yii::t('yii', '{attribute} is too short (minimum is {min} characters).');
$this->addError($object, $attribute, $message, array('{min}' => $this->min));
}
if ($this->max !== null && $length > $this->max)
{
if ($this->max !== null && $length > $this->max) {
$message = $this->tooLong !== null ? $this->tooLong : Yii::t('yii', '{attribute} is too long (maximum is {max} characters).');
$this->addError($object, $attribute, $message, array('{max}' => $this->max));
}
if ($this->is !== null && $length !== $this->is)
{
$message = $this->message !== null ? $this->message : Yii::t('yii', '{attribute} is of the wrong length (should be {length} characters).');
if ($this->is !== null && $length !== $this->is) {
$message = $this->notEqual !== null ? $this->notEqual : Yii::t('yii', '{attribute} is of the wrong length (should be {length} characters).');
$this->addError($object, $attribute, $message, array('{length}' => $this->is));
}
}
@@ -96,62 +107,63 @@ class CStringValidator extends Validator
* @param \yii\base\Model $object the data object being validated
* @param string $attribute the name of the attribute to be validated.
* @return string the client-side validation script.
* @see CActiveForm::enableClientValidation
* @since 1.1.7
*/
public function clientValidateAttribute($object, $attribute)
{
$label = $object->getAttributeLabel($attribute);
$value = $object->$attribute;
if (($message = $this->message) === null)
$message = Yii::t('yii', '{attribute} is of the wrong length (should be {length} characters).');
$message = strtr($message, array(
if (($notEqual = $this->notEqual) === null) {
$notEqual = Yii::t('yii', '{attribute} is of the wrong length (should be {length} characters).');
}
$notEqual = strtr($notEqual, array(
'{attribute}' => $label,
'{value}' => $value,
'{length}' => $this->is,
));
if (($tooShort = $this->tooShort) === null)
if (($tooShort = $this->tooShort) === null) {
$tooShort = Yii::t('yii', '{attribute} is too short (minimum is {min} characters).');
}
$tooShort = strtr($tooShort, array(
'{attribute}' => $label,
'{value}' => $value,
'{min}' => $this->min,
));
if (($tooLong = $this->tooLong) === null)
if (($tooLong = $this->tooLong) === null) {
$tooLong = Yii::t('yii', '{attribute} is too long (maximum is {max} characters).');
}
$tooLong = strtr($tooLong, array(
'{attribute}' => $label,
'{value}' => $value,
'{max}' => $this->max,
));
$js = '';
if ($this->min !== null)
{
if ($this->min !== null) {
$js .= "
if(value.length< {$this->min}) {
messages.push(" . json_encode($tooShort) . ");
}
";
}
if ($this->max !== null)
{
if ($this->max !== null) {
$js .= "
if(value.length> {$this->max}) {
messages.push(" . json_encode($tooLong) . ");
}
";
}
if ($this->is !== null)
{
if ($this->is !== null) {
$js .= "
if(value.length!= {$this->is}) {
messages.push(" . json_encode($message) . ");
messages.push(" . json_encode($notEqual) . ");
}
";
}
if ($this->allowEmpty)
{
if ($this->allowEmpty) {
$js = "
if($.trim(value)!='') {
$js