diff --git a/.DS_Store b/.DS_Store index fa57d1a..9d93a8b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.env.development b/.env.development index da25409..b7f4c66 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,12 @@ -DATABASE=test_PiuCheBuono +DATABASE=test_FreePlanet UDB=paofreeplanet PDB=mypassword@1A SEND_EMAIL=0 SEND_EMAIL_ORDERS=1 PORT=3000 -appTelegram_TEST=["1","17"] -appTelegram=["1","17"] -appTelegram_DEVELOP=["17"] +appTelegram_TEST=["1","13"] +appTelegram=["1","13"] +appTelegram_DEVELOP=["13"] DOMAIN=mongodb://localhost:27017/ AUTH_MONGODB=1 MONGODB_USER=admin @@ -41,10 +41,4 @@ FTPSERVER_PWD=ftpmypwd@1A_ AUTH_NEW_SITES=123123123 SCRIPTS_DIR=admin_scripts CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}] -MIAB_HOST=box.lamiaposta.org -MIAB_ADMIN_EMAIL=admin@lamiaposta.org -MIAB_ADMIN_PASSWORD=passpao1pabox@1A DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7" - -API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" -SERVER_A_URL="http://51.77.156.69:3000" \ No newline at end of file diff --git a/.env.prod.freeplanet.app b/.env.prod.freeplanet.app index cbebdb6..e8c7c79 100644 --- a/.env.prod.freeplanet.app +++ b/.env.prod.freeplanet.app @@ -19,7 +19,7 @@ VAPI_KEY_SUBJECT="mailto:paolo@freeplanet.app" PUBLIC_VAPI_KEY="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" PRIVATE_VAPI_KEY="St9UMzcS76Q9yKG6RInAuYydYjFRliqwHTJY3A5wjO0" GCM_API_KEY="AIzaSyD7w1jztfVV05mX1iyxoI-r1pZWxuxdUK8" -PATH_CERT_KEY=key.pem +PATH_CERT_KEY=privkey.pem PATH_SERVER_CRT=fullchain.pem PATH_SSL_ROOT_PEM=root.pem PATH_SSL_CHAIN_PEM=chain.pem diff --git a/.env.test.pcb b/.env.test.pcb index eb36735..2f4a247 100644 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -22,7 +22,7 @@ VAPI_KEY_SUBJECT="mailto:surya@riso.app" PUBLIC_VAPI_KEY="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" PRIVATE_VAPI_KEY="LVpFDJuKscdHuQr5pe20dFuYuWX1-ZRb6x72PP-Pp4I" GCM_API_KEY="AIzaSyD7w1jztfVV05mX1iyxoI-r1pZWxuxdUK8" -PATH_CERT_KEY=key.pem +PATH_CERT_KEY=privkey.pem PATH_SERVER_CRT=fullchain.pem PATH_SSL_ROOT_PEM=root.pem PATH_SSL_CHAIN_PEM=chain.pem diff --git a/.env.test.risosrv b/.env.test.risosrv index f7d3432..173ed71 100644 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -19,7 +19,7 @@ VAPI_KEY_SUBJECT="mailto:surya@riso.app" PUBLIC_VAPI_KEY="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" PRIVATE_VAPI_KEY="St9UMzcS76Q9yKG6RInAuYydYjFRliqwHTJY3A5wjO0" GCM_API_KEY="AIzaSyD7w1jztfVV05mX1iyxoI-r1pZWxuxdUK8" -PATH_CERT_KEY=key.pem +PATH_CERT_KEY=privkey.pem PATH_SERVER_CRT=fullchain.pem PATH_SSL_ROOT_PEM=root.pem PATH_SSL_CHAIN_PEM=chain.pem diff --git a/.env.test2 b/.env.test2 index e9e6f07..fd6fdbd 100644 --- a/.env.test2 +++ b/.env.test2 @@ -20,7 +20,7 @@ VAPI_KEY_SUBJECT="mailto:paolo@freeplanet.app" PUBLIC_VAPI_KEY="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" PRIVATE_VAPI_KEY="St9UMzcS76Q9yKG6RInAuYydYjFRliqwHTJY3A5wjO0" GCM_API_KEY="AIzaSyD7w1jztfVV05mX1iyxoI-r1pZWxuxdUK8" -PATH_CERT_KEY=key.pem +PATH_CERT_KEY=privkey.pem PATH_SERVER_CRT=fullchain.pem PATH_SSL_ROOT_PEM=root.pem PATH_SSL_CHAIN_PEM=chain.pem diff --git a/emails/.DS_Store b/emails/.DS_Store index d12274f..ab6ba62 100644 Binary files a/emails/.DS_Store and b/emails/.DS_Store differ diff --git a/logtrans.txt b/logtrans.txt index 3c241d1..ceaaf32 100644 --- a/logtrans.txt +++ b/logtrans.txt @@ -418,4 +418,9 @@ Gio 09/01 ORE 17:04: [Circuito RIS TerraNFT]: Inviate Monete da terranft Saldi: terranft (paoloar77): -30.00 RIS] -SuryaArena: 30.00 RIS] \ No newline at end of file +SuryaArena: 30.00 RIS] +Ven 28/02 ORE 19:40: [Circuito RIS Bologna]: Inviate Monete da surya1977 a SuryaSecondo 2 RIS [causale: aaa] + +Saldi: +surya1977: 33.90 RIS] +SuryaSecondo: 2.10 RIS] \ No newline at end of file diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 31a2722..d4cba3e 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -5041,8 +5041,11 @@ module.exports = { descrcontent = ''; } - if (title && icon) { - mystr += `${icon} ${title}`; + if (title) { + if (icon) + mystr += `${icon} `; + + mystr += `${title}`; if (acapo) { mystr += `\n`; diff --git a/src/server/version.txt b/src/server/version.txt index 2ac1f8d..9d0f128 100644 --- a/src/server/version.txt +++ b/src/server/version.txt @@ -1 +1 @@ -1.1.22 \ No newline at end of file +1.1.23 \ No newline at end of file