From 348d9a838f16450e6180822cf7c702ad1508523b Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@rhelmer.org>
Date: Wed, 15 Jan 2014 11:25:47 -0800
Subject: [PATCH] convert over to server-side crypto

---
 src/node/db/Pad.js             | 1 -
 src/node/db/ReadOnlyManager.js | 2 +-
 src/node/db/SecurityManager.js | 1 -
 src/node/db/SessionManager.js  | 2 +-
 src/node/handler/APIHandler.js | 2 +-
 src/node/utils/Settings.js     | 2 +-
 6 files changed, 4 insertions(+), 6 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");
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index 7206eb87..62025c50 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -23,7 +23,7 @@ var ERR = require("async-stacktrace");
 var fs = require("fs");
 var api = require("../db/API");
 var padManager = require("../db/PadManager");
-var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
+var randomString = require("../utils/randomstring");
 
 //ensure we have an apikey
 var apikey = null;
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index ee696b03..bc13a211 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -26,7 +26,7 @@ var argv = require('./Cli').argv;
 var npm = require("npm/lib/npm.js");
 var jsonminify = require("jsonminify");
 var log4js = require("log4js");
-var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
+var randomString = require("./randomstring");
 
 
 /* Root path of the installation */