cvs: pear /HTML_QuickForm QuickForm.php

mansion Sun Dec 8 17:56:46 2002 EDT Modified files: /pear/HTML_QuickForm QuickForm.php Log: Email validation rules now accept .info domains, thanks to Thomas Schulz <ths at 4bconsult dot de>. Index: pear/HTML_QuickForm/QuickForm.php diff -u pear/HTML_QuickForm/QuickForm.php:1.45 pear/HTML_QuickForm/QuickForm.php:1.46 --- pear/HTML_QuickForm/QuickForm.php:1.45 Wed Nov 20 04:59:28 2002 +++ pear/HTML_QuickForm/QuickForm.php Sun Dec 8 17:56:46 2002 @@ -17,7 +17,7 @@ // | Bertrand Mansion <bmansion@mamasam.com> | // +----------------------------------------------------------------------+ // -// $Id: QuickForm.php,v 1.45 2002/11/20 09:59:28 mansion Exp $ +// $Id: QuickForm.php,v 1.46 2002/12/08 22:56:46 mansion Exp $ require_once('PEAR.php'); require_once('HTML/Common.php'); @@ -211,8 +211,8 @@ 'minlength' =>array('regex', '/^(\s|\S){%data%,}$/'), 'rangelength' =>array('regex', '/^(\s|\S){%data%}$/'), 'regex' =>array('regex', '%data%'), - 'email' =>array('regex', '/^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,3}|[0-9]{1,3})(\]?)$/'), - 'emailorblank' =>array('regex', '/(^$)|(^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,3}|[0-9]{1,3})(\]?)$)/'), + 'email' =>array('regex', '/^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/'), + 'emailorblank' =>array('regex', '/(^$)|(^.+\@(\[?)[a-zA-Z0-9\-\.]+\.([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$)/'), 'lettersonly' =>array('regex', '/^[a-zA-Z]*$/'), 'alphanumeric' =>array('regex', '/^[a-zA-Z0-9]*$/'), 'numeric' =>array('regex', '/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/'),