nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-03-15 13:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix provision device_keys use the category

Browse Source
This commit is contained in:
FusionPBX
2026-03-12 10:30:47 -06:00
committed by GitHub
parent dc061e82e3
commit c4bff5887b
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/provision/resources/classes/provision.php
View File

@@ -853,10 +853,6 @@ class provision {
if ($row['device_key_vendor'] == 'polycom' && $row['device_key_type'] == 'line') {
$device_lines[$device_key_line]['line_keys'] = $row['device_key_value'];
}
// kept temporarily for backwards compatibility to allow custom templates to be updated
$device_keys[$id] = $row;
$device_keys[$id]['device_key_owner'] = 'profile';
}
}
unset($sql, $parameters, $keys);
@@ -903,42 +899,46 @@ class provision {
// build the device keys array
$device_keys[$category][$id] = $row;
$device_keys[$category][$id]['device_key_owner'] = 'device';
// kept temporarily for backwards comptability to allow custom templates to be updated
$device_keys[$id] = $row;
$device_keys[$id]['device_key_owner'] = 'device';
}
}
unset($sql, $parameters, $keys);
// replace the ${caller_id_name} with the extensions caller id name
// replace the ${caller_id_name}, ${extension}, and ${user} with the extensions caller id name
if (is_array($device_keys)) {
foreach ($device_keys as $row) {
// set the variables
$id = $row['device_key_id'];
$category = $row['device_key_category'];
foreach ($device_keys as $key_category) {
foreach ($key_category as $row) {
// set the variables
$id = $row['device_key_id'];
$category = $row['device_key_category'];
// build the device keys array
if (in_array($device_key_vendor, ['cisco', 'spa']) && $row['device_key_type'] == 'disabled') {
$device_key_array = explode(';', $row['device_key_value']);
foreach ($device_key_array as $sub_row) {
[$key, $value] = explode('=', $sub_row);
if ($key == 'sub') {
$extension = explode('@', $value)[0]; // remove the @PROXY
$caller_id_name = $extension_labels[$extension]['caller_id_name'];
$device_key_label = str_replace('${caller_id_name}', $caller_id_name, $row['device_key_label']);
$device_key_label = str_replace('${extension}', $extension, $device_key_label);
$device_key_label = str_replace('${user}', $extension, $device_key_label);
$device_keys[$category][$id]['device_key_label'] = $device_key_label;
// build the device keys array
if (in_array($device_key_vendor, ['cisco', 'spa']) && $row['device_key_type'] == 'disabled') {
$device_key_array = explode(';', $row['device_key_value']);
foreach ($device_key_array as $sub_row) {
[$key, $value] = explode('=', $sub_row);
if ($key == 'sub') {
$extension = explode('@', $value)[0]; // remove the @PROXY
$caller_id_name = $extension_labels[$extension]['caller_id_name'];
$device_key_label = str_replace('${caller_id_name}', $caller_id_name, $row['device_key_label']);
$device_key_label = str_replace('${extension}', $extension, $device_key_label);
$device_key_label = str_replace('${user}', $extension, $device_key_label);
$device_keys[$category][$id]['device_key_label'] = $device_key_label;
}
}
} elseif (is_numeric($row['device_key_value'])) {
$extension = $row['device_key_value'];
$caller_id_name = $extension_labels[$row['device_key_value']]['caller_id_name'];
$device_key_label = str_replace('${caller_id_name}', $caller_id_name, $row['device_key_label']);
$device_key_label = str_replace('${extension}', $extension, $device_key_label);
$device_key_label = str_replace('${user}', $extension, $device_key_label);
$device_keys[$category][$id]['device_key_label'] = $device_key_label;
}
else {
$device_key_label = str_replace('${caller_id_name}', '', $row['device_key_label']);
$device_key_label = str_replace('${extension}', '', $device_key_label);
$device_key_label = str_replace('${user}', '', $device_key_label);
$device_keys[$category][$id]['device_key_label'] = $device_key_label;
}
} elseif (is_numeric($row['device_key_value'])) {
$extension = $row['device_key_value'];
$caller_id_name = $extension_labels[$row['device_key_value']]['caller_id_name'];
$device_key_label = str_replace('${caller_id_name}', $caller_id_name, $row['device_key_label']);
$device_key_label = str_replace('${extension}', $extension, $device_key_label);
$device_key_label = str_replace('${user}', $extension, $device_key_label);
$device_keys[$category][$id]['device_key_label'] = $device_key_label;
}
}
}