From 3a0c26d694f61e3694ca88d4819e2a366baee56a Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:56:41 -0700 Subject: [PATCH] Devices: Fix default values (#7545) * Devices: Fix default values * Update device_profile_edit.php * Update device_vendor_edit.php * Update device_vendor_function_edit.php * Email Template Edit: Fix enabled default value * Update email_template_edit.php * Update email_template_edit.php --- app/devices/device_edit.php | 7 +++++-- app/devices/device_profile_edit.php | 5 ++++- app/devices/device_vendor_edit.php | 3 +++ app/devices/device_vendor_function_edit.php | 3 +++ core/email_templates/email_template_edit.php | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 12ca28976e..04584905a4 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -544,6 +544,9 @@ $domains = $database->select($sql, null, 'all'); unset($sql, $parameters); +//set the defaults + if ($device_enabled === null) { $device_enabled = true; } + //use the device address to get the vendor if (empty($device_vendor)) { //get the device vendor using the device address @@ -593,7 +596,7 @@ $device_lines[$x]['auth_id'] = ''; $device_lines[$x]['password'] = ''; $device_lines[$x]['shared_line'] = ''; - $device_lines[$x]['enabled'] = false; + $device_lines[$x]['enabled'] = true; $device_lines[$x]['sip_port'] = $settings->get('provision', 'line_sip_port', '5060'); $device_lines[$x]['sip_transport'] = $settings->get('provision', 'line_sip_transport', 'tcp'); $device_lines[$x]['register_expires'] = $settings->get('provision', 'line_register_expires', '120'); @@ -681,7 +684,7 @@ for ($x = 0; $x < $rows; $x++) { $device_settings[$id]['device_setting_name'] = ''; $device_settings[$id]['device_setting_value'] = ''; - $device_settings[$id]['device_setting_enabled'] = false; + $device_settings[$id]['device_setting_enabled'] = true; $device_settings[$id]['device_setting_description'] = ''; $id++; } diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php index 01b91dde07..c3c9cad5d9 100644 --- a/app/devices/device_profile_edit.php +++ b/app/devices/device_profile_edit.php @@ -334,7 +334,7 @@ $device_profile_keys[$id]['profile_key_line'] = ''; $device_profile_keys[$id]['profile_key_value'] = ''; $device_profile_keys[$id]['profile_key_extension'] = ''; - $device_profile_keys[$id]['profile_key_protected'] = ''; + $device_profile_keys[$id]['profile_key_protected'] = false; $device_profile_keys[$id]['profile_key_label'] = ''; $device_profile_keys[$id]['profile_key_icon'] = ''; $id++; @@ -372,6 +372,9 @@ $device_profile_uuid = null; } +//set the defaults + if ($device_profile_enabled === null) { $device_profile_enabled = true; } + //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php index 10a9cccfef..459890105a 100644 --- a/app/devices/device_vendor_edit.php +++ b/app/devices/device_vendor_edit.php @@ -136,6 +136,9 @@ unset($sql, $parameters, $row); } +//set the defaults + if ($enabled === null) { $enabled = true; } + //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php index 32d0fa3e63..7c4934426a 100644 --- a/app/devices/device_vendor_function_edit.php +++ b/app/devices/device_vendor_function_edit.php @@ -272,6 +272,9 @@ $groups = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters, $sql_where, $index); +//set the defaults + if ($enabled === null) { $enabled = true; } + //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); diff --git a/core/email_templates/email_template_edit.php b/core/email_templates/email_template_edit.php index a9e15d3067..b3f04cc2ee 100644 --- a/core/email_templates/email_template_edit.php +++ b/core/email_templates/email_template_edit.php @@ -504,4 +504,4 @@ //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?>