Node.js based forum software built for the modern web
feat(settings): add toggle to disable IP address logging
Julian Lamdb662ff66452
diff --git a/install/data/defaults.json b/install/data/defaults.jsonindex 3ceae5b58c..7bb41c5dc3 100644--- a/install/data/defaults.json+++ b/install/data/defaults.json@@ -86,6 +86,7 @@"unreadCutoff": 2,"bookmarkThreshold": 5,"autoDetectLang": 1,+ "logIPs": 1,"reputation:disabled": 0,"downvote:disabled": 0,"disableSignatures": 0,diff --git a/public/language/en-GB/admin/settings/general.json b/public/language/en-GB/admin/settings/general.jsonindex 0ee921d831..dc40dfc689 100644--- a/public/language/en-GB/admin/settings/general.json+++ b/public/language/en-GB/admin/settings/general.json@@ -61,5 +61,8 @@"auto-detect": "Auto Detect Language Setting for Guests","default-language-help": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.","post-sharing": "Post Sharing",- "info-plugins-additional": "Plugins can add additional networks for sharing posts."+ "info-plugins-additional": "Plugins can add additional networks for sharing posts.",+ "privacy": "Privacy",+ "log-ips": "Log IP Addresses",+ "log-ips-help": "When enabled, IP addresses of all visitors are stored in a sorted set for analytics purposes. This is used to calculate unique visitors."}\ No newline at end of filediff --git a/src/analytics.js b/src/analytics.jsindex ec43d4356c..ff6cbcfc0f 100644--- a/src/analytics.js+++ b/src/analytics.js@@ -8,6 +8,7 @@ const _ = require('lodash');const sleep = util.promisify(setTimeout);const db = require('./database');+const meta = require('./meta');const utils = require('./utils');const plugins = require('./plugins');const pubsub = require('./pubsub');@@ -124,7 +125,7 @@ Analytics.apPageView = async function ({ ip }) {};async function incrementUniqueVisitors(ip) {- if (ip) {+ if (ip && meta.config.logIPs !== 0) {const score = await db.sortedSetScore('ip:recent', ip);let record = !score;if (score) {diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.jsindex 6f3745f3fe..0738cd8920 100644--- a/src/controllers/admin/settings.js+++ b/src/controllers/admin/settings.js@@ -26,6 +26,7 @@ settingsController.general = async (req, res) => {postSharing,languages: languageData,autoDetectLang: meta.config.autoDetectLang,+ logIPs: meta.config.logIPs,});};diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tplindex 62b13daa59..9eceb90515 100644--- a/src/views/admin/settings/general.tpl+++ b/src/views/admin/settings/general.tpl@@ -304,6 +304,18 @@<hr/>+ <div id="privacy" class="mb-4">+ <h5 class="fw-bold tracking-tight settings-header">{{tx("admin/settings/general:privacy")}}</h5>++ <div class="form-check form-switch mb-3">+ <input type="checkbox" class="form-check-input" id="logIPs" data-field="logIPs" name="logIPs" {{{ if logIPs }}}checked{{{ end }}} />+ <label for="logIPs" class="form-check-label">{{tx("admin/settings/general:log-ips")}}</label>+ </div>+ <p class="form-text">{{tx("admin/settings/general:log-ips-help")}}</p>+ </div>++ <hr/>+<div id="post-sharing" class="mb-4"><h5 class="fw-bold tracking-tight settings-header">{{tx("admin/settings/general:post-sharing")}}</h5><div class="mb-3">