Skip to content

refactor: deduplicate selected-item bulk action dispatch #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
somethingwithproof wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

refactor: deduplicate selected-item bulk action dispatch #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc9e2d
refactor: deduplicate selected-items bulk action dispatch
somethingwithproof Mar 7, 2026
620318c
fix: encode session exporter value to prevent JS injection
somethingwithproof Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

--- develop ---

* issue#276: Deduplicate selected-item bulk action dispatch across alert/report/removal pages
* issue: Making changes to support Cacti 1.3
* issue: Don't use MyISAM for non-analytical tables
* issue: The install advisor for Syslog was broken in current Cacti releases
Expand Down
17 changes: 16 additions & 1 deletion functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,22 @@ function syslog_sendemail($to, $from, $subject, $message, $smsmessage = '') {
}
}

function syslog_apply_selected_items_action($selected_items, $drp_action, $action_map, $export_action = '', $export_items = '') {
if ($selected_items != false) {
if (isset($action_map[$drp_action])) {
foreach($selected_items as $selected_item) {
$action_function = $action_map[$drp_action];
$action_function($selected_item);
}
} elseif ($export_action != '' && $drp_action == $export_action) {
/* Re-serialize the sanitized array and URL-encode so the value is
* safe to embed in a JS document.location string (avoids injection
* via the raw request value that $export_items carries). */
$_SESSION['exporter'] = rawurlencode(serialize($selected_items));
}
}
}

function syslog_is_partitioned() {
global $syslogdb_default;

Expand Down Expand Up @@ -2421,4 +2437,3 @@ function alert_replace_variables($alert, $results, $hostname = '') {

return $command;
}

32 changes: 13 additions & 19 deletions syslog_alerts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,19 @@ function form_actions() {
/* if we are to save this form, instead of display it */
if (isset_request_var('selected_items')) {
$selected_items = sanitize_unserialize_selected_items(get_request_var('selected_items'));

if ($selected_items != false) {
if (get_request_var('drp_action') == '1') { /* delete */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_alert_remove($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '2') { /* disable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_alert_disable($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '3') { /* enable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_alert_enable($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '4') { /* export */
$_SESSION['exporter'] = get_nfilter_request_var('selected_items');
}
}
$drp_action = get_request_var('drp_action');

syslog_apply_selected_items_action(
$selected_items,
$drp_action,
array(
'1' => 'api_syslog_alert_remove',
'2' => 'api_syslog_alert_disable',
'3' => 'api_syslog_alert_enable'
),
'4',
get_nfilter_request_var('selected_items')
);

header('Location: syslog_alerts.php?header=false');

Expand Down Expand Up @@ -1009,4 +1004,3 @@ function alert_import() {

header('Location: syslog_alerts.php');
}

39 changes: 15 additions & 24 deletions syslog_removal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,21 @@ function form_actions() {

/* if we are to save this form, instead of display it */
if (isset_request_var('selected_items')) {
$selected_items = sanitize_unserialize_selected_items(get_nfilter_request_var('selected_items'));

if ($selected_items != false) {
if (get_request_var('drp_action') == '1') { /* delete */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_removal_remove($selected_items[$i]);
}
} else if (get_request_var('drp_action') == '2') { /* disable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_removal_disable($selected_items[$i]);
}
} else if (get_request_var('drp_action') == '3') { /* enable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_removal_enable($selected_items[$i]);
}
} else if (get_request_var('drp_action') == '4') { /* reprocess */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_removal_reprocess($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '5') { /* export */
$_SESSION['exporter'] = get_nfilter_request_var('selected_items');
}
}
$selected_items = sanitize_unserialize_selected_items(get_nfilter_request_var('selected_items'));
$drp_action = get_request_var('drp_action');

syslog_apply_selected_items_action(
$selected_items,
$drp_action,
array(
'1' => 'api_syslog_removal_remove',
'2' => 'api_syslog_removal_disable',
'3' => 'api_syslog_removal_enable',
'4' => 'api_syslog_removal_reprocess'
),
'5',
get_nfilter_request_var('selected_items')
);

header('Location: syslog_removal.php?header=false');

Expand Down Expand Up @@ -810,4 +802,3 @@ function removal_import() {

header('Location: syslog_removal.php');
}

34 changes: 14 additions & 20 deletions syslog_reports.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,20 @@ function form_actions() {

/* if we are to save this form, instead of display it */
if (isset_request_var('selected_items')) {
$selected_items = sanitize_unserialize_selected_items(get_nfilter_request_var('selected_items'));

if ($selected_items != false) {
if (get_request_var('drp_action') == '1') { /* delete */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_report_remove($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '2') { /* disable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_report_disable($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '3') { /* enable */
for ($i=0; $i<count($selected_items); $i++) {
api_syslog_report_enable($selected_items[$i]);
}
} elseif (get_request_var('drp_action') == '4') { /* export */
$_SESSION['exporter'] = get_nfilter_request_var('selected_items');
}
}
$selected_items = sanitize_unserialize_selected_items(get_nfilter_request_var('selected_items'));
$drp_action = get_request_var('drp_action');

syslog_apply_selected_items_action(
$selected_items,
$drp_action,
array(
'1' => 'api_syslog_report_remove',
'2' => 'api_syslog_report_disable',
'3' => 'api_syslog_report_enable'
),
'4',
get_nfilter_request_var('selected_items')
);

header('Location: syslog_reports.php?header=false');

Expand Down Expand Up @@ -872,4 +867,3 @@ function report_import() {

header('Location: syslog_reports.php');
}

36 changes: 36 additions & 0 deletions tests/regression/issue276_bulk_action_dispatch_helper_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

$root = dirname(__DIR__, 2);

$functions = file_get_contents($root . '/functions.php');
if ($functions === false) {
fwrite(STDERR, "Failed to load functions.php\n");
exit(1);
}

if (!preg_match('/function\s+syslog_apply_selected_items_action\s*\(/', $functions)) {
fwrite(STDERR, "Shared selected-items action helper is missing.\n");
exit(1);
}

$targets = array(
$root . '/syslog_alerts.php',
$root . '/syslog_reports.php',
$root . '/syslog_removal.php'
);

foreach ($targets as $target) {
$content = file_get_contents($target);

if ($content === false) {
fwrite(STDERR, "Failed to load $target\n");
exit(1);
}

if (!preg_match('/syslog_apply_selected_items_action\s*\(/', $content)) {
fwrite(STDERR, "Shared selected-items action helper is not used in $target\n");
exit(1);
}
}

echo "issue276_bulk_action_dispatch_helper_test passed\n";