Issue 2267 - Unify form handling by reusing form_handler() and encode_email_address()

sitescripts/formmail/web/formmail.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
 
 from sitescripts.utils import get_config, sendMail, encode_email_address
 from sitescripts.web import url_handler, form_handler, send_simple_response
 
 @url_handler('/formmail')
 @form_handler
 def handleRequest(environ, start_response, data):
   params = {name: data.get(name, '').strip() for name in ('name', 'email', 'subject', 'message')}
   missing = [k for k, v in params.iteritems() if not v]
 
   if missing:
-    text = 'Required fields: ' + ', '.join(missing)

[kzar, 2015/04/28 08:38:03]

Nit: 'Missing fields: '?

[Sebastian Noack, 2015/04/28 08:45:17]

Done.

+    text = 'Missing fields: ' + ', '.join(missing)
     return send_simple_response(start_response, 400, text)
 
   try:
     params['email'] = encode_email_address(params['email'])
   except ValueError:
     return send_simple_response(start_response, 400, 'Invalid email address')
 
   params['time'] = datetime.datetime.now()
   sendMail(get_config().get('formmail', 'template'), params)
 
   return send_simple_response(start_response, 200, 'Message sent')