Skip to content

Replace deprecated get_request_var_request() with get_request_var() #431

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
TheWitness wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Replace deprecated get_request_var_request() with get_request_var() #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bac9be
Replace deprecated get_request_var_request() with get_request_var()
Oct 23, 2026
747fa53
test: cover the user admin sub-tab hooks
somethingwithproof Oct 24, 2026
46ca5a2
Merge branch 'develop' into fix/replace-deprecated-get-request-var
somethingwithproof Oct 24, 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
4 changes: 2 additions & 2 deletions includes/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function intropage_user_admin_tab(): void {

print '<li class="subTab">';

if (get_request_var_request('tab') == 'intropage_settings_edit') {
if (get_request_var('tab') == 'intropage_settings_edit') {
print '<a class="tab selected" ';
} else {
print '<a class="tab" ';
Expand All @@ -184,7 +184,7 @@ function intropage_user_group_admin_tab(): void {

print '<li class="subTab">';

if (get_request_var_request('tab') == 'intropage_group_settings_edit') {
if (get_request_var('tab') == 'intropage_group_settings_edit') {
print '<a class="tab selected" ';
} else {
print '<a class="tab" ';
Expand Down
44 changes: 44 additions & 0 deletions tests/Unit/IntropageUserAdminTabTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
+-------------------------------------------------------------------------+
| Cacti: The Complete RRDtool-based Graphing Solution |
+-------------------------------------------------------------------------+
*/

/*
* Unit coverage for the user_admin_tab and user_group_admin_tab hooks in
* includes/settings.php: each prints one sub-tab link that points at the
* plugin's edit tab.
*/

require_once __DIR__ . '/../../includes/settings.php';

it('prints the user admin sub-tab link', function () {
global $config;

$config['url_path'] = '/cacti/';

ob_start();
intropage_user_admin_tab();
$html = ob_get_clean();

expect($html)->toStartWith('<li class="subTab">');
expect($html)->toContain('href="/cacti/user_admin.php?action=user_edit&amp;tab=intropage_settings_edit&amp;id="');
expect($html)->toContain('>Intropage</a></li>');
});

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('<li class="subTab">');
expect($html)->toContain('href="/cacti/user_group_admin.php?action=edit&amp;tab=intropage_group_settings_edit&amp;id="');
expect($html)->toContain('>Intropage</a></li>');
});
Loading