Ticket #297: filter-tests-patch.diff
| File filter-tests-patch.diff, 2.6 kB (added by arnaudj, 1 year ago) |
|---|
-
testapp/modules/jelix_tests/tests/utils.jfilter.html_cli.php
old new 116 116 "isUrl('')");*/ 117 117 } 118 118 119 public function testIsEmail() { 120 $this->assertTrue(jFilter::isEmail('name@provider.com'), 121 "isEmail('name@provider.com')"); 122 $this->assertTrue(jFilter::isEmail('firstname-initial.lastname@etudiant.univ-lille1.fr'), 123 "isEmail('firstname-initial.lastname@etudiant.univ-lille1.fr'"); 124 $this->assertFalse(jFilter::isEmail('name@etudiant.univ-lille1'), 125 "isEmail('name@etudiant.univ-lille1')"); 126 $this->assertFalse(jFilter::isEmail('name@provider.x_x'), 127 "isEmail('name@provider.x_x')"); 128 } 129 119 130 public function testIsIpv4(){ 120 131 $this->assertTrue(jFilter::isIPv4('0.0.0.0'), "isIPv4('0.0.0.0')"); 121 132 $this->assertTrue(jFilter::isIPv4('127.0.0.1'), "isIPv4('127.0.0.1')"); -
lib/jelix/utils/jFilter.class.php
old new 174 174 #if ENABLE_PHP_FILTER 175 175 return filter_var($val, FILTER_VALIDATE_EMAIL); 176 176 #else 177 return preg_match('/^[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*@[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-] +)+$/i',$val);177 return preg_match('/^[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*@[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*(\.[A-Z][A-Z]+)$/i',$val); 178 178 #endif 179 179 } 180 180 -
lib/jelix-www/js/jforms.js
old new 184 184 ok = (val.search(/^$/) != -1) 185 185 break;*/ 186 186 case 'email' : 187 ok = (val.search(/^[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*@[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-] +)+$/i) != -1)187 ok = (val.search(/^[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*@[A-Z0-9][A-Z0-9_\-]*(\.[A-Z0-9][A-Z0-9_\-]*)*(\.[A-Z][A-Z]+)$/i) != -1) 188 188 break; 189 189 case 'ipv4' : 190 190 var t = val.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
