surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Todo Multi refresh ...

Browse Source 
fix some promises problem
This commit is contained in:
Paolo Arena
2019-02-15 01:38:01 +01:00
parent f6fa45a9e9
commit f44d3dc661
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/sendemail.js
View File

@@ -57,7 +57,7 @@ module.exports = {
.then(console.log) .then(console.log)
.catch(console.error); .catch(console.error);
}, },
sendEmail_Normale: function (username, to, subject, html) { sendEmail_Normale: function (to, subject, html) {
// setup e-mail data with unicode symbols // setup e-mail data with unicode symbols
var mailOptions = { var mailOptions = {
@@ -118,6 +118,9 @@ module.exports = {
}; };
this.sendEmail_base('registration/' + lang, user, emailto, mylocalsconf); this.sendEmail_base('registration/' + lang, user, emailto, mylocalsconf);
// Send to the Admin an Email
this.sendEmail_Normale(process.env.EMAIL_FROM, 'Nuova Registrazione: (' + user + ")", 'Effettuata una Nuova Registrazione!<br>Username:' + user + '<br></br>Email: ' + emailto +'<br>')
}, },
sendEmail_RequestNewPassword: function (lang, emailto, idapp, tokenforgot) { sendEmail_RequestNewPassword: function (lang, emailto, idapp, tokenforgot) {

4
server/server.js
View File

@@ -111,7 +111,9 @@ if ((process.env.NODE_ENV === 'production') || (process.env.NODE_ENV === 'test')
httpServer.listen(port); httpServer.listen(port);
} }
testmsgwebpush(); if (process.env.PROD !== 1) {
testmsgwebpush();
}
function testmsgwebpush() { function testmsgwebpush() {
var { User } = require('./models/user'); var { User } = require('./models/user');

1
server/tools/general.js
View File

@@ -176,3 +176,4 @@ module.exports = {
// Test // Test
}; };