elderwand 0.1.67 → 0.1.70

package/BaseController/BaseController.js

@@ -97,6 +97,7 @@ module.exports.inherit = function (child) {
 					page: page + 1,
 					pages: pages,
 					perPage: perPage,
+					pageCount: pageCount,
 					isFiltered: Object.keys(req.anyKey).length > 0 ? true : false,
 					//menu: utils.getUserMenu(req.user),
 				};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elderwand",
-  "version": "0.1.67",
+  "version": "0.1.70",
   "description": "Mamtas Technology Internal Framework",
   "main": "./node_modules/.bin/nodemon index.js",
   "scripts": {

package/utils/utils.js

@@ -208,7 +208,7 @@ exports.doRequest = function(options, http,  cb){
 
 	if(options.method != "GET"){
 		if(options.encodingType == "json"){
-			post_data = Buffer.from(JSON.stringify(options.postData),'utf8');
+			post_data = new Buffer(JSON.stringify(options.postData), "utf-8");
 			options.headers['Content-Length'] = post_data.length;
 			options.headers['Content-Type'] = "application/json";
 
@@ -217,12 +217,11 @@ exports.doRequest = function(options, http,  cb){
 			options.headers['Content-Length'] = post_data.length;
 
 		}else{
-			post_data = Buffer.from(querystring.stringify(options.postData),'utf8');
+			post_data = querystring.stringify(options.postData);
 			options.headers['Content-Length'] = post_data.length;
 			options.headers['Content-Type'] = "application/x-www-form-urlencoded; charset=UTF-8";
 		}
 	}
-	//EWLog(options)
 	var req = http.request(options, function(res){
 		res.setEncoding(options.encoding);
 		var data = '';
@@ -238,7 +237,11 @@ exports.doRequest = function(options, http,  cb){
 		});
 	});
 	if(options.method != "GET"){
-		req.write(post_data,'binary');
+		if(options.encodingType == "binary"){
+			req.write(post_data,'binary');
+		}else{
+			var ret = req.write(post_data, "utf-8");
+		}
 	}
 
 	req.on('error', function(e) {
@@ -256,6 +259,7 @@ exports.doRequest = function(options, http,  cb){
 };
 
 
+
 exports.createHttpPostOptions = function(url, parameters, data){
 	var options = {
 		socksPort: 9050, // Tor