Changeset 2932

Show
Ignore:
Timestamp:
12/21/07 08:19:10 (1 year ago)
Author:
peca
Message:

Improved regexp for e-mail address check in download form.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tracdownloaderplugin/0.10/tracdownloader/form_data.py

    r2890 r2932  
    110110        'description': 'Valid e-mail address.', 
    111111        'show_in_main_list': True, 
    112         'regexp': r'\S*@\S*\.\S*', 
     112        #'regexp': r'\S*@\S*\.\S*', 
     113        # You can use regexp above if the one below doesn't work for you 
     114        # Or look here - http://www.regular-expressions.info/email.html 
     115        'regexp': r"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+(?:[a-zA-Z]{2}|com|COM|org|ORG|net|NET|gov|GOV|mil|MIL|biz|BIZ|info|INFO|mobi|MOBIL|name|NAME|aero|AERO|biz|BIZ|info|INFO|jobs|JOBS|museum|MUSEUM)\b", 
    113116        'errinfo': 'You must enter valid e-mail address.' 
    114117    }, 

  • tracdownloaderplugin/0.9/tracdownloader/form_data.py

    r2894 r2932  
    110110        'description': 'Valid e-mail address.', 
    111111        'show_in_main_list': True, 
    112         'regexp': r'\S*@\S*\.\S*', 
     112        #'regexp': r'\S*@\S*\.\S*', 
     113        # You can use regexp above if the one below doesn't work for you 
     114        # Or look here - http://www.regular-expressions.info/email.html 
     115        'regexp': r"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+(?:[a-zA-Z]{2}|com|COM|org|ORG|net|NET|gov|GOV|mil|MIL|biz|BIZ|info|INFO|mobi|MOBIL|name|NAME|aero|AERO|biz|BIZ|info|INFO|jobs|JOBS|museum|MUSEUM)\b", 
    113116        'errinfo': 'You must enter valid e-mail address.' 
    114117    },