nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebuild the array to allow profile keys to be overridden by keys assigned to this device.

Browse Source
This commit is contained in:
Mark Crane
2015-02-15 20:57:43 +00:00
parent d0617bfcaf
commit 8d6794fe15
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,21 @@ include "root.php";
$sql .= "ORDER BY device_key_id asc, device_uuid desc"; $sql .= "ORDER BY device_key_id asc, device_uuid desc";
$prep_statement = $this->db->prepare(check_sql($sql)); $prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$device_keys = $prep_statement->fetchAll(PDO::FETCH_NAMED); $results = $prep_statement->fetchAll(PDO::FETCH_NAMED);
//rebuild the array to allow profile keys to be overridden by keys assigned to this device
foreach($results as $row) {
//set the id using the key id using this id helps to eliminate duplicate keys
$id = $row['device_key_id'];
//set the variables
$device_keys[$id]['device_key_category'] = $row['device_key_category'];
$device_keys[$id]['device_key_id'] = $row['device_key_id']; //1
$device_keys[$id]['device_key_type'] = $row['device_key_type']; //line
$device_keys[$id]['device_key_line'] = $row['device_key_line'];
$device_keys[$id]['device_key_value'] = $row['device_key_value']; //1
$device_keys[$id]['device_key_extension'] = $row['device_key_extension'];
$device_keys[$id]['device_key_label'] = $row['device_key_label']; //label
}
//assign the keys array //assign the keys array
$view->assign("keys", $device_keys); $view->assign("keys", $device_keys);