Changeset 609
- Timestamp:
- 10/06/07 09:54:24 (1 year ago)
- Files:
-
- branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (1 diff)
- branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (1 diff)
- branches/1.0beta3.x/lib/jelix/utils/jFilter.class.php (modified) (1 diff)
- branches/1.0beta3.x/lib/jelix/utils/jFilter.class.php (modified) (1 diff)
- branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)
- branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)
- branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
- branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
- trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
- trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
- trunk/lib/jelix/utils/jFilter.class.php (modified) (1 diff)
- trunk/lib/jelix/utils/jFilter.class.php (modified) (1 diff)
- trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
- trunk/testapp/modules/testapp/forms/sample.form.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0beta3.x/lib/jelix-www/js/jforms.js
r540 r609 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_\-]+)+$/i) != -1) 188 188 break; 189 189 case 'ipv4' : branches/1.0beta3.x/lib/jelix-www/js/jforms.js
r540 r609 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_\-]+)+$/i) != -1) 188 188 break; 189 189 case 'ipv4' : branches/1.0beta3.x/lib/jelix/utils/jFilter.class.php
r408 r609 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_\-]+)+$/i',$val); 178 178 #endif 179 179 } branches/1.0beta3.x/lib/jelix/utils/jFilter.class.php
r408 r609 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_\-]+)+$/i',$val); 178 178 #endif 179 179 } branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php
r605 r609 83 83 <input type="hidden" name="action" value="urlsig_url1"/> 84 84 </div><script type="text/javascript"> 85 //< [CDATA[85 //<![CDATA[ 86 86 87 87 //]]> … … 98 98 <input type="hidden" name="action" value="urlsig_url1"/> 99 99 </div><script type="text/javascript"> 100 //< [CDATA[100 //<![CDATA[ 101 101 102 102 //]]> branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php
r605 r609 83 83 <input type="hidden" name="action" value="urlsig_url1"/> 84 84 </div><script type="text/javascript"> 85 //< [CDATA[85 //<![CDATA[ 86 86 87 87 //]]> … … 98 98 <input type="hidden" name="action" value="urlsig_url1"/> 99 99 </div><script type="text/javascript"> 100 //< [CDATA[100 //<![CDATA[ 101 101 102 102 //]]> branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml
r605 r609 8 8 <input ref="prenom" defaultvalue="robert"> 9 9 <label>Votre prénom</label> 10 </input> 11 12 <input ref="mail" type="email"> 13 <label>Votre mail</label> 10 14 </input> 11 15 branches/1.0beta3.x/testapp/modules/testapp/forms/sample.form.xml
r605 r609 8 8 <input ref="prenom" defaultvalue="robert"> 9 9 <label>Votre prénom</label> 10 </input> 11 12 <input ref="mail" type="email"> 13 <label>Votre mail</label> 10 14 </input> 11 15 trunk/lib/jelix-www/js/jforms.js
r540 r609 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_\-]+)+$/i) != -1) 188 188 break; 189 189 case 'ipv4' : trunk/lib/jelix-www/js/jforms.js
r540 r609 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_\-]+)+$/i) != -1) 188 188 break; 189 189 case 'ipv4' : trunk/lib/jelix/utils/jFilter.class.php
r408 r609 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_\-]+)+$/i',$val); 178 178 #endif 179 179 } trunk/lib/jelix/utils/jFilter.class.php
r408 r609 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_\-]+)+$/i',$val); 178 178 #endif 179 179 } trunk/testapp/modules/testapp/forms/sample.form.xml
r605 r609 8 8 <input ref="prenom" defaultvalue="robert"> 9 9 <label>Votre prénom</label> 10 </input> 11 12 <input ref="mail" type="email"> 13 <label>Votre mail</label> 10 14 </input> 11 15 trunk/testapp/modules/testapp/forms/sample.form.xml
r605 r609 8 8 <input ref="prenom" defaultvalue="robert"> 9 9 <label>Votre prénom</label> 10 </input> 11 12 <input ref="mail" type="email"> 13 <label>Votre mail</label> 10 14 </input> 11 15
