Merge pull request #32 from chrissanders/v1.5.3

V1.5.3

README.md

@@ -6,4 +6,4 @@ Installation: http://www.flowbat.com/installation.html<br/>
 User Manual: http://www.flowbat.com/user-manual.html<br/>
 Support: support@flowbat.com
 
-v1.5.1
+v1.5.3

private/bundle/.node_version.txt

@@ -0,0 +1 @@
+v8.8.1

private/bundle/README

@@ -1,5 +1,5 @@
 This is a Meteor application bundle. It has only one external dependency:
-Node.js 0.10.36 or newer. To run the application:
+Node.js v8.8.1. To run the application:
 
   $ (cd programs/server && npm install)
   $ export MONGO_URL='mongodb://user:password@host:port/databasename'

private/bundle/main.js

@@ -1,9 +1,4 @@
 
-// The debugger pauses here when you run `meteor debug`, because this is 
-// the very first code to be executed by the server process. If you have 
-// not already added any `debugger` statements to your code, feel free to 
-// do so now, wait for the server to restart, then reload this page and 
-// click the |▶ button to continue.
 process.argv.splice(2, 0, 'program.json');
 process.chdir(require('path').join(__dirname, 'programs', 'server'));
 require('./programs/server/boot.js');

private/bundle/programs/server/app/common/configs.defaults.coffee

@@ -0,0 +1,26 @@
+(function(){
+
+/////////////////////////////////////////////////////////////////////////
+//                                                                     //
+// common/configs.defaults.coffee                                      //
+//                                                                     //
+/////////////////////////////////////////////////////////////////////////
+                                                                       //
+__coffeescriptShare = typeof __coffeescriptShare === 'object' ? __coffeescriptShare : {}; var share = __coffeescriptShare;
+var configPreSave;                                                     // 1
+                                                                       //
+configPreSave = function (userId, changes) {};                         // 1
+                                                                       //
+share.Configs.before.update(function (userId, config, fieldNames, modifier, options) {
+  var now;                                                             // 4
+  now = new Date();                                                    // 4
+  modifier.$set = modifier.$set || {};                                 // 5
+  modifier.$set.updatedAt = modifier.$set.updatedAt || now;            // 6
+  return configPreSave.call(this, userId, modifier.$set);              // 10
+});                                                                    // 3
+/////////////////////////////////////////////////////////////////////////
+
+}).call(this);
+
+//# sourceURL=meteor://💻app/app/common/configs.defaults.coffee
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1ldGVvcjovL/CfkrthcHAvY29tbW9uL2NvbmZpZ3MuZGVmYXVsdHMuY29mZmVlIl0sIm5hbWVzIjpbImNvbmZpZ1ByZVNhdmUiLCJ1c2VySWQiLCJjaGFuZ2VzIiwic2hhcmUiLCJDb25maWdzIiwiYmVmb3JlIiwidXBkYXRlIiwiY29uZmlnIiwiZmllbGROYW1lcyIsIm1vZGlmaWVyIiwib3B0aW9ucyIsIm5vdyIsIkRhdGUiLCIkc2V0IiwidXBkYXRlZEF0IiwiY2FsbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsSUFBQUEsYUFBQTs7QUFBQUEsZ0JBQWdCLFVBQUNDLE1BQUQsRUFBU0MsT0FBVCxJQUFoQjs7QUFFQUMsTUFBTUMsT0FBTixDQUFjQyxNQUFkLENBQXFCQyxNQUFyQixDQUE0QixVQUFDTCxNQUFELEVBQVNNLE1BQVQsRUFBaUJDLFVBQWpCLEVBQTZCQyxRQUE3QixFQUF1Q0MsT0FBdkM7QUFDMUIsTUFBQUMsR0FBQTtBQUFBQSxRQUFNLElBQUlDLElBQUosRUFBTjtBQUNBSCxXQUFTSSxJQUFULEdBQWdCSixTQUFTSSxJQUFULElBQWlCLEVBQWpDO0FBQ0FKLFdBQVNJLElBQVQsQ0FBY0MsU0FBZCxHQUEwQkwsU0FBU0ksSUFBVCxDQUFjQyxTQUFkLElBQTJCSCxHQUFyRDtBQUlBLFNBSEFYLGNBQWNlLElBQWQsQ0FBbUIsSUFBbkIsRUFBc0JkLE1BQXRCLEVBQThCUSxTQUFTSSxJQUF2QyxDQUdBO0FBUEYsMkUiLCJmaWxlIjoiL2NvbW1vbi9jb25maWdzLmRlZmF1bHRzLmNvZmZlZSIsInNvdXJjZXNDb250ZW50IjpbImNvbmZpZ1ByZVNhdmUgPSAodXNlcklkLCBjaGFuZ2VzKSAtPlxuXG5zaGFyZS5Db25maWdzLmJlZm9yZS51cGRhdGUgKHVzZXJJZCwgY29uZmlnLCBmaWVsZE5hbWVzLCBtb2RpZmllciwgb3B0aW9ucykgLT5cbiAgbm93ID0gbmV3IERhdGUoKVxuICBtb2RpZmllci4kc2V0ID0gbW9kaWZpZXIuJHNldCBvciB7fVxuICBtb2RpZmllci4kc2V0LnVwZGF0ZWRBdCA9IG1vZGlmaWVyLiRzZXQudXBkYXRlZEF0IG9yIG5vd1xuICBjb25maWdQcmVTYXZlLmNhbGwoQCwgdXNlcklkLCBtb2RpZmllci4kc2V0KVxuIl19

