|
@@ -17,7 +17,7 @@
|
|
|
|
|
|
The Initial Developer of the Original Code is
|
|
The Initial Developer of the Original Code is
|
|
Mark J Crane <[email protected]>
|
|
Mark J Crane <[email protected]>
|
|
- Portions created by the Initial Developer are Copyright (C) 2008 - 2023
|
|
|
|
|
|
+ Portions created by the Initial Developer are Copyright (C) 2008 - 2024
|
|
the Initial Developer. All Rights Reserved.
|
|
the Initial Developer. All Rights Reserved.
|
|
|
|
|
|
Contributor(s):
|
|
Contributor(s):
|
|
@@ -72,6 +72,15 @@
|
|
$search = preg_replace('#[^a-zA-Z0-9_\-\. ]#', '', $search);
|
|
$search = preg_replace('#[^a-zA-Z0-9_\-\. ]#', '', $search);
|
|
$default_setting_category = preg_replace('#[^a-zA-Z0-9_\-\.]#', '', $default_setting_category);
|
|
$default_setting_category = preg_replace('#[^a-zA-Z0-9_\-\.]#', '', $default_setting_category);
|
|
|
|
|
|
|
|
+//determine whether to non-default (custom) settings only
|
|
|
|
+ if (!empty($default_setting_category) && $default_setting_category == 'custom') {
|
|
|
|
+ $custom_settings = true;
|
|
|
|
+ $default_setting_category = null;
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ $custom_settings = false;
|
|
|
|
+ }
|
|
|
|
+
|
|
//set from session variables
|
|
//set from session variables
|
|
$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
|
|
$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
|
|
|
|
|
|
@@ -208,10 +217,20 @@
|
|
$categories[$default_setting_category]['formatted'] = $category;
|
|
$categories[$default_setting_category]['formatted'] = $category;
|
|
$categories[$default_setting_category]['count'] = $quantity;
|
|
$categories[$default_setting_category]['count'] = $quantity;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ //add custom to the list of categories
|
|
|
|
+ $categories['custom']['formatted'] = 'Custom';
|
|
|
|
+ $categories['custom']['count'] = null;
|
|
|
|
+
|
|
|
|
+ //sort the categories
|
|
ksort($categories);
|
|
ksort($categories);
|
|
|
|
+
|
|
|
|
+ //unset variables
|
|
unset($default_setting_categories, $default_setting_category, $category);
|
|
unset($default_setting_categories, $default_setting_category, $category);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
//get the list of installed apps from the core and mod directories
|
|
//get the list of installed apps from the core and mod directories
|
|
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
|
|
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
|
|
$x=0;
|
|
$x=0;
|
|
@@ -372,7 +391,11 @@
|
|
}
|
|
}
|
|
|
|
|
|
if (!empty($field)) {
|
|
if (!empty($field)) {
|
|
- if ($row['default_setting_value'] !== $field['default_setting_value']) {
|
|
|
|
|
|
+ if ($row['default_setting_value'] === $field['default_setting_value']) {
|
|
|
|
+ $setting_bold = 'font-weight:bold;';
|
|
|
|
+ if ($custom_settings) { continue; }
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
$setting_bold = 'font-weight:bold;';
|
|
$setting_bold = 'font-weight:bold;';
|
|
}
|
|
}
|
|
if (!empty($field['default_setting_value'])) {
|
|
if (!empty($field['default_setting_value'])) {
|
|
@@ -380,6 +403,7 @@
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
$default_value = 'Default: null';
|
|
$default_value = 'Default: null';
|
|
|
|
+ if ($custom_settings) { continue; }
|
|
}
|
|
}
|
|
if ($row['default_setting_enabled'] != $field['default_setting_enabled']) {
|
|
if ($row['default_setting_enabled'] != $field['default_setting_enabled']) {
|
|
$default_enabled = $field['default_setting_enabled'];
|
|
$default_enabled = $field['default_setting_enabled'];
|