From 5edcbf2e9bfa79ea87a6e420a4c17e8b02997716 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 27 Feb 2021 11:25:07 +0300 Subject: [PATCH] add an option to disable conditional counters --- classes/pref/prefs.php | 2 ++ classes/prefs.php | 2 ++ classes/rpc.php | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 9eb27eb85..14ca9b49c 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -65,6 +65,7 @@ class Pref_Prefs extends Handler_Protected { 'BLOCK_SEPARATOR', Prefs::SSL_CERT_SERIAL, 'BLOCK_SEPARATOR', + Prefs::DISABLE_CONDITIONAL_COUNTERS, Prefs::HEADLINES_NO_DISTINCT, ], __('Debugging') => [ @@ -106,6 +107,7 @@ class Pref_Prefs extends Handler_Protected { Prefs::USER_CSS_THEME => array(__("Theme")), Prefs::HEADLINES_NO_DISTINCT => array(__("Don't enforce DISTINCT headlines"), __("May produce duplicate entries")), Prefs::DEBUG_HEADLINE_IDS => array(__("Show article and feed IDs"), __("In the headlines buffer")), + Prefs::DISABLE_CONDITIONAL_COUNTERS => array(__("Disable conditional counter updates"), __("May increase server load")), ]; // hidden in the main prefs UI (use to hide things that have description set above) diff --git a/classes/prefs.php b/classes/prefs.php index 703246e9c..e736ff7c8 100644 --- a/classes/prefs.php +++ b/classes/prefs.php @@ -58,6 +58,7 @@ class Prefs { const _PREFS_MIGRATED = "_PREFS_MIGRATED"; const HEADLINES_NO_DISTINCT = "HEADLINES_NO_DISTINCT"; const DEBUG_HEADLINE_IDS = "DEBUG_HEADLINE_IDS"; + const DISABLE_CONDITIONAL_COUNTERS = "DISABLE_CONDITIONAL_COUNTERS"; private const _DEFAULTS = [ Prefs::PURGE_OLD_DAYS => [ 60, Config::T_INT ], @@ -116,6 +117,7 @@ class Prefs { Prefs::_PREFS_MIGRATED => [ false, Config::T_BOOL ], Prefs::HEADLINES_NO_DISTINCT => [ false, Config::T_BOOL ], Prefs::DEBUG_HEADLINE_IDS => [ false, Config::T_BOOL ], + Prefs::DISABLE_CONDITIONAL_COUNTERS => [ false, Config::T_BOOL ], ]; const _PROFILE_BLACKLIST = [ diff --git a/classes/rpc.php b/classes/rpc.php index ce580c8ca..72e00a8bc 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -121,7 +121,8 @@ class RPC extends Handler_Protected { else $label_ids = array_map("intval", clean($_REQUEST["label_ids"] ?? [])); - $counters = is_array($feed_ids) ? Counters::get_conditional($feed_ids, $label_ids) : Counters::get_all(); + $counters = is_array($feed_ids) && !get_pref(Prefs::DISABLE_CONDITIONAL_COUNTERS) ? + Counters::get_conditional($feed_ids, $label_ids) : Counters::get_all(); $reply = [ 'counters' => $counters,