private/bundle/programs/server/app/common/ipsets.defaults.coffee

@@ -0,0 +1,59 @@
+(function(){
+
+/////////////////////////////////////////////////////////////////////////
+//                                                                     //
+// common/ipsets.defaults.coffee                                       //
+//                                                                     //
+/////////////////////////////////////////////////////////////////////////
+                                                                       //
+__coffeescriptShare = typeof __coffeescriptShare === 'object' ? __coffeescriptShare : {}; var share = __coffeescriptShare;
+var ipsetPreSave;                                                      // 1
+                                                                       //
+ipsetPreSave = function (userId, changes) {};                          // 1
+                                                                       //
+share.IPSets.before.insert(function (userId, ipset) {                  // 3
+  var count, now, prefix;                                              // 4
+  ipset._id = ipset._id || Random.id();                                // 4
+  now = new Date();                                                    // 5
+                                                                       //
+  _.defaults(ipset, {                                                  // 6
+    name: "",                                                          // 7
+    note: "",                                                          // 8
+    contents: "",                                                      // 9
+    isOutputStale: true,                                               // 10
+    isNew: true,                                                       // 11
+    ownerId: userId,                                                   // 12
+    updatedAt: now,                                                    // 13
+    createdAt: now                                                     // 14
+  });                                                                  // 7
+                                                                       //
+  if (!ipset.name) {                                                   // 16
+    prefix = "New IP Set";                                             // 17
+    count = share.IPSets.find({                                        // 18
+      name: {                                                          // 18
+        $regex: "^" + prefix,                                          // 18
+        $options: "i"                                                  // 18
+      }                                                                // 18
+    }).count();                                                        // 18
+    ipset.name = prefix;                                               // 19
+                                                                       //
+    if (count) {                                                       // 20
+      ipset.name += " (" + count + ")";                                // 21
+    }                                                                  // 16
+  }                                                                    // 31
+                                                                       //
+  return ipsetPreSave.call(this, userId, ipset);                       // 32
+});                                                                    // 3
+share.IPSets.before.update(function (userId, ipset, fieldNames, modifier, options) {
+  var now;                                                             // 25
+  now = new Date();                                                    // 25
+  modifier.$set = modifier.$set || {};                                 // 26
+  modifier.$set.updatedAt = modifier.$set.updatedAt || now;            // 27
+  return ipsetPreSave.call(this, userId, modifier.$set);               // 40
+});                                                                    // 24
+/////////////////////////////////////////////////////////////////////////
+
+}).call(this);
+
+//# sourceURL=meteor://💻app/app/common/ipsets.defaults.coffee
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1ldGVvcjovL/CfkrthcHAvY29tbW9uL2lwc2V0cy5kZWZhdWx0cy5jb2ZmZWUiXSwibmFtZXMiOlsiaXBzZXRQcmVTYXZlIiwidXNlcklkIiwiY2hhbmdlcyIsInNoYXJlIiwiSVBTZXRzIiwiYmVmb3JlIiwiaW5zZXJ0IiwiaXBzZXQiLCJjb3VudCIsIm5vdyIsInByZWZpeCIsIl9pZCIsIlJhbmRvbSIsImlkIiwiRGF0ZSIsIl8iLCJkZWZhdWx0cyIsIm5hbWUiLCJub3RlIiwiY29udGVudHMiLCJpc091dHB1dFN0YWxlIiwiaXNOZXciLCJvd25lcklkIiwidXBkYXRlZEF0IiwiY3JlYXRlZEF0IiwiZmluZCIsIiRyZWdleCIsIiRvcHRpb25zIiwiY2FsbCIsInVwZGF0ZSIsImZpZWxkTmFtZXMiLCJtb2RpZmllciIsIm9wdGlvbnMiLCIkc2V0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxJQUFBQSxZQUFBOztBQUFBQSxlQUFlLFVBQUNDLE1BQUQsRUFBU0MsT0FBVCxJQUFmOztBQUVBQyxNQUFNQyxNQUFOLENBQWFDLE1BQWIsQ0FBb0JDLE1BQXBCLENBQTJCLFVBQUNMLE1BQUQsRUFBU00sS0FBVDtBQUN6QixNQUFBQyxLQUFBLEVBQUFDLEdBQUEsRUFBQUMsTUFBQTtBQUFBSCxRQUFNSSxHQUFOLEdBQVlKLE1BQU1JLEdBQU4sSUFBYUMsT0FBT0MsRUFBUCxFQUF6QjtBQUNBSixRQUFNLElBQUlLLElBQUosRUFBTjs7QUFDQUMsSUFBRUMsUUFBRixDQUFXVCxLQUFYLEVBQ0U7QUFBQVUsVUFBTSxFQUFOO0FBQ0FDLFVBQU0sRUFETjtBQUVBQyxjQUFVLEVBRlY7QUFHQUMsbUJBQWUsSUFIZjtBQUlBQyxXQUFPLElBSlA7QUFLQUMsYUFBU3JCLE1BTFQ7QUFNQXNCLGVBQVdkLEdBTlg7QUFPQWUsZUFBV2Y7QUFQWCxHQURGOztBQVVBLE1BQUcsQ0FBSUYsTUFBTVUsSUFBYjtBQUNFUCxhQUFTLFlBQVQ7QUFDQUYsWUFBUUwsTUFBTUMsTUFBTixDQUFhcUIsSUFBYixDQUFrQjtBQUFFUixZQUFNO0FBQUVTLGdCQUFRLE1BQU1oQixNQUFoQjtBQUF3QmlCLGtCQUFVO0FBQWxDO0FBQVIsS0FBbEIsRUFBcUVuQixLQUFyRSxFQUFSO0FBQ0FELFVBQU1VLElBQU4sR0FBYVAsTUFBYjs7QUFDQSxRQUFHRixLQUFIO0FBQ0VELFlBQU1VLElBQU4sSUFBYyxPQUFPVCxLQUFQLEdBQWUsR0FBN0I7QUFMSjtBQWVDOztBQUNELFNBVkFSLGFBQWE0QixJQUFiLENBQWtCLElBQWxCLEVBQXFCM0IsTUFBckIsRUFBNkJNLEtBQTdCLENBVUE7QUE3QkY7QUFxQkFKLE1BQU1DLE1BQU4sQ0FBYUMsTUFBYixDQUFvQndCLE1BQXBCLENBQTJCLFVBQUM1QixNQUFELEVBQVNNLEtBQVQsRUFBZ0J1QixVQUFoQixFQUE0QkMsUUFBNUIsRUFBc0NDLE9BQXRDO0FBQ3pCLE1BQUF2QixHQUFBO0FBQUFBLFFBQU0sSUFBSUssSUFBSixFQUFOO0FBQ0FpQixXQUFTRSxJQUFULEdBQWdCRixTQUFTRSxJQUFULElBQWlCLEVBQWpDO0FBQ0FGLFdBQVNFLElBQVQsQ0FBY1YsU0FBZCxHQUEwQlEsU0FBU0UsSUFBVCxDQUFjVixTQUFkLElBQTJCZCxHQUFyRDtBQWFBLFNBWkFULGFBQWE0QixJQUFiLENBQWtCLElBQWxCLEVBQXFCM0IsTUFBckIsRUFBNkI4QixTQUFTRSxJQUF0QyxDQVlBO0FBaEJGLDRFIiwiZmlsZSI6Ii9jb21tb24vaXBzZXRzLmRlZmF1bHRzLmNvZmZlZSIsInNvdXJjZXNDb250ZW50IjpbImlwc2V0UHJlU2F2ZSA9ICh1c2VySWQsIGNoYW5nZXMpIC0+XG5cbnNoYXJlLklQU2V0cy5iZWZvcmUuaW5zZXJ0ICh1c2VySWQsIGlwc2V0KSAtPlxuICBpcHNldC5faWQgPSBpcHNldC5faWQgfHwgUmFuZG9tLmlkKClcbiAgbm93ID0gbmV3IERhdGUoKVxuICBfLmRlZmF1bHRzKGlwc2V0LFxuICAgIG5hbWU6IFwiXCJcbiAgICBub3RlOiBcIlwiXG4gICAgY29udGVudHM6IFwiXCJcbiAgICBpc091dHB1dFN0YWxlOiB0cnVlXG4gICAgaXNOZXc6IHRydWVcbiAgICBvd25lcklkOiB1c2VySWRcbiAgICB1cGRhdGVkQXQ6IG5vd1xuICAgIGNyZWF0ZWRBdDogbm93XG4gIClcbiAgaWYgbm90IGlwc2V0Lm5hbWVcbiAgICBwcmVmaXggPSBcIk5ldyBJUCBTZXRcIlxuICAgIGNvdW50ID0gc2hhcmUuSVBTZXRzLmZpbmQoeyBuYW1lOiB7ICRyZWdleDogXCJeXCIgKyBwcmVmaXgsICRvcHRpb25zOiBcImlcIiB9IH0pLmNvdW50KClcbiAgICBpcHNldC5uYW1lID0gcHJlZml4XG4gICAgaWYgY291bnRcbiAgICAgIGlwc2V0Lm5hbWUgKz0gXCIgKFwiICsgY291bnQgKyBcIilcIlxuICBpcHNldFByZVNhdmUuY2FsbChALCB1c2VySWQsIGlwc2V0KVxuXG5zaGFyZS5JUFNldHMuYmVmb3JlLnVwZGF0ZSAodXNlcklkLCBpcHNldCwgZmllbGROYW1lcywgbW9kaWZpZXIsIG9wdGlvbnMpIC0+XG4gIG5vdyA9IG5ldyBEYXRlKClcbiAgbW9kaWZpZXIuJHNldCA9IG1vZGlmaWVyLiRzZXQgb3Ige31cbiAgbW9kaWZpZXIuJHNldC51cGRhdGVkQXQgPSBtb2RpZmllci4kc2V0LnVwZGF0ZWRBdCBvciBub3dcbiAgaXBzZXRQcmVTYXZlLmNhbGwoQCwgdXNlcklkLCBtb2RpZmllci4kc2V0KVxuIl19