Merge a9a8d81a3d8f6752865e2e063592cc214c459995 into fcf231e002f4a7d47684f92b0f959c58c9a02179

README.md

@@ -145,7 +145,7 @@ A custom field is defined in the `customFields` section of your settings file, a
 
 ## Templating
 
-Each e-mail sent by the form follows a template described in `template.pug` (it's [Pug](pugjs.org/)). If you want to change the way the e-mails you receive are displayed in your mailbox, just edit it! You don't even need to restart the server aftewards :smile:
+Each e-mail sent by the form follows a template described in `template.example.pug` (it's [Pug](pugjs.org/)). If you want to change the way the e-mails you receive are displayed in your mailbox, just edit it! You don't even need to restart the server aftewards :smile:
 
 The template also features custom fields, iterating over the `custom` object, containing the field's label and user-input value:
 
@@ -156,6 +156,8 @@ The template also features custom fields, iterating over the `custom` object, co
 }
 ```
 
+The template needs to be named `template.pug`. If no template could be found under this name, SMAM will use a default one, which features both default and custom fields, and should be sufficient for non-advanced usage.
+
 ## Personnalising
 
 As you might have already seen, the contact form is generated without any form of style except your browser's default one. But that doesn't meen that you have to add an ugly form to your site to receive contact e-mails, as every element has a specific id (beginning with the `form_` prefix), allowing you to use your own style on your contact form.

server.js

@@ -1,17 +1,18 @@
-var pug			= require('pug');
-var nodemailer  = require('nodemailer');
-var crypto		= require('crypto');
-var settings	= require('./settings');
+var pug = require('pug');
+var nodemailer = require('nodemailer');
+var crypto = require('crypto');
+var fs = require('fs');
+var settings = require('./settings');
 
 // Translation
-var locale		= require('./locales/' + settings.language);
-var lang		= locale.server;
+var locale = require('./locales/' + settings.language);
+var lang = locale.server;
 
 // Web server
-var bodyParser	= require('body-parser');
-var cors		= require('cors');
-var express		= require('express');
-var app			= express();
+var bodyParser = require('body-parser');
+var cors = require('cors');
+var express = require('express');
+var app = express();
 
 // Logging
 var printit = require('printit');
@@ -28,6 +29,28 @@ var transporter = nodemailer.createTransport(settings.mailserver);
 // Verification tokens
 var tokens = {};
 
+// Default template
+// JavaScript has no native way to handle multi-line strings, so we put our template
+// in a comment inside a function fro which we generate a string.
+// cf: https://tomasz.janczuk.org/2013/05/multi-line-strings-in-javascript-and.html
+var defaultTemplate = (function() {/*
+html
+	body
+		p.subj
+			span(style="font-weight:bold") Subject: 
+			span= subject
+		p.from
+			span(style="font-weight:bold") Sent from: 
+			span= replyTo
+		each field in custom
+			p.custom
+				span(style="font-weight:bold")= field.label + ': '
+				span= field.value
+		p.message
+			span(style="font-weight:bold") Message: 
+		
+		p= html
+*/}).toString().match(/[^]*\/\*([^]*)\*\/\}$/)[1];
 
 // Serve static (JS + HTML) files
 app.use(express.static('front'));
@@ -104,23 +127,33 @@ app.post('/send', function(req, res, next) {
 	// Replacing the mail's content with HTML from the pug template
 	// Commenting the line below will bypass the generation and only user the
 	// text entered by the user
-	params.html = pug.renderFile('template.pug', params);
-
-	log.info(lang.log_sending, params.replyTo);
-
-	// Send the email to all users
-	sendMails(params, function(err, infos) {
+	fs.access('template.pug', function(err) {
+		// Checking if the template exists.
+		// If not, fallback to the default template.
+		// TODO: Parameterise the template file name.
 		if(err) {
-			log.error(err);
-		}
-		logStatus(infos);
-	}, function() {
-		if(status.failed === status.total) {
-			res.status(500).send();
+			params.html = pug.render(defaultTemplate, params);
 		} else {
-			res.status(200).send();
+			params.html = pug.renderFile('template.pug', params);
 		}
-	})
+
+		log.info(lang.log_sending, params.replyTo);
+
+		// Send the email to all users
+		sendMails(params, function(err, infos) {
+			if(err) {
+				log.error(err);
+			}
+			logStatus(infos);
+		}, function() {
+			if(status.failed === status.total) {
+				res.status(500).send();
+			} else {
+				res.status(200).send();
+			}
+		});
+	});
+
 });
 
 
@@ -334,4 +367,4 @@ function processCustom(custom) {
 	}
 
 	return fields;
-}
+}