From d853520e462ccd90e6fd269a36f296e1858a2881 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sat, 5 Jul 2008 13:25:22 +0000
Subject: [PATCH] Fixes #5025, UTF8 signs are not treated correctly at form
 validation

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7320 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/validation.php                  |  15 +--
 cake/tests/cases/libs/validation.test.php | 145 ++++++++++++----------
 2 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index e73678232..094c5e62d 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -39,7 +39,7 @@
 	define('VALID_NUMBER', '/^[-+]?\\b[0-9]*\\.?[0-9]+\\b$/');
 /**
  * A valid email address.
- */ 
+ */
 	define('VALID_EMAIL', "/^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[a-z]{2,4}|museum|travel)$/i");
 /**
  * A valid year (1000-2999).
@@ -139,13 +139,8 @@ class Validation extends Object {
 		if (empty($_this->check) && $_this->check != '0') {
 			return false;
 		}
-
-		$_this->regex = '/[^\\dA-Z]/i';
-		if ($_this->_check() === true) {
-			return false;
-		} else {
-			return true;
-		}
+		$_this->regex = '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/mu';
+		return $_this->_check();
 	}
 /**
  * Checks that a string length is within s specified range.
@@ -556,7 +551,7 @@ class Validation extends Object {
 		// 	}
 		// 	return true;
 		// }
-		// 
+		//
 		// return preg_match('/[\w| |_]+\.[\w]+/', $check);
 	}
 /**
@@ -911,4 +906,4 @@ class Validation extends Object {
 		$_this->type = null;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 959867444..355120c74 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -29,7 +29,7 @@
 App::import('Core', 'Validation');
 /**
  * CustomValidator class
- * 
+ *
  * @package              cake
  * @subpackage           cake.tests.cases.libs
  */
@@ -55,14 +55,14 @@ class CustomValidator {
 class ValidationTestCase extends UnitTestCase {
 /**
  * Validation property
- * 
+ *
  * @var mixed null
  * @access public
  */
 	var $Validation = null;
 /**
  * setup method
- * 
+ *
  * @access public
  * @return void
  */
@@ -71,7 +71,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testAlphaNumeric method
- * 
+ *
  * @access public
  * @return void
  */
@@ -80,6 +80,13 @@ class ValidationTestCase extends UnitTestCase {
 		$this->assertTrue(Validation::alphaNumeric('12234'));
 		$this->assertTrue(Validation::alphaNumeric('1w2e2r3t4y'));
 		$this->assertTrue(Validation::alphaNumeric('0'));
+		$this->assertTrue(Validation::alphaNumeric('abçďĕʑʘπй'));
+		$this->assertTrue(Validation::alphaNumeric('ˇˆๆゞ'));
+		$this->assertTrue(Validation::alphaNumeric('אกあアꀀ豈'));
+		$this->assertTrue(Validation::alphaNumeric('Džᾈᾨ'));
+		$this->assertTrue(Validation::alphaNumeric('ÆΔΩЖÇ'));
+
+
 		$this->assertFalse(Validation::alphaNumeric('12 234'));
 		$this->assertFalse(Validation::alphaNumeric('dfd 234'));
 		$this->assertFalse(Validation::alphaNumeric("\n"));
@@ -90,7 +97,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testAlphaNumericPassedAsArray method
- * 
+ *
  * @access public
  * @return void
  */
@@ -109,7 +116,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testBetween method
- * 
+ *
  * @access public
  * @return void
  */
@@ -120,7 +127,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testBlank method
- * 
+ *
  * @access public
  * @return void
  */
@@ -135,7 +142,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testBlankAsArray method
- * 
+ *
  * @access public
  * @return void
  */
@@ -150,7 +157,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testcc method
- * 
+ *
  * @access public
  * @return void
  */
@@ -594,7 +601,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testLuhn method
- * 
+ *
  * @access public
  * @return void
  */
@@ -673,7 +680,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testCustomRegexForCc method
- * 
+ *
  * @access public
  * @return void
  */
@@ -684,7 +691,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testCustomRegexForCcWithLuhnCheck method
- * 
+ *
  * @access public
  * @return void
  */
@@ -696,7 +703,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testFastCc method
- * 
+ *
  * @access public
  * @return void
  */
@@ -722,7 +729,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testAllCc method
- * 
+ *
  * @access public
  * @return void
  */
@@ -772,7 +779,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testAllCcDeep method
- * 
+ *
  * @access public
  * @return void
  */
@@ -822,7 +829,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testComparison method
- * 
+ *
  * @access public
  * @return void
  */
@@ -858,7 +865,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testComparisonAsArray method
- * 
+ *
  * @access public
  * @return void
  */
@@ -894,7 +901,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testCustom method
- * 
+ *
  * @access public
  * @return void
  */
@@ -905,7 +912,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testCustomAsArray method
- * 
+ *
  * @access public
  * @return void
  */
@@ -916,7 +923,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdmmyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -936,7 +943,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdmmyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -952,7 +959,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdmmyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -972,7 +979,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdmmyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -988,7 +995,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDmyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1008,7 +1015,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDmyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1024,7 +1031,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDmyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1044,7 +1051,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDmyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1060,7 +1067,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmddyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1080,7 +1087,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmddyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1096,7 +1103,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmddyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1116,7 +1123,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmddyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1132,7 +1139,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMdyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1152,7 +1159,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMdyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1168,7 +1175,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMdyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1188,7 +1195,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMdyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1204,7 +1211,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateYyyymmdd method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1220,7 +1227,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateYyyymmddLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1236,7 +1243,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateYymmdd method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1256,7 +1263,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateYymmddLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1272,7 +1279,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdMMMMyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1284,7 +1291,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateDdMMMMyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1294,7 +1301,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmmmDdyyyy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1308,7 +1315,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMmmmDdyyyyLeapYear method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1321,7 +1328,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMy method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1333,7 +1340,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateMyNumeric method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1349,7 +1356,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testTime method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1370,7 +1377,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testBoolean method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1389,7 +1396,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDateCustomRegx method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1399,7 +1406,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDecimal method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1417,7 +1424,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDecimalWithPlaces method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1441,7 +1448,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testDecimalCustomRegex method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1451,7 +1458,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testEmail method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1523,7 +1530,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testEmailDeep method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1534,7 +1541,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testEmailCustomRegex method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1544,7 +1551,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testEqualTo method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1558,7 +1565,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testIp method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1572,7 +1579,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testMaxLength method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1583,7 +1590,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testMinLength method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1594,7 +1601,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testUrl method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1628,7 +1635,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testInList method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1639,7 +1646,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testValidNumber method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1665,7 +1672,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testRange method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1680,7 +1687,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testExtension method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1709,7 +1716,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testMoney method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1741,7 +1748,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testNumeric method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1757,7 +1764,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testPhone method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1779,7 +1786,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testPostal method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1831,7 +1838,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testSsn method
- * 
+ *
  * @access public
  * @return void
  */
@@ -1852,7 +1859,7 @@ class ValidationTestCase extends UnitTestCase {
 	}
 /**
  * testUserDefined method
- * 
+ *
  * @access public
  * @return void
  */