resolve merge conflict

18 files changed, 1 insertions, 34 deletions

diff --git a/src/node/db/AuthorManager.js b/src/node/db/AuthorManager.js
index 5ba608e9..e0f569ef 100644
--- a/src/node/db/AuthorManager.js
+++ b/src/node/db/AuthorManager.js
@@ -21,7 +21,6 @@
 
 var ERR = require("async-stacktrace");
 var db = require("./DB").db;
-var async = require("async");
 var customError = require("../utils/customError");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 
diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js
index df3c3826..6fae57ff 100644
--- a/src/node/db/SecurityManager.js
+++ b/src/node/db/SecurityManager.js
@@ -20,7 +20,6 @@
 
 
 var ERR = require("async-stacktrace");
-var db = require("./DB").db;
 var async = require("async");
 var authorManager = require("./AuthorManager");
 var padManager = require("./PadManager");
diff --git a/src/node/db/SessionStore.js b/src/node/db/SessionStore.js
index 52a504f1..5c45ddb3 100644
--- a/src/node/db/SessionStore.js
+++ b/src/node/db/SessionStore.js
@@ -5,8 +5,6 @@
  */
 
 var Store = require('ep_etherpad-lite/node_modules/connect/lib/middleware/session/store'),
-  utils = require('ep_etherpad-lite/node_modules/connect/lib/utils'),
-  Session = require('ep_etherpad-lite/node_modules/connect/lib/middleware/session/session'),
   db = require('ep_etherpad-lite/node/db/DB').db,
   log4js = require('ep_etherpad-lite/node_modules/log4js'),
   messageLogger = log4js.getLogger("SessionStore");
diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
index bc03f532..f12d66c2 100644
--- a/src/node/handler/ExportHandler.js
+++ b/src/node/handler/ExportHandler.js
@@ -21,7 +21,6 @@
 var ERR = require("async-stacktrace");
 var exporthtml = require("../utils/ExportHtml");
 var exporttxt = require("../utils/ExportTxt");
-var padManager = require("../db/PadManager");
 var async = require("async");
 var fs = require("fs");
 var settings = require('../utils/Settings');
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js
index ded1f660..8e372f1c 100644
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@@ -1,10 +1,8 @@
-var path = require('path');
 var eejs = require('ep_etherpad-lite/node/eejs');
 var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
 var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
 var _ = require('underscore');
 var semver = require('semver');
-var async = require('async');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/admin/plugins', function(req, res) {
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
index 42a07c73..4986f093 100644
--- a/src/node/hooks/express/adminsettings.js
+++ b/src/node/hooks/express/adminsettings.js
@@ -1,7 +1,5 @@
-var path = require('path');
 var eejs = require('ep_etherpad-lite/node/eejs');
 var settings = require('ep_etherpad-lite/node/utils/Settings');
-var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
 var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
 var fs = require('fs');
 
diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js
index 9a0a52bf..d60d3863 100644
--- a/src/node/hooks/express/padreadonly.js
+++ b/src/node/hooks/express/padreadonly.js
@@ -10,7 +10,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   { 
     var html;
     var padId;
-    var pad;
 
     async.series([
       //translate the read only pad to a padId
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index adf15212..b70aa50e 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -1,4 +1,3 @@
-var log4js = require('log4js');
 var settings = require('../../utils/Settings');
 var socketio = require('socket.io');
 var socketIORouter = require("../../handler/SocketIORouter");
diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js
index 7d654c1b..c6a22745 100644
--- a/src/node/hooks/express/static.js
+++ b/src/node/hooks/express/static.js
@@ -1,11 +1,8 @@
-var path = require('path');
 var minify = require('../../utils/Minify');
 var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
 var CachingMiddleware = require('../../utils/caching_middleware');
 var settings = require("../../utils/Settings");
 var Yajsml = require('yajsml');
-var fs = require("fs");
-var ERR = require("async-stacktrace");
 var _ = require("underscore");
 
 exports.expressCreateServer = function (hook_name, args, cb) {
diff --git a/src/node/hooks/express/swagger.js b/src/node/hooks/express/swagger.js
index e8daa61c..55706a70 100644
--- a/src/node/hooks/express/swagger.js
+++ b/src/node/hooks/express/swagger.js
@@ -1,4 +1,3 @@
-var log4js = require('log4js');
 var express = require('express');
 var apiHandler = require('../../handler/APIHandler');
 var apiCaller = require('./apicalls').apiCaller;
diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index 6998853f..b798f2c7 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -2,7 +2,6 @@ var express = require('express');
 var log4js = require('log4js');
 var httpLogger = log4js.getLogger("http");
 var settings = require('../../utils/Settings');
-var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 var ueberStore = require('../../db/SessionStore');
 var stats = require('ep_etherpad-lite/node/stats')
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 62631b93..67815659 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,7 +1,6 @@
 var languages = require('languages4translatewiki')
   , fs = require('fs')
   , path = require('path')
-  , express = require('express')
   , _ = require('underscore')
   , npm = require('npm')
   , plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins.js').plugins
diff --git a/src/node/utils/Abiword.js b/src/node/utils/Abiword.js
index 5f12bd97..1d9ac5d3 100644
--- a/src/node/utils/Abiword.js
+++ b/src/node/utils/Abiword.js
@@ -18,7 +18,6 @@
  * limitations under the License.
  */
  
-var util  = require('util');
 var spawn = require('child_process').spawn;
 var async = require("async");
 var settings = require("./Settings");
diff --git a/src/node/utils/ExportHelper.js b/src/node/utils/ExportHelper.js
index 136896f0..3297c6d3 100644
--- a/src/node/utils/ExportHelper.js
+++ b/src/node/utils/ExportHelper.js
@@ -18,12 +18,7 @@
  * limitations under the License.
  */
 
-var async = require("async");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
-var padManager = require("../db/PadManager");
-var ERR = require("async-stacktrace");
-var Security = require('ep_etherpad-lite/static/js/security');
-var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 
 exports.getPadPlainText = function(pad, revNum){
   var atext = ((revNum !== undefined) ? pad.getInternalRevisionAText(revNum) : pad.atext());
diff --git a/src/node/utils/ExportTxt.js b/src/node/utils/ExportTxt.js
index f0b62743..a6bec4a5 100644
--- a/src/node/utils/ExportTxt.js
+++ b/src/node/utils/ExportTxt.js
@@ -22,9 +22,6 @@ var async = require("async");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var padManager = require("../db/PadManager");
 var ERR = require("async-stacktrace");
-var Security = require('ep_etherpad-lite/static/js/security');
-var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
-var getPadPlainText = require('./ExportHelper').getPadPlainText;
 var _analyzeLine = require('./ExportHelper')._analyzeLine;
 
 // This is slightly different than the HTML method as it passes the output to getTXTFromAText
@@ -82,7 +79,6 @@ function getTXTFromAtext(pad, atext, authorColors)
   var textLines = atext.text.slice(0, -1).split('\n');
   var attribLines = Changeset.splitAttributionLines(atext.attribs, atext.text);
 
-  var tags = ['h1', 'h2', 'strong', 'em', 'u', 's'];
   var props = ['heading1', 'heading2', 'bold', 'italic', 'underline', 'strikethrough'];
   var anumMap = {};
   var css = "";
@@ -110,7 +106,6 @@ function getTXTFromAtext(pad, atext, authorColors)
     // <b>Just bold <i>Bold and italics</i></b> <i>Just italics</i>
     var taker = Changeset.stringIterator(text);
     var assem = Changeset.stringAssembler();
-    var openTags = [];
 
     var idx = 0;
 
@@ -250,7 +245,6 @@ function getTXTFromAtext(pad, atext, authorColors)
   // so we want to do something reasonable there.  We also
   // want to deal gracefully with blank lines.
   // => keeps track of the parents level of indentation
-  var lists = []; // e.g. [[1,'bullet'], [3,'bullet'], ...]
   for (var i = 0; i < textLines.length; i++)
   {
     var line = _analyzeLine(textLines[i], attribLines[i], apool);
diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js
index e6b19542..7b868307 100644
--- a/src/node/utils/Minify.js
+++ b/src/node/utils/Minify.js
@@ -261,7 +261,6 @@ function getAceFile(callback) {
     // them into the file.
     async.forEach(founds, function (item, callback) {
       var filename = item.match(/"([^"]*)"/)[1];
-      var request = require('request');
 
       var baseURI = 'http://localhost:' + settings.port;
       var resourceURI = baseURI + path.normalize(path.join('/static/', filename));
diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js
index d30dc398..97134356 100644
--- a/src/node/utils/caching_middleware.js
+++ b/src/node/utils/caching_middleware.js
@@ -19,7 +19,6 @@ var Buffer = require('buffer').Buffer;
 var fs = require('fs');
 var path = require('path');
 var zlib = require('zlib');
-var util = require('util');
 var settings = require('./Settings');
 var semver = require('semver');
 
diff --git a/src/node/utils/toolbar.js b/src/node/utils/toolbar.js
index e8d02dd6..a5d30f96 100644
--- a/src/node/utils/toolbar.js
+++ b/src/node/utils/toolbar.js
@@ -4,7 +4,6 @@
 var _ = require("underscore")
   , tagAttributes
   , tag
-  , defaultButtons
   , Button
   , ButtonsGroup
   , Separator
@@ -122,8 +121,7 @@ _.extend(SelectButton.prototype, Button.prototype, {
   },
 
   select: function (attributes) {
-    var self = this
-      , options = [];
+      var options = [];
 
     _.each(this.options, function (opt) {
       var a = _.extend({