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

rename enforceLowerCasePadIds to lowerCasePadIds

Browse source
This commit is contained in:
Daniel Habenicht 2022-04-26 11:02:52 +02:00 • committed by SamTV12345
parent 11e7e703fb
commit 70a513749a
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
settings.json.docker
View file

@ -639,5 +639,5 @@
/* /*
* Enable/Disable case-insensitive pad names. * Enable/Disable case-insensitive pad names.
*/ */
"enforceLowerCasePadIds": "${ENFORCE_LOWER_CASE_PAD_IDS:false}" "lowerCasePadIds": "${LOWER_CASE_PAD_IDS:false}"
} }

2
settings.json.template
View file

@ -640,5 +640,5 @@
/* /*
* Enable/Disable case-insensitive pad names. * Enable/Disable case-insensitive pad names.
*/ */
"enforceLowerCasePadIds": false "lowerCasePadIds": false
} }

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

@ -171,7 +171,7 @@ exports.sanitizePadId = async (padId) => {
padId = padId.replace(from, to); padId = padId.replace(from, to);
} }
if (settings.enforceLowerCasePadIds) padId = padId.toLowerCase(); if (settings.lowerCasePadIds) padId = padId.toLowerCase();
// we're out of possible transformations, so just return it // we're out of possible transformations, so just return it
return padId; return padId;

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

@ -434,7 +434,7 @@ exports.enableAdminUITests = false;
* Enable auto conversion of pad Ids to lowercase. * Enable auto conversion of pad Ids to lowercase.
* e.g. /p/EtHeRpAd to /p/etherpad * e.g. /p/EtHeRpAd to /p/etherpad
*/ */
exports.enforceLowerCasePadIds = false; exports.lowerCasePadIds = false;
// checks if abiword is avaiable // checks if abiword is avaiable
exports.abiwordAvailable = () => { exports.abiwordAvailable = () => {

8
src/tests/backend/specs/enforceLowerCasePadIds.js → src/tests/backend/specs/lowerCasePadIds.js
View file

@ -27,7 +27,7 @@ describe(__filename, function () {
describe('not activated', function () { describe('not activated', function () {
Object.assign(settings, { Object.assign(settings, {
enforceLowerCasePadIds: false, lowerCasePadIds: false,
}); });
it('- do nothing', async function () { it('- do nothing', async function () {
const res = await agent.get('/p/UPPERCASEpad'); const res = await agent.get('/p/UPPERCASEpad');
@ -43,7 +43,7 @@ describe(__filename, function () {
describe('activated', function () { describe('activated', function () {
it('- lowercase pad ids', async function () { it('- lowercase pad ids', async function () {
Object.assign(settings, { Object.assign(settings, {
enforceLowerCasePadIds: true, lowerCasePadIds: true,
}); });
await agent.get('/p/UPPERCASEpad') await agent.get('/p/UPPERCASEpad')
.expect(302) .expect(302)
@ -52,13 +52,13 @@ describe(__filename, function () {
it('- keeps old pads accessible', async function () { it('- keeps old pads accessible', async function () {
Object.assign(settings, { Object.assign(settings, {
enforceLowerCasePadIds: false, lowerCasePadIds: false,
}); });
const pad = await padManager.getPad('ALREADYexistingPad', 'alreadyexistingpad'); const pad = await padManager.getPad('ALREADYexistingPad', 'alreadyexistingpad');
await padManager.getPad('ALREADYexistingPad', 'bla'); await padManager.getPad('ALREADYexistingPad', 'bla');
assert.equal(pad.text(), 'alreadyexistingpad\n'); assert.equal(pad.text(), 'alreadyexistingpad\n');
Object.assign(settings, { Object.assign(settings, {
enforceLowerCasePadIds: true, lowerCasePadIds: true,
}); });
const newpad = await padManager.getPad('alreadyexistingpad', 'testcontent'); const newpad = await padManager.getPad('alreadyexistingpad', 'testcontent');