diff options
author | Robert Helmer <rhelmer@rhelmer.org> | 2014-01-15 11:25:47 -0800 |
---|---|---|
committer | Robert Helmer <rhelmer@rhelmer.org> | 2014-01-15 11:44:57 -0800 |
commit | 348d9a838f16450e6180822cf7c702ad1508523b (patch) | |
tree | 8f9ae168c773f2a619f31f035fbb04b2594703b6 /src/node/db | |
parent | ae99c5ea6fbd9f051951d0f05d664ebf629f941c (diff) | |
download | etherpad-lite-348d9a838f16450e6180822cf7c702ad1508523b.zip |
convert over to server-side crypto
Diffstat (limited to 'src/node/db')
-rw-r--r-- | src/node/db/Pad.js | 1 | ||||
-rw-r--r-- | src/node/db/ReadOnlyManager.js | 2 | ||||
-rw-r--r-- | src/node/db/SecurityManager.js | 1 | ||||
-rw-r--r-- | src/node/db/SessionManager.js | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js index 4f0f268b..c7e0d50a 100644 --- a/src/node/db/Pad.js +++ b/src/node/db/Pad.js @@ -6,7 +6,6 @@ var ERR = require("async-stacktrace"); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); -var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; var db = require("./DB").db; var async = require("async"); var settings = require('../utils/Settings'); diff --git a/src/node/db/ReadOnlyManager.js b/src/node/db/ReadOnlyManager.js index dd1e478e..f49f71e2 100644 --- a/src/node/db/ReadOnlyManager.js +++ b/src/node/db/ReadOnlyManager.js @@ -22,7 +22,7 @@ var ERR = require("async-stacktrace"); var db = require("./DB").db; var async = require("async"); -var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; +var randomString = require("../utils/randomstring"); /** * returns a read only id for a pad diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js index 66cfd292..6388f096 100644 --- a/src/node/db/SecurityManager.js +++ b/src/node/db/SecurityManager.js @@ -26,7 +26,6 @@ var authorManager = require("./AuthorManager"); var padManager = require("./PadManager"); var sessionManager = require("./SessionManager"); var settings = require("../utils/Settings"); -var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; var log4js = require('log4js'); var authLogger = log4js.getLogger("auth"); diff --git a/src/node/db/SessionManager.js b/src/node/db/SessionManager.js index 60e0a7ac..b6ff1ce9 100644 --- a/src/node/db/SessionManager.js +++ b/src/node/db/SessionManager.js @@ -21,7 +21,7 @@ var ERR = require("async-stacktrace"); var customError = require("../utils/customError"); -var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString; +var randomString = require("../utils/randomstring"); var db = require("./DB").db; var async = require("async"); var groupMangager = require("./GroupManager"); |