mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-15 03:26:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

not working atm

Browse source
This commit is contained in:
webzwo0i 2021-01-02 17:33:01 +01:00
parent 1702c7c34e
commit 4fbf0e8e2a
68 changed files with 238 additions and 9606 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/db/API.js
View file

@ -18,7 +18,7 @@
* limitations under the License.
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const Changeset = require('../../static/js/Changeset');
const customError = require('../utils/customError');
const padManager = require('./PadManager');
const padMessageHandler = require('../handler/PadMessageHandler');

2
src/node/db/AuthorManager.js
View file

@ -20,7 +20,7 @@
const db = require('./DB');
const customError = require('../utils/customError');
const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
const randomString = require('../../static/js/pad_utils').randomString;
exports.getColorPalette = function () {
return [

2
src/node/db/GroupManager.js
View file

@ -19,7 +19,7 @@
*/
const customError = require('../utils/customError');
const randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
const randomString = require('../../static/js/pad_utils').randomString;
const db = require('./DB');
const padManager = require('./PadManager');
const sessionManager = require('./SessionManager');

6
src/node/db/Pad.js
View file

@ -3,8 +3,8 @@
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
const Changeset = require('../../static/js/Changeset');
const AttributePool = require('../../static/js/AttributePool');
const db = require('./DB');
const settings = require('../utils/Settings');
const authorManager = require('./AuthorManager');
@ -15,7 +15,7 @@ const customError = require('../utils/customError');
const readOnlyManager = require('./ReadOnlyManager');
const crypto = require('crypto');
const randomString = require('../utils/randomstring');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const hooks = require('../../static/js/pluginfw/hooks');
const promises = require('../utils/promises');
// serialization/deserialization attributes

2
src/node/db/SecurityManager.js
View file

@ -19,7 +19,7 @@
*/
const authorManager = require('./AuthorManager');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks.js');
const hooks = require('../../static/js/pluginfw/hooks.js');
const padManager = require('./PadManager');
const sessionManager = require('./SessionManager');
const settings = require('../utils/Settings');

6
src/node/db/SessionStore.js
View file

@ -7,9 +7,9 @@
* express-session, which can't actually use promises anyway.
*/
const DB = require('ep_etherpad-lite/node/db/DB');
const Store = require('ep_etherpad-lite/node_modules/express-session').Store;
const log4js = require('ep_etherpad-lite/node_modules/log4js');
const DB = require('./DB');
const Store = require('express-session').Store;
const log4js = require('log4js');
const logger = log4js.getLogger('SessionStore');

4
src/node/easysync_tests.js
View file

@ -21,8 +21,8 @@
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
const Changeset = require('../static/js/Changeset');
const AttributePool = require('../static/js/AttributePool');
function random() {
this.nextInt = function (maxValue) {

2
src/node/eejs/index.js
View file

@ -22,7 +22,7 @@
const ejs = require('ejs');
const fs = require('fs');
const path = require('path');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks.js');
const hooks = require('../../static/js/pluginfw/hooks.js');
const resolve = require('resolve');
const settings = require('../utils/Settings');

2
src/node/handler/ExportHandler.js
View file

@ -25,7 +25,7 @@ const exportEtherpad = require('../utils/ExportEtherpad');
const fs = require('fs');
const settings = require('../utils/Settings');
const os = require('os');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const hooks = require('../../static/js/pluginfw/hooks');
const TidyHtml = require('../utils/TidyHtml');
const util = require('util');

2
src/node/handler/ImportHandler.js
View file

@ -30,7 +30,7 @@ const os = require('os');
const importHtml = require('../utils/ImportHtml');
const importEtherpad = require('../utils/ImportEtherpad');
const log4js = require('log4js');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks.js');
const hooks = require('../../static/js/pluginfw/hooks.js');
const util = require('util');
const fsp_exists = util.promisify(fs.exists);

10
src/node/handler/PadMessageHandler.js
View file

@ -21,19 +21,19 @@
/* global exports, process, require */
const padManager = require('../db/PadManager');
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
const AttributeManager = require('ep_etherpad-lite/static/js/AttributeManager');
const Changeset = require('../../static/js/Changeset');
const AttributePool = require('../../static/js/AttributePool');
const AttributeManager = require('../../static/js/AttributeManager');
const authorManager = require('../db/AuthorManager');
const readOnlyManager = require('../db/ReadOnlyManager');
const settings = require('../utils/Settings');
const securityManager = require('../db/SecurityManager');
const plugins = require('ep_etherpad-lite/static/js/pluginfw/plugin_defs.js');
const plugins = require('../../static/js/pluginfw/plugin_defs.js');
const log4js = require('log4js');
const messageLogger = log4js.getLogger('message');
const accessLogger = log4js.getLogger('access');
const _ = require('underscore');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks.js');
const hooks = require('../../static/js/pluginfw/hooks.js');
const channels = require('channels');
const stats = require('../stats');
const assert = require('assert').strict;

4
src/node/hooks/express/admin.js
View file

@ -1,9 +1,9 @@
const eejs = require('ep_etherpad-lite/node/eejs');
const eejs = require('../../eejs');
exports.expressCreateServer = function (hook_name, args, cb) {
args.app.get('/admin', (req, res) => {
if ('/' != req.path[req.path.length - 1]) return res.redirect('./admin/');
res.send(eejs.require('ep_etherpad-lite/templates/admin/index.html', {req}));
res.send(eejs.require('../../../templates/admin/index.html', {req}));
});
return cb();
};

4
src/node/hooks/express/adminplugins.js
View file

@ -10,7 +10,7 @@ const UpdateCheck = require('../../utils/UpdateCheck');
exports.expressCreateServer = (hookName, args, cb) => {
args.app.get('/admin/plugins', (req, res) => {
res.send(eejs.require('ep_etherpad-lite/templates/admin/plugins.html', {
res.send(eejs.require('../../../templates/admin/plugins.html', {
plugins: plugins.plugins,
req,
errors: [],
@ -21,7 +21,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
const gitCommit = settings.getGitCommit();
const epVersion = settings.getEpVersion();
res.send(eejs.require('ep_etherpad-lite/templates/admin/plugins-info.html', {
res.send(eejs.require('../../../templates/admin/plugins-info.html', {
gitCommit,
epVersion,
latestVersion: UpdateCheck.getLatestVersion(),

2
src/node/hooks/express/adminsettings.js
View file

@ -7,7 +7,7 @@ const settings = require('../../utils/Settings');
exports.expressCreateServer = (hookName, args, cb) => {
args.app.get('/admin/settings', (req, res) => {
res.send(eejs.require('ep_etherpad-lite/templates/admin/settings.html', {
res.send(eejs.require('../../../templates/admin/settings.html', {
req,
settings: '',
errors: [],

2
src/node/hooks/express/errorhandling.js
View file

@ -1,4 +1,4 @@
const stats = require('ep_etherpad-lite/node/stats');
const stats = require('../../stats');
exports.expressCreateServer = function (hook_name, args, cb) {
exports.app = args.app;

8
src/node/hooks/express/specialpages.js
View file

@ -1,14 +1,14 @@
const path = require('path');
const eejs = require('ep_etherpad-lite/node/eejs');
const toolbar = require('ep_etherpad-lite/node/utils/toolbar');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const eejs = require('../../eejs');
const toolbar = require('../../utils/toolbar');
const hooks = require('../../../static/js/pluginfw/hooks');
const settings = require('../../utils/Settings');
const webaccess = require('./webaccess');
exports.expressCreateServer = function (hook_name, args, cb) {
// expose current stats
args.app.get('/stats', (req, res) => {
res.json(require('ep_etherpad-lite/node/stats').toJSON());
res.json(require('../../stats').toJSON());
});
// serve index.html under /

2
src/node/hooks/express/static.js
View file

@ -1,5 +1,5 @@
const minify = require('../../utils/Minify');
const plugins = require('ep_etherpad-lite/static/js/pluginfw/plugin_defs');
const plugins = require('../../../static/js/pluginfw/plugin_defs');
const CachingMiddleware = require('../../utils/caching_middleware');
const settings = require('../../utils/Settings');
const Yajsml = require('etherpad-yajsml');

4
src/node/hooks/i18n.js
View file

@ -3,7 +3,7 @@ const fs = require('fs');
const path = require('path');
const _ = require('underscore');
const npm = require('npm');
const plugins = require('ep_etherpad-lite/static/js/pluginfw/plugin_defs.js').plugins;
const plugins = require('../../static/js/pluginfw/plugin_defs.js').plugins;
const semver = require('semver');
const existsSync = require('../utils/path_exists');
const settings = require('../utils/Settings')
@ -39,7 +39,7 @@ function getAllLocales() {
}
// add core supported languages first
extractLangs(`${npm.root}/ep_etherpad-lite/locales`);
extractLangs(`${npm.root}/src/locales`);
// add plugins languages (if any)
for (const pluginName in plugins) extractLangs(path.join(npm.root, pluginName, 'locales'));

7
src/node/utils/AbsolutePaths.js
View file

@ -87,7 +87,7 @@ exports.findEtherpadRoot = function () {
*
* <BASE_DIR>\src
*/
let maybeEtherpadRoot = popIfEndsWith(splitFoundRoot, ['src']);
let maybeEtherpadRoot = popIfEndsWith(splitFoundRoot, []);
if ((maybeEtherpadRoot === false) && (process.platform === 'win32')) {
/*
@ -97,14 +97,15 @@ exports.findEtherpadRoot = function () {
*
* <BASE_DIR>\node_modules\ep_etherpad-lite
*/
maybeEtherpadRoot = popIfEndsWith(splitFoundRoot, ['node_modules', 'ep_etherpad-lite']);
maybeEtherpadRoot = popIfEndsWith(splitFoundRoot, []);
}
if (maybeEtherpadRoot === false) {
absPathLogger.error(`Could not identity Etherpad base path in this ${process.platform} installation in "${foundRoot}"`);
absPathLogger.error(`Could not identify Etherpad base path in this ${process.platform} installation in "${foundRoot}"`);
process.exit(1);
}
maybeEtherpadRoot.pop();
// SIDE EFFECT on this module-level variable
etherpadRoot = maybeEtherpadRoot.join(path.sep);

2
src/node/utils/ExportEtherpad.js
View file

@ -16,7 +16,7 @@
const db = require('../db/DB');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const hooks = require('../../static/js/pluginfw/hooks');
exports.getPadRaw = async function (padId) {
const padKey = `pad:${padId}`;

2
src/node/utils/ExportHelper.js
View file

@ -18,7 +18,7 @@
* limitations under the License.
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const Changeset = require('../../static/js/Changeset');
exports.getPadPlainText = function (pad, revNum) {
const _analyzeLine = exports._analyzeLine;

10
src/node/utils/ExportHtml.js
View file

@ -14,12 +14,12 @@
* limitations under the License.
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const Changeset = require('../../static/js/Changeset');
const padManager = require('../db/PadManager');
const _ = require('underscore');
const Security = require('ep_etherpad-lite/static/js/security');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const eejs = require('ep_etherpad-lite/node/eejs');
const Security = require('../../static/js/security');
const hooks = require('../../static/js/pluginfw/hooks');
const eejs = require('../eejs');
const _analyzeLine = require('./ExportHelper')._analyzeLine;
const _encodeWhitespace = require('./ExportHelper')._encodeWhitespace;
const padutils = require('../../static/js/pad_utils').padutils;
@ -453,7 +453,7 @@ exports.getPadHTMLDocument = async function (padId, revNum) {
html += hookHtml;
}
return eejs.require('ep_etherpad-lite/templates/export_html.html', {
return eejs.require('../../templates/export_html.html', {
body: html,
padId: Security.escapeHTML(padId),
extraCSS: stylesForExportCSS,

2
src/node/utils/ExportTxt.js
View file

@ -18,7 +18,7 @@
* limitations under the License.
*/
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const Changeset = require('../../static/js/Changeset');
const padManager = require('../db/PadManager');
const _analyzeLine = require('./ExportHelper')._analyzeLine;

2
src/node/utils/ImportEtherpad.js
View file

@ -16,7 +16,7 @@
const log4js = require('log4js');
const db = require('../db/DB');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const hooks = require('../../static/js/pluginfw/hooks');
exports.setPadRaw = function (padId, records) {
records = JSON.parse(records);

4
src/node/utils/ImportHtml.js
View file

@ -15,8 +15,8 @@
*/
const log4js = require('log4js');
const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const contentcollector = require('ep_etherpad-lite/static/js/contentcollector');
const Changeset = require('../../static/js/Changeset');
const contentcollector = require('../../static/js/contentcollector');
const cheerio = require('cheerio');
const rehype = require('rehype');
const minifyWhitespace = require('rehype-minify-whitespace');

2
src/node/utils/Settings.js
View file

@ -437,7 +437,7 @@ exports.getGitCommit = function () {
// Return etherpad version from package.json
exports.getEpVersion = function () {
return require('ep_etherpad-lite/package.json').version;
return require('../../../package.json').version;
};
/**

9462
src/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
src/static/js/ace.js
View file

@ -255,11 +255,11 @@ require.setRootURI("../javascripts/src");\n\
require.setLibraryURI("../javascripts/lib");\n\
require.setGlobalKeyPath("require");\n\
\n\
var plugins = require("ep_etherpad-lite/static/js/pluginfw/client_plugins");\n\
var plugins = require("./pluginfw/client_plugins");\n\
plugins.adoptPluginsFromAncestorsOf(window);\n\
\n\
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").jQuery; // Expose jQuery #HACK\n\
var Ace2Inner = require("ep_etherpad-lite/static/js/ace2_inner");\n\
$ = jQuery = require("./rjquery").jQuery; // Expose jQuery #HACK\n\
var Ace2Inner = require("./ace2_inner");\n\
\n\
plugins.ensure(function () {\n\
Ace2Inner.init();\n\

2
src/static/js/ace2_inner.js
View file

@ -27,7 +27,7 @@ const browser = require('./browser');
Ace2Common = require('./ace2_common');
plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
plugins = require('./pluginfw/client_plugins');
$ = jQuery = require('./rjquery').$;
_ = require('./underscore');

4
src/static/js/pluginfw/client_plugins.js
View file

@ -43,12 +43,12 @@ const adoptPluginsFromAncestorsOf = (frame) => {
if (!parentRequire) throw new Error('Parent plugins could not be found.');
const ancestorPluginDefs = parentRequire('ep_etherpad-lite/static/js/pluginfw/plugin_defs');
const ancestorPluginDefs = parentRequire('./plugin_defs');
defs.hooks = ancestorPluginDefs.hooks;
defs.loaded = ancestorPluginDefs.loaded;
defs.parts = ancestorPluginDefs.parts;
defs.plugins = ancestorPluginDefs.plugins;
const ancestorPlugins = parentRequire('ep_etherpad-lite/static/js/pluginfw/client_plugins');
const ancestorPlugins = parentRequire('./client_plugins');
exports.baseURL = ancestorPlugins.baseURL;
exports.ensure = ancestorPlugins.ensure;
exports.update = ancestorPlugins.update;

4
src/static/js/pluginfw/installer.js
View file

@ -1,6 +1,6 @@
const log4js = require('log4js');
const plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
const hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
const plugins = require('./plugins');
const hooks = require('./hooks');
const npm = require('npm');
const request = require('request');
const util = require('util');

2
src/templates/admin/plugins-info.html
View file

@ -1,5 +1,5 @@
<%
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var plugins = require("../../static/js/pluginfw/plugins");
%>
<!doctype html>
<html>

6
src/templates/pad.html
View file

@ -442,7 +442,7 @@
<script type="text/javascript" src="../static/js/require-kernel.js?v=<%=settings.randomVersionString%>"></script>
<!-- Include pad_utils manually -->
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad_utils.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../javascripts/lib/static/js/pad_utils.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript">
// @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
@ -465,8 +465,8 @@
<script type="text/javascript" src="../socket.io/socket.io.js?v=<%=settings.randomVersionString%>"></script>
<!-- Include base packages manually (this help with debugging) -->
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../javascripts/lib/static/js/pad.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../javascripts/lib/static/js/ace2_common.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<% e.begin_block("customScripts"); %>
<script type="text/javascript" src="../static/skins/<%=encodeURI(settings.skinName)%>/pad.js?v=<%=settings.randomVersionString%>"></script>

4
src/templates/timeslider.html
View file

@ -252,8 +252,8 @@
<script type="text/javascript" src="../../socket.io/socket.io.js?v=<%=settings.randomVersionString%>"></script>
<!-- Include base packages manually (this help with debugging) -->
<script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../../javascripts/lib/static/js/timeslider.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../../javascripts/lib/static/js/ace2_common.js?callback=require.define&v=<%=settings.randomVersionString%>"></script>
<script type="text/javascript" src="../../static/skins/<%=encodeURI(settings.skinName)%>/timeslider.js?v=<%=settings.randomVersionString%>"></script>

6
src/web.config
View file

@ -2,7 +2,7 @@
<system.webServer>
<handlers>
<add name="iisnode" path="node_modules/ep_etherpad-lite/node/server.js" verb="*" modules="iisnode" />
<add name="iisnode" path="src/node/server.js" verb="*" modules="iisnode" />
</handlers>
<rewrite>
@ -10,7 +10,7 @@
<!-- uncomment this section to enable debugging
<rule name="LogFile" patternSyntax="ECMAScript" stopProcessing="true">
<match url="iisnode"/>
<action type="Rewrite" url="node_modules/ep_etherpad-lite/node/iisnode" />
<action type="Rewrite" url="src/node/iisnode" />
</rule>
<rule name="NodeInspector" patternSyntax="ECMAScript" stopProcessing="true">
<match url="^server.js\/debug[\/]?" />
@ -23,7 +23,7 @@
<conditions>
<add input="{{REQUEST_FILENAME}}" matchType="IsFile" negate="True"/>
</conditions>
<action type="Rewrite" url="node_modules/ep_etherpad-lite/node/server.js" />
<action type="Rewrite" url="src/node/server.js" />
</rule>
</rules>
</rewrite>