web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify check-in deactivation

Browse Source
This commit is contained in:
ansuz 2020-02-28 14:24:53 -05:00
parent 92896fb919
commit 2f00ff3278
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/commands/quota.js
View File

@ -38,6 +38,7 @@ Quota.updateCachedLimits = function (Env, cb) {
if (Env.adminEmail === false) { if (Env.adminEmail === false) {
Quota.applyCustomLimits(Env); Quota.applyCustomLimits(Env);
if (Env.allowSubscriptions === false) { return; } if (Env.allowSubscriptions === false) { return; }
if (Env.blockDailyCheck === true) { return; }
throw new Error("allowSubscriptions must be false if adminEmail is false"); throw new Error("allowSubscriptions must be false if adminEmail is false");
} }

4
lib/historyKeeper.js
View File

@ -65,7 +65,9 @@ module.exports.create = function (config, cb) {
WARN: WARN, WARN: WARN,
flushCache: config.flushCache, flushCache: config.flushCache,
adminEmail: config.adminEmail, adminEmail: config.adminEmail,
allowSubscriptions: config.allowSubscriptions, allowSubscriptions: config.allowSubscriptions === true,
blockDailyCheck: config.blockDailyCheck === true,
myDomain: config.httpUnsafeOrigin, myDomain: config.httpUnsafeOrigin,
// XXX not included in the config... // XXX not included in the config...
mySubdomain: config.mySubdomain, mySubdomain: config.mySubdomain,