Skip to content

fix: persist custom date filter across syslog page navigation #251

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 4 commits into
base: develop
Choose a base branch
from
Open

fix: persist custom date filter across syslog page navigation #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f4b991
fix: persist custom date filter across syslog page navigation
somethingwithproof Mar 6, 2026
7570ab6
fix: guard session date keys with isset before access in set_shift_span
somethingwithproof Mar 7, 2026
f59b1ef
fix: guard both _date1 and _date2 session keys in set_shift_span
somethingwithproof Mar 7, 2026
8badb3d
chore: add CHANGELOG entry for develop
somethingwithproof Mar 8, 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#250: Fix date filter persistence by validating before shift_span detection
* 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
20 changes: 19 additions & 1 deletion syslog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ function syslog_request_validation($current_tab, $force = false) {
function set_shift_span($shift_span, $session_prefix) {
global $graph_timeshifts;

if ($shift_span == 'span' || $shift_span === false) {
if ($shift_span == 'span' || ($shift_span === false && (!isset($_SESSION[$session_prefix . '_date1']) || !isset($_SESSION[$session_prefix . '_date2'])))) {
$span = array();

// Calculate the timespan
Expand All @@ -795,6 +795,21 @@ function set_shift_span($shift_span, $session_prefix) {
kill_session_var($session_prefix . '_date2');

set_request_var('custom', false);
} elseif ($shift_span === false) {
// Page navigation: custom dates were set earlier; restore from session.
if (isset($_SESSION[$session_prefix . '_date1']) && isset($_SESSION[$session_prefix . '_date2'])) {
set_request_var('date1', $_SESSION[$session_prefix . '_date1']);
set_request_var('date2', $_SESSION[$session_prefix . '_date2']);
set_request_var('custom', true);
} else {
// Session keys missing; fall back to a fresh span calculation.
$first_weekdayid = read_user_setting('first_weekdayid');
$span = array();
get_timespan($span, time(), get_request_var('predefined_timespan'), $first_weekdayid);
set_request_var('date1', date('Y-m-d H:i:s', $span['begin_now']));
set_request_var('date2', date('Y-m-d H:i:s', $span['end_now']));
set_request_var('custom', false);
}
} elseif ($shift_span == 'shift') {
$span = array();

Expand Down Expand Up @@ -826,6 +841,9 @@ function set_shift_span($shift_span, $session_prefix) {

set_request_var('custom', true);
} elseif ($shift_span == 'custom') {
// Persist custom dates so page navigation preserves the filter.
$_SESSION[$session_prefix . '_date1'] = get_request_var('date1');
$_SESSION[$session_prefix . '_date2'] = get_request_var('date2');
set_request_var('custom', true);
}
}
Expand Down