X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fmessages.js;h=441abdb3bcfd97c14aada886108c8c342891aea2;hb=7a0c1b7e33a346195caebfdfa6489e7c6d0457e6;hp=b3c158eb8032c28a94063884f6fffa600a94bd14;hpb=58e7b94e6e1a8d5721b9211b45c40e65fc13f600;p=vchess.git

diff --git a/server/routes/messages.js b/server/routes/messages.js
index b3c158eb..441abdb3 100644
--- a/server/routes/messages.js
+++ b/server/routes/messages.js
@@ -1,24 +1,18 @@
-// Router for contact form sending
-
 let router = require("express").Router();
-const mailer = require(__dirname.replace("/routes", "/utils/mailer"));
-const params = require(__dirname.replace("/routes", "/config/parameters"));
+const access = require("../utils/access");
+const sendEmail = require("../utils/mailer");
+const params = require("../config/parameters");
 
 // Send a message through contact form
-router.post("/messages", (req,res,next) => {
-	if (!req.xhr)
-		return res.json({errmsg: "Unauthorized access"});
+router.post("/messages", access.ajax, (req,res) => {
   const from = req.body["email"];
-	const subject = req.body["subject"];
-	const body = req.body["content"];
+  // Replace potential newline characters in subject
+  const subject = req.body["subject"].replace(/\r?\n|\r/g, " ");
+  const body = req.body["content"];
 
-	// TODO: sanitize ?
-	mailer(from, params.mail.contact, subject, body, err => {
-		if (!!err)
-			return res.json({errmsg:err});
-		// OK, everything fine
-		res.json({}); //ignored
-	});
+  sendEmail(from, params.mail.contact, subject, body, err => {
+    res.json(err || {});
+  });
 });
 
 module.exports = router;