Merge 7ec7ccc402 into a42f220ee2

bin/extractPadData.js

@@ -10,17 +10,26 @@ if(process.argv.length != 3)
 //get the padID
 var padId = process.argv[2];
 
-//initalize the database
+var db, dirty, padManager, pad;
-var log4js = require("log4js");
-log4js.setGlobalLogLevel("INFO");
-var async = require("async");
-var db = require('../node/db/DB');
-var dirty = require("dirty")(padId + ".db");
-var padManager; 
-var pad;
 var neededDBValues = ["pad:"+padId];
 
+var npm = require("../src/node_modules/npm");
+var async = require("../src/node_modules/async");
+var log4js = require("../src/node_modules/log4js");
+log4js.setGlobalLogLevel("INFO");
+
 async.series([
+  // load npm
+  function(callback) {
+    npm.load({}, function(er) {
+      callback(er)
+    })
+  },
+  // load modules
+  function(callback) {
+    db = require('../src/node/db/DB');
+    dirty = require("../src/node_modules/ueberDB/node_modules/dirty")(padId + ".db");
+  },
   //intallize the database
   function (callback)
   {

doc/api/http_api.md

@@ -414,7 +414,7 @@ sends a custom message of type `msg` to the pad
 #### checkToken()
  * API >= 1.2
 
-returns ok when api token is valid
+returns ok when the current api token is valid
 
 *Example returns:*
   * `{"code":0,"message":"ok","data":null}`

src/node/db/API.js

@@ -549,7 +549,7 @@ exports.sendClientsMessage = function (padID, msg, callback) {
 }
 
 /**
-checkToken() returns ok when api token is valid
+checkToken() returns ok when the current api token is valid
 
 Example returns: