#1031 Added support for Node 6

pencilblue · May 9, 2016 · 13b919e · 13b919e
1 parent 699237d
commit 13b919e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/controllers/base_controller.js b/controllers/base_controller.js
@@ -375,6 +375,12 @@ module.exports = function BaseControllerModule(pb) {
 
             //convert to string
             var postParams = url.parse('?' + raw.toString(encoding), true).query;
+
+            //In Node v6 a breaking change was introduced into the "querystring" module to prevent reserved words from
+            // being passed in as query string parameters and overriding prototype functions.
+            // This fix allows for users to continue on with V6 until another viable option comes along
+            postParams.hawOwnProperty = Object.prototype.hasOwnProperty;
+
             cb(null, postParams);
         });
     };

diff --git a/controllers/form_controller.js b/controllers/form_controller.js
@@ -19,7 +19,7 @@
 var util = require('../include/util.js');
 
 module.exports = function(pb) {
-    
+
     /**
      * Provides the basic functionality for implementing a controller that
      * needs access to a posted form.
@@ -77,7 +77,7 @@ module.exports = function(pb) {
      * @param {Boolean} val
      */
     FormController.prototype.setAutoSanitize = function(val) {
-        this.autoSanitize = val ? true : false;
+        this.autoSanitize = !!val;
     };
 
     /**
@@ -103,6 +103,6 @@ module.exports = function(pb) {
     FormController.prototype.onPostParamsRetrieved = function(params, cb) {
         cb({content: JSON.stringify(params), content_type:'application/json'});
     };
-    
+
     return FormController;
 };
diff --git a/include/admin_navigation.js b/include/admin_navigation.js
@@ -287,10 +287,10 @@ module.exports = function AdminNavigationModule(pb) {
      * @param {String} site
      */
     function getAdditionsInScope(additions, site) {
-        if (additions.hasOwnProperty(site)) {
+        if (additions[site]) {
             return util.clone(additions[site]);
         }
-        else if (additions.hasOwnProperty(pb.SiteService.GLOBAL_SITE)) {
+        else if (additions[pb.SiteService.GLOBAL_SITE]) {
             return util.clone(additions[pb.SiteService.GLOBAL_SITE]);
         }
         return util.clone(additions);

diff --git a/include/dao/db_manager.js b/include/dao/db_manager.js
@@ -156,7 +156,7 @@ module.exports = function DBManagerModule(pb) {
          * @return {Boolean} Whether the pool has been connected
          */
         this.hasConnected = function(name){
-            return dbs.hasOwnProperty(name);
+            return typeof dbs[name] !== 'undefined';
         };
 
         /**

diff --git a/include/model/create_document.js b/include/model/create_document.js
@@ -83,12 +83,12 @@ module.exports = function DocumentCreatorModule(pb) {
             return false;
         }
 
-        if (post.hasOwnProperty('password')) {
-            post['password'] = pb.security.encrypt(post['password']);
+        if (post.password) {
+            post.password = pb.security.encrypt(post.password);
         }
 
-        if(post['confirm_password']) {
-            delete post['confirm_password'];
+        if(post.confirm_password) {
+            delete post.confirm_password;
         }
     };
 

diff --git a/include/security/authentication/index.js b/include/security/authentication/index.js
@@ -62,7 +62,7 @@ module.exports = function AuthenticationModule(pb) {
         }
 
         var dao;
-        if (credentials.hasOwnProperty('site')) {
+        if (credentials.site) {
             dao = new pb.SiteQueryService({site: credentials.site, onlyThisSite: false});
         } else {
             dao = new pb.DAO();

diff --git a/include/service/memory_entity_service.js b/include/service/memory_entity_service.js
@@ -190,7 +190,7 @@ module.exports = function MemoryEntityServiceModule(pb) {
     MemoryEntityService.prototype._set = function(key, value, cb) {
         var rawValue = null;
         var internalKey = MemoryEntityService.getKey(key, this.site, this.objType);
-        if (STORAGE.hasOwnProperty(internalKey)) {
+        if (STORAGE[internalKey]) {
             rawValue = STORAGE[internalKey];
             if (this.valueField == null) {
                 rawValue = value;

diff --git a/include/system/settings.js b/include/system/settings.js
@@ -253,7 +253,7 @@ module.exports = function SettingsModule(pb) {
 
         //validate key is not taken
         var where = { key: new RegExp('^' + util.escapeRegExp(obj.key) + '$', 'i') };
-        context.service.dao.exists(TYPE, where, function(err, exists) {console.log(context);
+        context.service.dao.exists(TYPE, where, function(err, exists) {
             if (exists && context.isCreate) {
                 errors.push(pb.BaseObjectService.validationFailure('key', 'key already exists'));
             }