| Revision | 0e0376cd9fb5e8fb9b95a5302b5628d7389b8eb7 (tree) |
|---|---|
| Time | 2011-06-17 18:27:27 |
| Author |  Junichi Shinohara <junichi@kare...> |
| Commiter | Junichi Shinohara |
Bug fix for mail address validation. not used +.
karesansui/lib/checker.py (diff)
karesansui/templates/default/data/js/checker.js (diff)| @@ -570,13 +570,10 @@ class Checker(object): | ||
| 570 | 570 | if value and ret_val: |
| 571 | 571 | if check & CHECK_VALID: |
| 572 | 572 | |
| 573 | - regex = "^(?P<localpart>[^@]+)@(?P<domainpart>.+)?$" | |
| 573 | + regex = "^[-a-zA-Z0-9!"#$%&'()*+/:;<=>?[\]^_`{|}~.]+@[-a-zA-Z0-9_.]+$" | |
| 574 | 574 | m = re.compile(regex).search(value) |
| 575 | 575 | if m: |
| 576 | - tstr1 = m.group("localpart") | |
| 577 | - tstr2 = m.group("domainpart") | |
| 578 | - ret_val = ret_val and self.check_username_with_num(name, tstr1, check, 1, 64) | |
| 579 | - ret_val = ret_val and self.check_domainname(_('Domain name part of %s') % (name,), tstr2, CHECK_EMPTY|check, 4, 255, domain) | |
| 576 | + ret_val = True | |
| 580 | 577 | else: |
| 581 | 578 | ret_val = False |
| 582 | 579 | self.add_error(_('%s is in an invalid format.') % (name,)) |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // This file is part of Karesansui Core. |
| 2 | 2 | // |
| 3 | -// Copyright (C) 2009-2010 HDE, Inc. | |
| 3 | +// Copyright (C) 2009-2011 HDE, Inc. | |
| 4 | 4 | // |
| 5 | 5 | // This program is free software; you can redistribute it and/or |
| 6 | 6 | // modify it under the terms of the GNU Lesser General Public |
| @@ -638,18 +638,9 @@ function check_mailaddress(form, check, name, domain, min, max){ | ||
| 638 | 638 | |
| 639 | 639 | if(form.value && ret_val){ |
| 640 | 640 | if(check & CHECK_VALID){ |
| 641 | - var treg = /^([^@]+)@(.+)?$/; | |
| 641 | + var treg = /^[-a-zA-Z0-9!"#$%&'()*+/:;<=>?[\]^_`{|}~.]+@[-a-zA-Z0-9_.]+$/; | |
| 642 | 642 | if(form.value.match(treg)){ |
| 643 | - var tstr1 = RegExp.$1; | |
| 644 | - var tstr2 = RegExp.$2; | |
| 645 | - var formval = form.value; | |
| 646 | - form.value = tstr1; | |
| 647 | - ret_val = ret_val && check_username_with_num(form, check, name); | |
| 648 | - form.value = formval; | |
| 649 | - formval = form.value; | |
| 650 | - form.value = tstr2; | |
| 651 | - ret_val = ret_val && check_domainname(form, CHECK_EMPTY | check, minisprintf("${_('Domain name part of %s')}",name),domain); | |
| 652 | - form.value = formval; | |
| 643 | + ret_val = true; | |
| 653 | 644 | }else{ |
| 654 | 645 | ERROR_MSG += minisprintf("${_('%s is invalid format.')}",name); |
| 655 | 646 | ERROR_MSG += "\n"; |
Karesansui
Fork