Merge pull request #645 from guusdk/OF-777_EmailService-fix

OF-777: email service fixes

src/i18n/openfire_i18n_en.properties

@@ -2614,7 +2614,7 @@ system.email.info=Use the form below to set the host and port of your email serv
 		on your mail server. Note, if you choose to enable mail debugging the debug output will be written \
 		to your appserver's standard out log.
 system.email.update_success=SMTP settings updated successfully.
-system.email.update_failure=An error occured. Please verify that you have filled out all required fields \
+system.email.update_failure=An error occurred. Please verify that you have filled out all required fields \
         correctly and try again.
 system.email.name=SMTP Settings
 system.email.mail_host=Mail Host

src/web/system-email.jsp

@@ -39,8 +39,11 @@
     Cookie csrfCookie = CookieUtils.getCookie(request, "csrf");
     String csrfParam = ParamUtils.getParameter(request, "csrf");
 
+    Map<String,String> errors = new HashMap<String,String>();
+
     if (save) {
         if (csrfCookie == null || csrfParam == null || !csrfCookie.getValue().equals(csrfParam)) {
+            errors.put("csrf", "CSRF Failure!");
             save = false;
         }
     }
@@ -55,7 +58,6 @@
 
     EmailService service = EmailService.getInstance();
     // Save the email settings if requested
-    Map<String,String> errors = new HashMap<String,String>();
     if (save) {
         if (host != null) {
             service.setHost(host);
@@ -234,7 +236,7 @@
 		</tr>
 		</table>
 	</div>
-
+<input type="hidden" name="csrf" value="${csrf}"/>
 <input type="submit" name="save" value="<fmt:message key="system.email.save" />">
 <input type="submit" name="test" value="<fmt:message key="system.email.send_test" />">
 </form>