Fix #746: Correct inverted type 2 normal restoral conditions

[bmfmancini]

Summary

Fixes #746

In thold_functions.php, the type 2 (time-based) normal restoral logic in thold_check_threshold() (lines ~3443 and ~3512) used < instead of >= for the fail count comparisons:

// Warning restoral (inverted):
if ($alertstat != 0 && $warning_failures < $warning_trigger && $thold_data['restored_alert'] != 'on') {

// Alert restoral (inverted):
} elseif ($alertstat != 0 && $failures < $trigger && $thold_data['restored_alert'] != 'on') {

Impact

The < vs >= inversion caused:

• Restorals to fire for thresholds that were never triggered — when the fail count was below the trigger (no alert was ever sent), a restoral notification was incorrectly generated.
• Restorals to be silently suppressed for thresholds that were triggered — when the fail count reached or exceeded the trigger (an alert was sent), the restoral was incorrectly blocked.

Fix

Changed < to >= for both $warning_failures and $failures comparisons in the type 2 restoral block:

// Warning restoral (fixed):
if ($alertstat != 0 && $warning_failures >= $warning_trigger && $thold_data['restored_alert'] != 'on') {

// Alert restoral (fixed):
} elseif ($alertstat != 0 && $failures >= $trigger && $thold_data['restored_alert'] != 'on') {

This matches the correct pattern used in the type 0 restoral logic (line ~2685), which checks:

if ($thold_data['thold_warning_fail_count'] >= $warning_trigger && $thold_data['restored_alert'] != 'on' && !$maint_dev) {

Testing

• Verified PHP syntax with php -l thold_functions.php — no syntax errors.
• Confirmed the corrected conditions match the semantics of the type 0 restoral path.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[somethingwithproof]

The inverted restoral comparisons appear to be the intended fix, but this branch includes the three unrelated #789 threshold_value edits and has no behavioral coverage. Please isolate the two restoral-condition changes, add Cacti-Composer/Pest cases for never-triggered, warning-triggered, and alert-triggered type-2 thresholds returning to normal, and add the CHANGELOG entry. The integration matrix is red.

[somethingwithproof]

All four checks fail before this plugin loads because the branch’s older workflow tests unpinned Cacti develop, which crashes in core with an undefined __() call. Maintainer edits are disabled, so I cannot apply the pinned-Cacti and bounded-retry workflow fix. Please enable maintainer edits or update/rebase the branch.