From b79a6c390e54772c87a42f07bdde9e14d66177bf Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 5 Apr 2026 12:00:56 -0400 Subject: [PATCH] Move some arrays out of load global settings and into their own entity --- .../software_template_add.php | 10 ++++++ .../software_template_edit.php | 12 ++++++- admin/settings_default.php | 22 ++++++++++-- agent/modals/client/client_add.php | 11 ++++++ .../client/client_bulk_edit_net_terms.php | 11 ++++++ agent/modals/client/client_edit.php | 14 +++++++- agent/modals/software/software_add.php | 10 ++++++ agent/modals/software/software_edit.php | 13 ++++++- includes/load_global_settings.php | 34 ------------------- 9 files changed, 98 insertions(+), 39 deletions(-) diff --git a/admin/modals/software_template/software_template_add.php b/admin/modals/software_template/software_template_add.php index f1db368a..8434c1a0 100644 --- a/admin/modals/software_template/software_template_add.php +++ b/admin/modals/software_template/software_template_add.php @@ -2,6 +2,16 @@ require_once '../../../includes/modal_header.php'; +$license_types_array = array ( + 'Device', + 'User', + 'Site', + 'Concurrent', + 'Trial', + 'Perpetual', + 'Usage-based' +); + ob_start(); ?> diff --git a/admin/modals/software_template/software_template_edit.php b/admin/modals/software_template/software_template_edit.php index 18236c34..df9156f7 100644 --- a/admin/modals/software_template/software_template_edit.php +++ b/admin/modals/software_template/software_template_edit.php @@ -13,8 +13,18 @@ $software_type = nullable_htmlentities($row['software_template_type']); $software_license_type = nullable_htmlentities($row['software_template_license_type']); $software_notes = nullable_htmlentities($row['software_template_notes']); -// Generate the HTML form content using output buffering. +$license_types_array = array ( + 'Device', + 'User', + 'Site', + 'Concurrent', + 'Trial', + 'Perpetual', + 'Usage-based' +); + ob_start(); + ?>