From 8bac9be846ecc118ef8c9e062fc27b6ccafc90be Mon Sep 17 00:00:00 2001 From: TheWitness Date: Fri, 23 Oct 2026 18:39:14 -0400 Subject: [PATCH 1/2] Replace deprecated get_request_var_request() with get_request_var() Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- includes/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/settings.php b/includes/settings.php index f0f8a41..d7ec80e 100644 --- a/includes/settings.php +++ b/includes/settings.php @@ -157,7 +157,7 @@ function intropage_user_admin_tab(): void { print '
  • '; - if (get_request_var_request('tab') == 'intropage_settings_edit') { + if (get_request_var('tab') == 'intropage_settings_edit') { print ''; - if (get_request_var_request('tab') == 'intropage_group_settings_edit') { + if (get_request_var('tab') == 'intropage_group_settings_edit') { print ' Date: Fri, 23 Oct 2026 20:48:45 -0600 Subject: [PATCH 2/2] test: cover the user admin sub-tab hooks Signed-off-by: Thomas Vincent --- tests/Unit/IntropageUserAdminTabTest.php | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tests/Unit/IntropageUserAdminTabTest.php diff --git a/tests/Unit/IntropageUserAdminTabTest.php b/tests/Unit/IntropageUserAdminTabTest.php new file mode 100644 index 0000000..2e86f1b --- /dev/null +++ b/tests/Unit/IntropageUserAdminTabTest.php @@ -0,0 +1,44 @@ +toStartWith('
  • '); + expect($html)->toContain('href="/cacti/user_admin.php?action=user_edit&tab=intropage_settings_edit&id="'); + expect($html)->toContain('>Intropage
  • '); +}); + +it('prints the user group admin sub-tab link', function () { + global $config; + + $config['url_path'] = '/cacti/'; + + ob_start(); + intropage_user_group_admin_tab(); + $html = ob_get_clean(); + + expect($html)->toStartWith('
  • '); + expect($html)->toContain('href="/cacti/user_group_admin.php?action=edit&tab=intropage_group_settings_edit&id="'); + expect($html)->toContain('>Intropage
  • '); +});