diff --git a/application/forms.class.inc.php b/application/forms.class.inc.php index e8cbe785d..205ed056b 100644 --- a/application/forms.class.inc.php +++ b/application/forms.class.inc.php @@ -881,7 +881,7 @@ class DesignerTextField extends DesignerFormField $this->sValidationPattern = $sValidationPattern; } - public function SetForbiddenValues($aValues, $sExplain) + public function SetForbiddenValues($aValues, $sExplain, $bCaseSensitive = true) { $aForbiddenValues = $aValues; @@ -893,7 +893,7 @@ class DesignerTextField extends DesignerFormField } - $this->aForbiddenValues[] = array('values' => $aForbiddenValues, 'message' => $sExplain); + $this->aForbiddenValues[] = array('values' => $aForbiddenValues, 'message' => $sExplain, 'case_sensitive' => $bCaseSensitive); } public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog') diff --git a/js/property_field.js b/js/property_field.js index fc4ce76a4..64c484113 100644 --- a/js/property_field.js +++ b/js/property_field.js @@ -487,11 +487,24 @@ function ValidateWithPattern(sFieldId, bMandatory, sPattern, sFormId, aForbidden { for(j in aForbiddenValues[i].values) { - if (aForbiddenValues[i].values[j] == currentVal) + if (aForbiddenValues[i].case_sensitive) { - bValid = false; - sMessage = aForbiddenValues[i].message; - break; + if (aForbiddenValues[i].values[j] == currentVal) + { + bValid = false; + sMessage = aForbiddenValues[i].message; + break; + } + } + else + { + if (aForbiddenValues[i].values[j].toUpperCase() == currentVal.toUpperCase()) + { + bValid = false; + sMessage = aForbiddenValues[i].message; + break; + } + } } }