From 64180fa9a858ef92d1d7874e8c056195a2b5b0fe Mon Sep 17 00:00:00 2001 From: laf Date: Wed, 4 Nov 2015 20:29:02 +0000 Subject: [PATCH] Added ability to globally disable sending alerts --- alerts.php | 2 +- html/pages/settings/alerting.inc.php | 4 ++++ sql-schema/075.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 sql-schema/075.sql diff --git a/alerts.php b/alerts.php index dc8e9949a8..d52361101d 100755 --- a/alerts.php +++ b/alerts.php @@ -48,7 +48,7 @@ require_once $config['install_dir'].'/includes/definitions.inc.php'; require_once $config['install_dir'].'/includes/functions.php'; require_once $config['install_dir'].'/includes/alerts.inc.php'; -if (!defined('TEST')) { +if (!defined('TEST') && $config['alert']['disable'] != 'true') { echo 'Start: '.date('r')."\r\n"; echo "RunFollowUp():\r\n"; RunFollowUp(); diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php index d763031839..9c763811dd 100644 --- a/html/pages/settings/alerting.inc.php +++ b/html/pages/settings/alerting.inc.php @@ -196,6 +196,10 @@ else { $callback = urlencode($callback); $general_conf = array( + array('name' => 'alert.disable', + 'descr' => 'Disable alerting', + 'type' => 'checkbox', + ), array('name' => 'alert.admins', 'descr' => 'Issue alerts to admins', 'type' => 'checkbox', diff --git a/sql-schema/075.sql b/sql-schema/075.sql new file mode 100644 index 0000000000..de03028419 --- /dev/null +++ b/sql-schema/075.sql @@ -0,0 +1 @@ +INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('alert.disable','false','false','Stop alerts being generated','alerting',0,'general',0,'0','0');