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

Integrate the device profile keys with the provisioning templates.

Browse Source
This commit is contained in:
Mark Crane
2015-02-15 20:26:08 +00:00
parent f98b16188c
commit 773562ba9e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/provision/resources/classes/provision.php
+14 -9
View File
@@ -185,8 +185,7 @@ include "root.php";
$device_firmware_version = $row["device_firmware_version"]; $device_firmware_version = $row["device_firmware_version"];
$device_provision_enable = $row["device_provision_enable"]; $device_provision_enable = $row["device_provision_enable"];
$device_template = $row["device_template"]; $device_template = $row["device_template"];
$device_username = $row["device_username"]; $device_profile_uuid = $row["device_profile_uuid"];
$device_password = $row["device_password"];
$device_description = $row["device_description"]; $device_description = $row["device_description"];
} }
//} //}
@@ -208,8 +207,7 @@ include "root.php";
$device_firmware_version = $row["device_firmware_version"]; $device_firmware_version = $row["device_firmware_version"];
$device_provision_enable = $row["device_provision_enable"]; $device_provision_enable = $row["device_provision_enable"];
$device_template = $row["device_template"]; $device_template = $row["device_template"];
$device_username = $row["device_username"]; $device_profile_uuid = $row["device_profile_uuid"];
$device_password = $row["device_password"];
$device_description = $row["device_description"]; $device_description = $row["device_description"];
} }
} }
@@ -382,16 +380,23 @@ include "root.php";
//get the provisioning information from device keys table //get the provisioning information from device keys table
$sql = "SELECT * FROM v_device_keys "; $sql = "SELECT * FROM v_device_keys ";
$sql .= "WHERE device_uuid = '".$device_uuid."' "; $sql .= "WHERE (";
$sql .= "device_uuid = '".$device_uuid."' ";
if (strlen($device_profile_uuid) > 0) {
$sql .= "or device_profile_uuid = '".$device_profile_uuid."' ";
}
$sql .= ") ";
$sql .= "AND domain_uuid = '".$domain_uuid."' "; $sql .= "AND domain_uuid = '".$domain_uuid."' ";
$sql .= "ORDER BY device_key_id asc "; $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();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $device_keys = $prep_statement->fetchAll(PDO::FETCH_NAMED);
//assign the keys array //assign the keys array
$view->assign("keys", $result); $view->assign("keys", $device_keys);
//set the variables //set the variables
foreach($result as $row) { foreach($device_keys as $row) {
//set the variables //set the variables
$device_key_category = $row['device_key_category']; $device_key_category = $row['device_key_category'];
$device_key_id = $row['device_key_id']; //1 $device_key_id = $row['device_key_id']; //1