| OLD | NEW |
| 1 # coding: utf-8 | |
| 2 | |
| 3 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, |
| 4 # Copyright (C) 2006-2016 Eyeo GmbH | 2 # Copyright (C) 2006-2016 Eyeo GmbH |
| 5 # | 3 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. |
| 9 # | 7 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, |
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 return 'No subject entered' | 46 return 'No subject entered' |
| 49 if not 'message' in params or params['message'] == '': | 47 if not 'message' in params or params['message'] == '': |
| 50 return 'No message entered' | 48 return 'No message entered' |
| 51 | 49 |
| 52 if not re.match(r'^\w[\w.+!-]+@\w[\w.-]+\.[a-zA-Z]{2,6}$', params['email']): | 50 if not re.match(r'^\w[\w.+!-]+@\w[\w.-]+\.[a-zA-Z]{2,6}$', params['email']): |
| 53 return 'Invalid email address' | 51 return 'Invalid email address' |
| 54 | 52 |
| 55 params['time'] = datetime.datetime.now() | 53 params['time'] = datetime.datetime.now() |
| 56 sendMail(get_config().get('formmail', 'template'), params) | 54 sendMail(get_config().get('formmail', 'template'), params) |
| 57 return 'Message sent' | 55 return 'Message sent' |
| OLD | NEW |