From 1739b5dbe6a386478e2b4d73436fe611407851e0 Mon Sep 17 00:00:00 2001 From: Armanveer Gill Date: Sun, 19 Jan 2025 22:03:25 -0500 Subject: [PATCH] Removed disabled features from "Fair Administration" and disabled the respective configuration options. --- admin/index.php | 6 +++--- admin/reports.inc.php | 1 + config_editor.inc.php | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/index.php b/admin/index.php index 2c60abe7..852195a8 100644 --- a/admin/index.php +++ b/admin/index.php @@ -44,7 +44,7 @@ if($config['volunteer_enable'] == 'yes') echo "".theme_icon("volunteer_management")."
".i18n("Volunteer Management")."
"; else - echo theme_icon("volunteer_management")."
".i18n("Volunteer Management")."
(".i18n("disabled").")"; + // {echo theme_icon("volunteer_management")."
".i18n("Volunteer Management")."
(".i18n("disabled").")"}; echo ""; echo "\n"; echo "
"; @@ -56,13 +56,13 @@ if($config['tours_enable'] == 'yes') echo "".theme_icon("tour_management")."
".i18n("Tour Management")."
"; else - echo theme_icon("tour_management")."
".i18n("Tour Management")."
(".i18n("disabled").")"; + // {echo theme_icon("tour_management")."
".i18n("Tour Management")."
(".i18n("disabled").")";} echo ""; echo " "; if($config['participant_regfee_items_enable'] == 'yes') echo "".theme_icon("registration_fee_items_management")."
".i18n("Registration Fee Items Management")."
"; else - echo theme_icon("registration_fee_items_management")."
".i18n("Registration Fee Items Management")."
(".i18n("disabled").")"; + // {echo theme_icon("registration_fee_items_management")."
".i18n("Registration Fee Items Management")."
(".i18n("disabled").")";} echo ""; echo " \n"; diff --git a/admin/reports.inc.php b/admin/reports.inc.php index e2e9e00c..71524540 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -419,6 +419,7 @@ foreach($report_stock as $n=>$v) { $report['loc'] = array(); $fieldvar = "report_{$report['type']}s_fields"; + if(is_array($$fieldvar)) $allow_fields = array_keys($$fieldvar); else diff --git a/config_editor.inc.php b/config_editor.inc.php index 2842dbe5..bee50f56 100644 --- a/config_editor.inc.php +++ b/config_editor.inc.php @@ -203,6 +203,9 @@ function config_editor($category, $year, $array_name, $self) * have to modify 2 questions to maintain the order */ $var = config_editor_load($category, $year); + if (($category == 'Tours' or $category == 'Volunteer Registration') and ($config['tours_enable'] !== 'yes' or $config['participant_regfee_items_enable'] !== 'yes')) + echo "
"; + echo ""; echo "";