- Mail in a Box: comandi per aggiungere/modificare/rimuovere le caselle di posta

- aggiunto idMyGroup: ospiti siti di gruppi (AbitareGliIblei)

src/server/models/site.js

@@ -64,6 +64,18 @@ const SiteSchema = new Schema({
   cf_zoneId: {
     type: String,
   },
+  servermail: {
+    type: String,
+  },
+  servermailip: {
+    type: String,
+  },
+  dkim: {
+    type: String,
+  },
+  enable_servermail: {
+    type: Boolean,
+  },
   portapp: {
     type: String,
   },
@@ -220,7 +232,10 @@ const SiteSchema = new Schema({
   ecomm: {
     enablePreOrders: { type: Boolean, default: false },
     NoteExtraOnCart: { type: String, default: '' },
-  }
+  },
+  idMyGroup: {
+    type: String,
+  },
 });
 
 var Site = module.exports = mongoose.model('Site', SiteSchema);
@@ -291,6 +306,8 @@ module.exports.findAllIdApp = async function (idapp) {
     rec.email_pwd = '';
     rec.telegram_key = '';
     rec.telegram_key_test = '';
+    rec.cf_token = '';
+    rec.cf_zoneId = '';
     // rec.confsite = {};
 
     return rec;

src/server/models/user.js

@@ -63,7 +63,9 @@ const UserSchema = new mongoose.Schema({
     type: String,
     required: true,
   },
-
+  idMyGroup: {
+    type: String,
+  },
   group: {
     type: Number,
   },
@@ -956,6 +958,7 @@ UserSchema.statics.getProjectUser = function () {
     sospeso: 1,
     verified_email: 1,
     verified_by_aportador: 1,
+    idMyGroup: 1,
     'profile.teleg_id': 1,
     'profile.username_telegram': 1,
     'profile.firstname_telegram': 1,
@@ -1876,6 +1879,7 @@ UserSchema.statics.getUserProfileByUsername = async function (
       username_who_report: 1,
       verified_email: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       'profile.nationality': 1,
       'profile.mygroups': 1,
       'profile.mycircuits': 1,
@@ -1921,6 +1925,7 @@ UserSchema.statics.getUserProfileByUsername = async function (
       username_who_report: 1,
       verified_email: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       'profile.nationality': 1,
       'profile.mygroups': 1,
       'profile.mycircuits': 1,
@@ -1966,6 +1971,7 @@ UserSchema.statics.getUserProfileByUsername = async function (
       username_who_report: 1,
       verified_email: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       notask_verif: 1,
       'profile.nationality': 1,
       'profile.mygroups': 1,
@@ -3338,6 +3344,7 @@ function getWhatToShow(idapp, username) {
     username_who_report: 1,
     verified_email: 1,
     verified_by_aportador: 1,
+    idMyGroup: 1,
     notask_verif: 1,
     'profile.nationality': 1,
     'profile.mygroups': 1,
@@ -3376,6 +3383,7 @@ function getWhatToShow_Unknown(idapp, username) {
     // sospeso: 1,
     verified_email: 1,
     verified_by_aportador: 1,
+    idMyGroup: 1,
     'profile.username_telegram': 1,
     'profile.img': 1,
     'profile.sex': 1,
@@ -3404,6 +3412,7 @@ UserSchema.statics.getWhatToShow_IfFriends = async function (idapp, username) {
     verified_email: 1,
     'profile.username_telegram': 1,
     verified_by_aportador: 1,
+    idMyGroup: 1,
     'profile.img': 1,
     'profile.sex': 1,
     'profile.born_province': 1,
@@ -4021,6 +4030,7 @@ UserSchema.statics.getUsersList = function (idapp) {
       lasttimeonline: 1,
       verified_email: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       made_gift: 1,
       perm: 1,
       email: 1,
@@ -4449,6 +4459,7 @@ UserSchema.statics.getLastUsers = async function (idapp) {
       surname: 1,
       lasttimeonline: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       'profile.img': 1,
       date_reg: 1,
       index: 1,
@@ -4479,6 +4490,7 @@ UserSchema.statics.getLastOnlineUsers = async function (idapp) {
       lasttimeonline: 1,
       date_reg: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       'profile.img': 1,
       index: 1,
     }).sort({ lasttimeonline: -1 }).limit(lastn).then((arr) => {
@@ -4506,6 +4518,7 @@ UserSchema.statics.getLastSharedLink = async function (idapp) {
       surname: 1,
       lasttimeonline: 1,
       verified_by_aportador: 1,
+      idMyGroup: 1,
       date_reg: 1,
       'profile.img': 1,
       index: 1,
@@ -4555,6 +4568,7 @@ UserSchema.statics.checkUser = async function (idapp, username) {
   return await User.findOne({ idapp, username }, {
     verified_email: 1,
     verified_by_aportador: 1,
+    idMyGroup: 1,
     notask_verif: 1,
     'profile.teleg_id': 1,
     'profile.teleg_checkcode': 1,