isite 2023.1.3 → 2023.1.5

package/index.js

@@ -188,7 +188,7 @@ module.exports = function init(options) {
 
   ____0.words = require('./lib/words.js')(____0);
   ____0.word = ____0.words.word;
-  ____0.words.addList(____0.dir + '/json/words.json');
+  ____0.words.addFile(____0.dir + '/json/words.json');
 
   ____0.storage = require('./lib/storage.js')(____0).fn;
   ____0.logs = require('./lib/logs.js')(____0).fn;
@@ -250,7 +250,7 @@ module.exports = function init(options) {
   ____0.importApp = function (app_path, name2) {
     ____0.log('===  Importing App : ' + app_path);
     if (____0.isFileExistsSync(app_path + '/site_files/json/words.json')) {
-      ____0.words.addPath(app_path);
+      ____0.words.addFile(app_path + '/site_files/json/words.json');
     }
 
     if (____0.isFileExistsSync(app_path + '/site_files/json/vars.json')) {

package/lib/email.js

@@ -1,5 +1,4 @@
 module.exports = function init(____0) {
-    
   ____0.sendFreeMail = function (mail, callback) {
     callback =
       callback ||
@@ -30,6 +29,7 @@ module.exports = function init(____0) {
   };
 
   ____0.sendSmptMail = function (mail, callback) {
+    console.log(mail);
     callback =
       callback ||
       function (err, res) {
@@ -43,11 +43,14 @@ module.exports = function init(____0) {
     var transporter = ____0.nodemailer.createTransport({
       host: mail.host,
       port: mail.port || 587,
+      service: "Mandrill",
       secure: mail.secure, // true for 465, false for other ports
       auth: {
         user: mail.username, // generated ethereal user
         pass: mail.password, // generated ethereal password
+        apiKey : mail.password
       },
+      logger: true, // log to console
     });
 
     var mailOptions = {
@@ -58,11 +61,11 @@ module.exports = function init(____0) {
       subject: mail.subject,
       html: mail.message,
       text: mail.message.replace(/<[^>]+>/g, ''),
-      headers: {
-        'x-lib': 'isite',
-      },
+    //  headers: {
+    //    'x-lib': 'isite',
+    //  },
       date: new Date(),
-      attachments: [{ filename: 'isite.txt', content: 'test attachment', contentType: 'text/plain' }],
+    //  attachments: [{ filename: 'isite.txt', content: 'test attachment', contentType: 'text/plain' }],
     };
 
     transporter.sendMail(mailOptions, function (err, info) {
@@ -93,16 +96,14 @@ module.exports = function init(____0) {
     });
   };
 
-//   let transporter = nodemailer.createTransport({
-//     host: "smtp.gmail.com",
-//     port: 465,
-//     secure: true,
-//     auth: {
-//       type: "OAuth2",
-//       user: "user@example.com",
-//       accessToken: "ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x",
-//     },
-//   });
-
-
+  //   let transporter = nodemailer.createTransport({
+  //     host: "smtp.gmail.com",
+  //     port: 465,
+  //     secure: true,
+  //     auth: {
+  //       type: "OAuth2",
+  //       user: "user@example.com",
+  //       accessToken: "ya29.Xx_XX0xxxxx-xX0X0XxXXxXxXXXxX0x",
+  //     },
+  //   });
 };

package/lib/parser.js

@@ -289,7 +289,7 @@ module.exports = function init(req, res, ____0, route) {
   }
 
   function renderWord(name) {
-    return ____0.words.get(name)[req.session.lang] || name;
+    return req.word(name);
   }
 
   function getContent(name) {

package/lib/routing.js

@@ -676,6 +676,9 @@ module.exports = function init(____0) {
 
       return userFinger;
     };
+    req.word = function(name){
+      return ____0.word(name)[req.session.lang] || name;
+    }
 
     res.code = null;
     req.socket.remoteAddress = req.socket.remoteAddress || '';

package/lib/session.js

@@ -183,6 +183,7 @@ module.exports = function init(req, res, ____0, callback) {
     }
 
     AssignFeatures();
+    
     if (____0.security && session.user_id) {
       ____0.security.getUser(
         {

package/lib/words.js

@@ -2,13 +2,16 @@ module.exports = function init(____0) {
   let app = function () {};
   app.list = [];
   app.$collectoin = ____0.connectCollection('app_words');
+  app.ready = false;
 
   app.$collectoin.findAll({ limit: 10000 }, (err, docs) => {
     if (!err && docs && docs.length > 0) {
       docs.forEach((doc) => {
+        doc.$isDB = true;
         app.list.unshift(doc);
       });
     }
+    app.ready = true;
   });
 
   app.word = function (obj) {
@@ -21,9 +24,12 @@ module.exports = function init(____0) {
   };
 
   app.get = function (name) {
-    if ((w = app.list.find((ww) => ww.name === name))) {
+    if ((w = app.list.find((w2) => w2.name === name))) {
       return w;
     } else {
+      if (!app.ready) {
+        return { name: name };
+      }
       return app.add({ name: name });
     }
   };
@@ -31,40 +37,40 @@ module.exports = function init(____0) {
   app.add = app.set = function (word) {
     let index = app.list.findIndex((w) => w.name === word.name);
     if (index === -1) {
+      app.list.push(word);
       app.$collectoin.add(word, (err, doc) => {
         if (!err && doc) {
-          app.list.push(doc);
+          let index = app.list.findIndex((w) => w.name === doc.name);
+          app.list[index] = doc;
         }
       });
     } else {
-      app.list[index] = word;
-      app.$collectoin.update(app.list[index]);
+      if (!app.list[index].$isDB || word.$isDB) {
+        app.list[index] = word;
+        app.$collectoin.update(app.list[index]);
+      }
     }
 
     return word;
   };
 
   app.addList = function (list) {
-    if (typeof list === 'string') {
-      ____0.readFile(list, (err, data) => {
-        if (!err) {
-          let arr = ____0.fromJson(data);
-          arr.forEach((doc) => {
-            app.add(doc);
-          });
-        }
-      });
-    } else if (Array.isArray(list)) {
+    if (Array.isArray(list)) {
       list.forEach((doc) => {
         app.add(doc);
       });
-    } else if (typeof list === 'object') {
-      app.add(list);
     }
   };
 
-  app.addPath = function (app_path) {
-    app.addList(app_path + '/site_files/json/app.json', false);
+  app.addFile = function (path) {
+    ____0.readFile(path, (err, data) => {
+      if (!err) {
+        let arr = ____0.fromJson(data);
+        arr.forEach((doc) => {
+          app.add(doc);
+        });
+      }
+    });
   };
 
   ____0.on(____0.strings[9], () => {

package/object-options/index.js

@@ -37,7 +37,7 @@ function setOptions(_options, ____0) {
     _0x14xo: _0x14xo, // 3259376545129191
     _0xddxo: _0xddxo, // 421957684138766241719191
     log: !0,
-    lang: 'ar',
+    lang: 'en',
     theme: 'default',
     help: !1,
     stdin: !0,
@@ -45,9 +45,6 @@ function setOptions(_options, ____0) {
     _0xyyxo: '2654127326719191',
     ipLookup: false,
     www: true,
-    subDomainIntegration: false,
-    domainIntegration: false,
-    portIntegration: false,
     https: {
       enabled: !1,
       port: null,
@@ -161,9 +158,6 @@ function setOptions(_options, ____0) {
   _x0oo.apps_dir = _x0oo.apps_dir || template.apps_dir;
   _x0oo._0x14xo = _x0oo._0x14xo ?? !1;
   _x0oo.ipLookup = _x0oo.ipLookup ?? !1;
-  _x0oo.subDomainIntegration = _x0oo.subDomainIntegration ?? !1;
-  _x0oo.domainIntegration = _x0oo.domainIntegration ?? !1;
-  _x0oo.portIntegration = _x0oo.portIntegration ?? !1;
   _x0oo.www = _x0oo.www ?? template.www;
 
   _x0oo.https = _x0oo.https || template.https;

package/object-options/lib/fn.js

@@ -127,6 +127,47 @@ exports = module.exports = function init(____0) {
     }
     return 0;
   };
+
+  fn.toMoney = function (_num, float = true) {
+    let n = 0;
+    if (_num) {
+      _num = _num.toFixed(2).split('.');
+      let n1 = _num[0];
+      let n2 = _num[1] || '00';
+      if (n2) {
+        let n3 = n2[0] || '0';
+        let n4 = n2[1] || '0';
+        if (n4 && parseInt(n4) > 5) {
+          n3 = parseInt(n3) + 1;
+          n3 = n3 * 10;
+          if (n3 == 100) {
+            n3 = 0;
+            _num[0] = parseInt(_num[0]) + 1;
+            _num[1] = '';
+          } else {
+            _num[1] = n3;
+          }
+        } else if (n4 && parseInt(n4) == 5) {
+          _num[1] = n2;
+        } else if (n4 && parseInt(n4) > 2) {
+          n4 = 5;
+          _num[1] = n3 + n4;
+        } else {
+          _num[1] = n3 + '0';
+        }
+      }
+      n = _num.join('.');
+    }
+    if (!float) {
+      if (n && n.endsWith('.')) {
+        n = n + '00';
+      }
+      return n;
+    } else {
+      return fn.toFloat(n);
+    }
+  };
+
   fn.toInt = function (_num) {
     if (_num) {
       return parseInt(_num);
@@ -469,6 +510,7 @@ exports = module.exports = function init(____0) {
   ____0.fromBase64 = fn.fromBase64;
   ____0.to123 = fn.to123;
   ____0.toBase64 = fn.toBase64;
+  ____0.toMoney = fn.toMoney;
   ____0.getContentType = fn.getContentType;
   ____0.getFileEncode = fn.getFileEncode;
   ____0.typeof = ____0.typeOf = fn.typeOf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2023.01.03",
+  "version": "2023.01.05",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {