dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update provision.php

Browse Source 
First step to fix the conflict between category: line, memory, expansion and programmable keys.
This commit is contained in:
FusionPBX
2016-08-25 23:22:02 -06:00
committed by GitHub
parent 81a214bafe
commit b4afcf2602
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/provision/resources/classes/provision.php
+13 -1
View File
@@ -191,7 +191,6 @@ include "root.php";
$sql .= " and domain_uuid = '$domain_uuid' "; $sql .= " and domain_uuid = '$domain_uuid' ";
$sql .= ") "; $sql .= ") ";
} }
$prep_statement = $this->db->prepare(check_sql($sql)); $prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$user_contacts = $prep_statement->fetchAll(PDO::FETCH_NAMED); $user_contacts = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -669,7 +668,20 @@ include "root.php";
//override profile keys with device keys //override profile keys with device keys
foreach($keys as $row) { foreach($keys as $row) {
//set the variables
$id = $row['device_key_id']; $id = $row['device_key_id'];
$category = $row['device_key_category'];
//build the device keys array
$device_keys[$category][$id] = $row;
if (is_uuid($row['device_profile_uuid'])) {
$device_keys[$category][$id]['device_key_owner'] = "profile";
}
else {
$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] = $row;
if (is_uuid($row['device_profile_uuid'])) { if (is_uuid($row['device_profile_uuid'])) {
$device_keys[$id]['device_key_owner'] = "profile"; $device_keys[$id]['device_key_owner'] = "profile";