diff --git a/emails/admin/added_to_newsletter/it/subject.pug b/emails/admin/added_to_newsletter/it/subject.pug
index 768a5d8..99d703b 100755
--- a/emails/admin/added_to_newsletter/it/subject.pug
+++ b/emails/admin/added_to_newsletter/it/subject.pug
@@ -1 +1 @@
-=`${name} ${surname} si è appena iscritto alla Newsletter con email: ${emailto} su ${nomeapp}`
+=`${username} (${name} ${surname}) si è appena iscritto alla Newsletter con email: ${emailto} su ${nomeapp}`
diff --git a/emails/admin/cancelbooking/it/html.pug b/emails/admin/cancelbooking/it/html.pug
index 3eb33a3..44eb9cc 100755
--- a/emails/admin/cancelbooking/it/html.pug
+++ b/emails/admin/cancelbooking/it/html.pug
@@ -1,5 +1,5 @@
p Ciao,
-p Ti avvisiamo che #{name} #{surname} ha appena cancellato la prenotazione per l'evento #{event}:
+p Ti avvisiamo che #{username} (#{name} #{surname}) ha appena cancellato la prenotazione per l'evento #{event}:
span #{participants}
span #{participantsLunch}
span #{participantsDinner}
diff --git a/emails/admin/cancelbooking/it/subject.pug b/emails/admin/cancelbooking/it/subject.pug
index 054a131..c72fecf 100755
--- a/emails/admin/cancelbooking/it/subject.pug
+++ b/emails/admin/cancelbooking/it/subject.pug
@@ -1 +1 @@
-=`${name} ${surname} ha cancellato la prenotazione all'evento ${eventtextplain}`
+=`${username} (${name} ${surname}) ha cancellato la prenotazione all'evento ${eventtextplain}`
diff --git a/emails/admin/iscrizione_conacreis/it/html.pug b/emails/admin/iscrizione_conacreis/it/html.pug
index c009ec7..f37b6e6 100755
--- a/emails/admin/iscrizione_conacreis/it/html.pug
+++ b/emails/admin/iscrizione_conacreis/it/html.pug
@@ -1,4 +1,4 @@
-p #{name} #{surname} si è appena Iscritto al Conacreis su #{nomeapp}
+p #{username} (#{name} #{surname}) si è appena Iscritto al Conacreis su #{nomeapp}
p Con i seguenti dati di accesso:
span Nome:
strong #{iscritto.name}
diff --git a/emails/admin/makebooking/it/html.pug b/emails/admin/makebooking/it/html.pug
index adea240..86ce6d9 100755
--- a/emails/admin/makebooking/it/html.pug
+++ b/emails/admin/makebooking/it/html.pug
@@ -1,5 +1,5 @@
p Ciao,
-p Ti confermiamo che #{name} #{surname} ha appena inviato una richiesta di prenotazione per l'evento #{event}
+p Ti confermiamo che #{username} (#{name} #{surname}) ha appena inviato una richiesta di prenotazione per l'evento #{event}
p #{participants}
p #{participantsLunch}
p #{participantsDinner}
diff --git a/emails/admin/makebooking/it/subject.pug b/emails/admin/makebooking/it/subject.pug
index e369492..3ab4360 100755
--- a/emails/admin/makebooking/it/subject.pug
+++ b/emails/admin/makebooking/it/subject.pug
@@ -1 +1 @@
-=`${name} ${surname} si è prenotato per l'evento ${eventtextplain}`
+=`${username} (${name} ${surname}) si è prenotato per l'evento ${eventtextplain}`
diff --git a/emails/admin/modifybooking/it/html.pug b/emails/admin/modifybooking/it/html.pug
index bd0f15e..8ce83fd 100755
--- a/emails/admin/modifybooking/it/html.pug
+++ b/emails/admin/modifybooking/it/html.pug
@@ -1,5 +1,5 @@
p Ciao,
-p Ti confermiamo che #{name} #{surname} ha appena Modificato la sua prenotazione per l'evento #{event}
+p Ti confermiamo che #{username} (#{name} #{surname}) ha appena Modificato la sua prenotazione per l'evento #{event}
p #{participants}
p #{participantsLunch}
p #{participantsDinner}
diff --git a/emails/admin/modifybooking/it/subject.pug b/emails/admin/modifybooking/it/subject.pug
index 4c6b715..57d6acc 100755
--- a/emails/admin/modifybooking/it/subject.pug
+++ b/emails/admin/modifybooking/it/subject.pug
@@ -1 +1 @@
-=`${name} ${surname} ha modificato la prenotazione per l'evento ${eventtextplain}`
+=`${username} (${name} ${surname}) ha modificato la prenotazione per l'evento ${eventtextplain}`
diff --git a/emails/admin/registration/enUs/html.pug b/emails/admin/registration/enUs/html.pug
index 2fde1d0..a2e6f53 100755
--- a/emails/admin/registration/enUs/html.pug
+++ b/emails/admin/registration/enUs/html.pug
@@ -1,4 +1,4 @@
-p #{name} #{surname} has just registered on #{nomeapp}
+p #{username} (#{name} #{surname}) has just registered on #{nomeapp}
p With the following access datao:
span Username:
strong #{username}
diff --git a/emails/admin/registration/es/html.pug b/emails/admin/registration/es/html.pug
index bf484f0..cb70065 100755
--- a/emails/admin/registration/es/html.pug
+++ b/emails/admin/registration/es/html.pug
@@ -1,4 +1,4 @@
-p #{name} #{surname} acaba de registrarse en #{nomeapp}
+p #{username} (#{name} #{surname}) acaba de registrarse en #{nomeapp}
p Con los siguientes datos de acceso:
span Username:
strong #{username}
diff --git a/emails/admin/registration/esEs/html.pug b/emails/admin/registration/esEs/html.pug
index bf484f0..cb70065 100755
--- a/emails/admin/registration/esEs/html.pug
+++ b/emails/admin/registration/esEs/html.pug
@@ -1,4 +1,4 @@
-p #{name} #{surname} acaba de registrarse en #{nomeapp}
+p #{username} (#{name} #{surname}) acaba de registrarse en #{nomeapp}
p Con los siguientes datos de acceso:
span Username:
strong #{username}
diff --git a/emails/admin/registration/it/html.pug b/emails/admin/registration/it/html.pug
index d1db15b..c02fa53 100755
--- a/emails/admin/registration/it/html.pug
+++ b/emails/admin/registration/it/html.pug
@@ -1,13 +1,13 @@
-p #{name} #{surname} si è appena Registrato su #{nomeapp}
+p #{username} (#{name} #{surname}) si è appena Registrato su #{nomeapp}
p Con i seguenti dati di accesso:
span Username:
strong #{username}
+span Email:
+ strong #{emailto}
span Nome:
strong #{user.name}
span Cognome:
strong #{user.surname}
-span Email:
- strong #{emailto}
span Cellulare:
strong #{user.profile.intcode_cell} #{user.profile.cell}
span Nazionalità:
diff --git a/emails/admin/registration/it/text.pug b/emails/admin/registration/it/text.pug
index 5e30a7b..9fbc3d4 100755
--- a/emails/admin/registration/it/text.pug
+++ b/emails/admin/registration/it/text.pug
@@ -1,4 +1,4 @@
-p #{name} #{surname} si è appena Registrato su #{nomeapp}
+p #{username} (#{name} #{surname}) si è appena Registrato su #{nomeapp}
p Con i seguenti dati di accesso:
span Username:
strong #{username}
diff --git a/emails/ecommerce/makeorder/it/html.pug b/emails/ecommerce/makeorder/it/html.pug
index 06ffebf..2694706 100755
--- a/emails/ecommerce/makeorder/it/html.pug
+++ b/emails/ecommerce/makeorder/it/html.pug
@@ -28,7 +28,7 @@ html
tr
td(class="emailContainer", valign="top")
- p Ciao #{name},
+ p Ciao #{username},
p Ti confermiamo che hai appena inviato un'ordine di prenotazione dei seguenti prodotti:
tr
diff --git a/src/server/models/user.js b/src/server/models/user.js
index ab5b58c..9f3dcdd 100755
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -1884,7 +1884,7 @@ UserSchema.statics.SetTelegramWasBlocked = async function(idapp, teleg_id) {
'profile.teleg_id': 0,
};
- if (process.env.PROD === '1') {
+ if (tools.sulServer()) {
const ris = await User.findOneAndUpdate({
idapp,
@@ -1896,7 +1896,7 @@ UserSchema.statics.SetTelegramWasBlocked = async function(idapp, teleg_id) {
};
-UserSchema.statics.getNameSurnameByUsername = async function(idapp, username) {
+UserSchema.statics.getNameSurnameByUsername = async function(idapp, username, reale = false) {
const User = this;
return User.findOne({
@@ -1904,10 +1904,32 @@ UserSchema.statics.getNameSurnameByUsername = async function(idapp, username) {
$or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
}, {username: 1, name: 1, surname: 1}).then((rec) => {
let ris = rec.username;
- if (!!rec && rec.name) {
- ris = (`${rec.name} ${rec.surname}`)
+ if (!!rec) {
+ if (reale) {
+ if (!rec.name)
+ return ''
+
+ ris = `${rec.name} ${rec.surname}`
+ } else {
+ if (rec.name) {
+ ris = `${rec.name} ${rec.surname}`
+ }
+ }
}
- return (!!rec) ? (`${rec.name} ${rec.surname}`) : '';
+ return (!!rec) ? ris : '';
+ }).catch((e) => {
+ console.error('getNameSurnameByUsername', e);
+ });
+};
+
+UserSchema.statics.getIdByUsername = async function(idapp, username) {
+ const User = this;
+
+ return User.findOne({
+ idapp, username,
+ $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
+ }, {username: 1, _id: 1}).then((rec) => {
+ return (!!rec) ? rec._id.toString() : '';
}).catch((e) => {
console.error('getNameSurnameByUsername', e);
});
@@ -2424,6 +2446,17 @@ UserSchema.statics.getUsersTelegramPending = async function(idapp) {
return User.count(myfind);
};
+UserSchema.statics.getNumUsers = async function(idapp) {
+ const User = this;
+
+ const myfind = {
+ idapp,
+ $or: [{deleted: {$exists: false}}, {deleted: {$exists: true, $eq: false}}],
+ };
+
+ return User.count(myfind);
+};
+
UserSchema.statics.getUsersZoom = async function(idapp) {
const User = this;
diff --git a/src/server/router/api/actions.js b/src/server/router/api/actions.js
index 5009b3a..0909f39 100755
--- a/src/server/router/api/actions.js
+++ b/src/server/router/api/actions.js
@@ -52,7 +52,7 @@ module.exports = {
}
addtext = 'Eliminato il Record "' + nomerecord + '" dalla tabella ' + tablename + '\n' +
- 'Eseguito da ' + req.user.name + ' ' + req.user.surname + ' \n';
+ 'Eseguito da ' + req.user.username + ' \n';
await telegrambot.sendMsgTelegramToTheManagers(rec.idapp, addtext);
}
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 084e6e6..ae0a797 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -713,7 +713,7 @@ router.patch('/chval', authenticate, async (req, res) => {
msg = 'Ripristinato';
await telegrambot.sendMsgTelegramToTheManagers(idapp,
- `L\'utente ${rec.name} ${rec.surname} (${rec.username}) è stato ${msg} da ${req.user.name} ${req.user.surname}`);
+ `L\'utente ` + tools.getNomeCognomeEUserNameByUser(rec) + ` è stato ${msg} da ` + tools.getNomeCognomeEUserNameByUser(req.user));
}
}
@@ -725,8 +725,8 @@ router.patch('/chval', authenticate, async (req, res) => {
fieldsvalue.aportador_solidario);
const nomecognomeas = await User.getNameSurnameByUsername(idapp,
rec.aportador_solidario);
- msg = `Variato l'invitante di ` + rec.name + ' ' + rec.surname +
- '\nmodificato da ' + req.user.name + ' ' + req.user.surname +
+ msg = `Variato l'invitante di ` + tools.getNomeCognomeEUserNameByUser(rec) +
+ '\nmodificato da ' + tools.getNomeCognomeEUserNameByUser(req.user) +
' \n' +
'Prima: ' + nomecognomeas + ' (' + rec.aportador_solidario +
')\n' +
@@ -1370,9 +1370,8 @@ function uploadFile(req, res, version) {
form.parse(req);
let dirmain = '/statics';
- console.log('process.env.PROD', process.env.PROD);
if (version > 0) {
- if (process.env.PROD === '1') {
+ if (tools.sulServer()) {
dirmain = '';
} else {
dirmain = '/public';
@@ -1524,7 +1523,7 @@ function deleteFile(req, res, version) {
try {
let dirmain = '';
if (version > 0) {
- if (process.env.PROD !== 1) {
+ if (tools.sulServer() !== 1) {
dirmain = '/public';
}
}
diff --git a/src/server/router/iscrittiConacreis_router.js b/src/server/router/iscrittiConacreis_router.js
index d6e8907..7fd5218 100755
--- a/src/server/router/iscrittiConacreis_router.js
+++ b/src/server/router/iscrittiConacreis_router.js
@@ -57,7 +57,7 @@ router.post('/', async (req, res) => {
if (lastrec.date_reg) {
let ris = tools.isdiffSecDateLess(lastrec.date_reg, 120);
if (ris) {
- tools.writeIPToBan(iscritti.ipaddr + ': ' + iscritti.name + ' ' + iscritti.surname);
+ tools.writeIPToBan(iscritti.ipaddr + ': ' + tools.getNomeCognomeEUserNameByUser(iscritti));
await tools.snooze(10000);
res.status(400).send({ code: server_constants.RIS_CODE_BANIP, msg: '' });
return 1;
diff --git a/src/server/router/users_router.js b/src/server/router/users_router.js
index 99d57b9..dfb1ca0 100755
--- a/src/server/router/users_router.js
+++ b/src/server/router/users_router.js
@@ -210,21 +210,20 @@ router.post('/', async (req, res) => {
// nomeaportador_corretto = recextra.aportador_solidario_originale_name_surname;
// }
- /*
- namesurname_aportador_reg = await User.getNameSurnameByUsername(user.idapp, user.aportador_solidario);
- if (recextra && namesurname_aportador_reg !== '' && namesurname_aportador_reg !== nomeaportador_corretto) {
+
+ const id_aportador = await User.getIdByUsername(user.idapp, user.aportador_solidario);
+
+ if (!id_aportador && tools.getAskToVerifyReg(body.idapp)) {
// Si sta tentando di registrare una persona sotto che non corrisponde!
- let msg = 'L\'utente ' + user.name + ' ' + user.surname + ' si sta registrando con il link di ' + user.aportador_solidario + ' (' + namesurname_aportador_reg + ') ' +
- 'invece è assegnato a ' + nomeaportador_corretto;
+ let msg = 'Il link di registrazione non sembra risultare valido.
invitante: ' + user.aportador_solidario + '
username: ' + user.username;
await telegrambot.sendMsgTelegramToTheManagers(user.idapp, msg);
- res.status(400).send({ code: server_constants.RIS_CODE_USER_NOT_THIS_APORTADOR, msg: '' });
+ res.status(400).send({ code: server_constants.RIS_CODE_USER_APORTADOR_NOT_VALID, msg: '' });
return 1;
- }*/
+ }
- let already_registered = (recextra || user.aportador_solidario ===
- tools.APORTADOR_NONE) && (user.idapp === tools.AYNI);
+ // let already_registered = (recextra || user.aportador_solidario === tools.APORTADOR_NONE) && (user.idapp === tools.AYNI);
// Check if is an other people aportador_solidario
diff --git a/src/server/sendemail.js b/src/server/sendemail.js
index f1d1d97..164dfbf 100755
--- a/src/server/sendemail.js
+++ b/src/server/sendemail.js
@@ -203,7 +203,9 @@ module.exports = {
await telegrambot.notifyToTelegram(telegrambot.phase.REGISTRATION, mylocalsconf);
- tools.sendNotifToAdmin('Nuova Registrazione Utente: ' + mylocalsconf.name + ' ' + mylocalsconf.surname + ' (' + mylocalsconf.username + ')');
+ const nometot = tools.getNomeCognomeEUserNameByUser(mylocalsconf);
+
+ tools.sendNotifToAdmin('Nuova Registrazione Utente: ' + nometot);
// if (tools.isManagAndAdminDifferent(idapp)) {
// this.sendEmail_base('admin/registration/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, '');
@@ -235,7 +237,7 @@ module.exports = {
await telegrambot.notifyIscrizioneToTelegram(telegrambot.phase.ISCRIZIONE_CONACREIS, mylocalsconf);
- tools.sendNotifToAdmin('Iscrizione Conacreis : ' + mylocalsconf.name + ' ' + mylocalsconf.surname);
+ tools.sendNotifToAdmin('Iscrizione Conacreis : ' + mylocalsconf.name + ' ' + mylocalsconf.surname + ' (' + mylocalsconf.username + ')');
if (tools.isManagAndAdminDifferent(idapp)) {
this.sendEmail_base('admin/iscrizione_conacreis/' + tools.LANGADMIN, tools.getManagerEmailByIdApp(idapp), mylocalsconf, '');
@@ -311,7 +313,7 @@ module.exports = {
preparaConfPerBooking: async function (res, idapp, mylocalsconf, recbooking, title) {
let texthtml = '';
- let msgtelegram = title + ' Evento [' + mylocalsconf.name + ' ' + mylocalsconf.surname + '] ' + mylocalsconf.eventtextplain;
+ let msgtelegram = title + ' Evento [' + mylocalsconf.username + ' (' + mylocalsconf.name + ' ' + mylocalsconf.surname + ')] ' + mylocalsconf.eventtextplain;
if (recbooking.modified) {
msgtelegram += ' (modificato) '
} else {
@@ -368,7 +370,7 @@ module.exports = {
mylocalsconf = await this.preparaConfPerBooking(res, idapp, mylocalsconf, recbooking, 'Cancellazione');
- let msgtelegram = 'Cancellazione Evento [' + mylocalsconf.name + ' ' + mylocalsconf.surname + '] ' + mylocalsconf.eventtextplain;
+ let msgtelegram = 'Cancellazione Evento [' + mylocalsconf.name + ' (' + mylocalsconf.name + ' ' + mylocalsconf.surname + ')] ' + mylocalsconf.eventtextplain;
telegrambot.sendMsgTelegramToTheManagers(idapp, msgtelegram);
@@ -543,6 +545,7 @@ module.exports = {
let out = myvar.replace('{urlunsubscribe}', urlunsibscribe);
out = out.replace('{email}', mylocalsconf.emailto);
+ out = out.replace('{username}', mylocalsconf.username);
out = out.replace('{name}', mylocalsconf.name ? mylocalsconf.name : mylocalsconf.username);
out = out.replace('{surname}', mylocalsconf.surname ? mylocalsconf.surname : '');
@@ -598,15 +601,17 @@ module.exports = {
// Create Transport
let smtpTransport = null;
+ // console.log('mylocalsconf.dataemail', mylocalsconf.dataemail);
+
if (mylocalsconf.dataemail.email_service !== 'gmail' && mylocalsconf.dataemail.email_service !== undefined && mylocalsconf.dataemail.email_service !== "") {
smtpTransport = nodemailer.createTransport({
host: mylocalsconf.dataemail.email_service,
port: mylocalsconf.dataemail.email_port,
- secureConnection: false,
+ secureConnection: true,
tls: { cipher: 'SSLv3' },
auth: {
user: mylocalsconf.dataemail.from,
- pass: mylocalsconf.dataemail.pwd_from
+ pass: tools.decryptdata(mylocalsconf.dataemail.pwd_from)
}
});
} else if (mylocalsconf.dataemail.email_service === 'gmail' && !!mylocalsconf.dataemail.pwd_from) {
@@ -616,7 +621,7 @@ module.exports = {
service: 'gmail', //'Gmail',
auth: {
user: mylocalsconf.dataemail.from,
- pass: mylocalsconf.dataemail.pwd_from
+ pass: tools.decryptdata(mylocalsconf.dataemail.pwd_from)
}
});
} else {
@@ -630,6 +635,8 @@ module.exports = {
});
}
+ // console.log('smtpTransport', smtpTransport);
+
return smtpTransport;
},
diff --git a/src/server/server.js b/src/server/server.js
index 5a9218a..85adcd0 100755
--- a/src/server/server.js
+++ b/src/server/server.js
@@ -436,13 +436,13 @@ async function faitest() {
if (false) {
let myuser = await User.findOne({
- idapp: 12,
+ idapp: '1',
username: 'paoloar77',
});
const langdest = 'it';
- telegrambot.askConfirmationUserRegistration(myuser.idapp, shared_consts.CallFunz.REGISTRATION, myuser, 'paoloar773', langdest);
+ telegrambot.askConfirmationUserRegistration(myuser.idapp, shared_consts.CallFunz.REGISTRATION, myuser, 'perseo77', langdest);
}
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index ffb21b5..52c9f3b 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -453,7 +453,7 @@ const txt = {
'\nSono il tuo assistente virtuale.\n',
MSG_ERR_UNKNOWN_VERIFY_CODE: 'Errore durante il salvataggio sul Server. Riprovare piú tardi',
MSG_EXIT_TELEGRAM: 'L\'account è stato ora scollegato da questo Telegram BOT.',
- MSG_APORTADOR_USER_REGISTERED: emo.FIRE + ' Si è appena Registrato "%s',
+ MSG_APORTADOR_USER_REGISTERED: emo.FIRE + ' Si è appena Registrato "%s" (n. %s)\nInvitato da %s',
MSG_APORTADOR_ASK_CONFIRM: '🆕💥 🧍♂️ Abilita Nuova Registrazione: %s',
MSG_APORTADOR_CONFIRMED: '✅ %s è stato Abilitato correttamente!',
MSG_APORTADOR_DEST_CONFIRMED: '✅ Sei stato Abilitato correttamente da %s!',
@@ -514,7 +514,7 @@ const txt_fr = {
MSG_ERR_UNKNOWN_VERIFY_CODE: 'Erreur lors de l\'enregistrement sur le serveur. Retentez plus tard',
MSG_EXIT_TELEGRAM: 'L\'account a été déconnecté de Telegram BOT.',
MSG_APORTADOR_USER_REGISTERED: emo.FIRE +
- ' Vous venez à peine de vous inscrire "%s (n)',
+ ' Vous venez à peine de vous inscrire "%s (n. %s) %s',
MSG_MSG_SENT: emoji.get('envelope') + ' Messages envoyés !',
MSG_MSG_TOSENT: emoji.get('envelope') + ' Messages à envoyer',
MSG_MSG_INCORSO: emoji.get('envelope') +
@@ -660,18 +660,18 @@ module.exports = {
aportador = ` (${userdest})`;
NameFrom += aportador;
} else {
- aportador = mylocalsconf.user.aportador_solidario_nome_completo;
+ aportador = mylocalsconf.user.aportador_solidario_nome_completo ? mylocalsconf.user.aportador_solidario_nome_completo : mylocalsconf.user.aportador_solidario;
}
let text = '';
if (phase === this.phase.REGISTRATION) {
if (userdest) {
- NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp,
- userdest) + aportador;
+ NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp, userdest, true) + aportador;
aportador = NameFrom;
}
+ const numutenti = await User.getNumUsers(mylocalsconf.idapp);
let nome = tools.getNomeCognomeEUserNameByUser(mylocalsconf.user);
- text = printf(getstr(langdest, 'MSG_APORTADOR_USER_REGISTERED'), nome);
+ text = printf(getstr(langdest, 'MSG_APORTADOR_USER_REGISTERED'), nome, numutenti, aportador);
}
let addtext = '';
@@ -951,8 +951,7 @@ module.exports = {
}
if (!!idteleg) {
- strout += '\n (' + index + ') ' + user.name + ' ' + user.surname +
- ':';
+ strout += '\n (' + index + ') ' + user.username + ' (' + user.name + ' ' + user.surname + ':';
if (mydata.inviareale) {
await this.sendMsgTelegramByIdTelegram(idapp, idteleg, mymsg,
undefined, undefined, true);
@@ -1151,9 +1150,10 @@ module.exports = {
let domanda = '';
if (myfunc === shared_consts.CallFunz.REGISTRATION) {
+ const name = myuser.username + (myuser.name ? `(${myuser.name} + ' ' + ${myuser.surname})` : '')
+ const linkuserprof = tools.getHostByIdApp(idapp) + '/my/' + myuser.username;
domanda = printf(getstr(langdest, 'MSG_APORTADOR_ASK_CONFIRM'),
- `
${myuser.name + ' ' + myuser.surname + ' (' + myuser.username +
- ')
Email: ' + myuser.email}`);
+ `
Username: ${name} (${linkuserprof})
Email: ` + myuser.email);
keyb = cl.getInlineKeyboard(myuser.lang, [
{
@@ -1386,8 +1386,7 @@ class Telegram {
const rec = this.getRecInMem(msg);
let myname = '';
if (rec.user) {
- myname = rec.user.name + ' ' + rec.user.surname + ' (n.' +
- rec.user.index + ')';
+ myname = rec.user.username;
lang = rec.user.lang;
}
@@ -1459,7 +1458,7 @@ class Telegram {
if (!!rec.user) {
const myrec = await User.getUserShortDataByUsername(this.idapp,
rec.user.username);
- risp += '\nSul sito ti sei registrato come:\n\n[N. ' +
+ risp += `\nSul sito ti sei registrato come ${rec.user.username}:\n\n[N. ` +
rec.user.index + ']: ' + rec.user.name + ' ' + rec.user.surname +
'\nUsername: ' + rec.user.username + '\n' + 'Email: ' +
rec.user.email + '\nLang: ' + rec.user.lang + tools.ACAPO;
@@ -3382,10 +3381,10 @@ if (true) {
const msgOrig = printf(
getstr(userDest.lang, 'MSG_APORTADOR_DEST_CONFIRMED'),
- `${userDest.name + ' ' + userDest.surname}`);
+ `${userDest.username}`);
const msgDest = printf(
getstr(user.lang, 'MSG_APORTADOR_CONFIRMED'),
- `${user.name + ' ' + user.surname}`);
+ `${user.username}`);
await local_sendMsgTelegram(user.idapp, data.username, msgOrig);
await local_sendMsgTelegram(user.idapp, data.userDest, msgDest);
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index 70d0f1b..44070e1 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -667,7 +667,7 @@ module.exports = {
sendBackNotif: function(subscription, payload) {
- console.log('sendBackNotif:', subscription, payload);
+ // console.log('sendBackNotif:', subscription, payload);
const pushOptions = {
vapidDetails: {
@@ -2319,7 +2319,7 @@ module.exports = {
},
blockwords(mystr) {
- const arrwords = ['http', 'Http', 'Asasfasfas', '://', 'mrbit', 'admin', 'info', 'superuser'];
+ const arrwords = ['http', 'Http', 'Asasfasfas', '://', 'mrbit', 'admin', 'superuser'];
for (const myword of arrwords) {
if (mystr.includes(myword)) {
return true;
@@ -2445,4 +2445,8 @@ module.exports = {
return nome;
},
+ sulServer() {
+ return process.env.LOCALE !== '1'
+ }
+
};
diff --git a/src/server/tools/server_constants.js b/src/server/tools/server_constants.js
index a83e1eb..d77f461 100755
--- a/src/server/tools/server_constants.js
+++ b/src/server/tools/server_constants.js
@@ -6,7 +6,7 @@ module.exports = Object.freeze({
RIS_CODE_EMAIL_ALREADY_VERIFIED: -5,
RIS_CODE_EMAIL_VERIFIED: 1,
- RIS_CODE_USER_NOT_THIS_APORTADOR: -75,
+ RIS_CODE_USER_APORTADOR_NOT_VALID: -75,
RIS_CODE_USER_EXTRALIST_NOTFOUND: -70,
RIS_CODE_USERNAME_ALREADY_EXIST: -60,
RIS_CODE_USERNAME_NOT_VALID: -65,