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

Correct the method used to get the domain name from the HTTP Host. Fix the method to get the Mac address from the HTTP_USER_AGENT needed to make the Yealink common file work.

Browse Source
This commit is contained in:
Mark Crane
2014-01-09 22:17:09 +00:00
parent 39c78973ed
commit 8de1e8b28e
1 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/provision/index.php
+59 -34
View File
@@ -34,17 +34,10 @@ require_once "resources/require.php";
//get the domain_uuid //get the domain_uuid
//get the domain //get the domain
$domain_array = explode(":", $_SERVER["HTTP_HOST"]); if ($_SESSION['domain_name'] == 0) {
//get the domain_uuid $domain_array = explode(":", $_SERVER["HTTP_HOST"]);
$sql = "SELECT * FROM v_domains "; $_SESSION['domain_name'] = $domain_array[0];
$sql .= "WHERE domain_name = '".$_SESSION['domain_name']."' ";
$prep_statement = $db->prepare($sql);
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach($result as $row) {
$_SESSION["domain_uuid"] = $row["domain_uuid"];
} }
unset($result, $prep_statement);
//build the provision array //build the provision array
foreach($_SESSION['provision'] as $key=>$val) { foreach($_SESSION['provision'] as $key=>$val) {
@@ -92,10 +85,14 @@ require_once "resources/require.php";
//check alternate MAC source //check alternate MAC source
if (empty($mac)){ if (empty($mac)){
if($_SERVER['HTTP_USER_AGENT'][strlen($_SERVER['HTTP_USER_AGENT'])-17-1] == " ") { //set the http user agent
$mac = substr($_SERVER['HTTP_USER_AGENT'],-17); //$_SERVER['HTTP_USER_AGENT'] = "Yealink SIP-T38G 38.70.0.125 00:15:65:00:00:00";
} //Yealink: 17 digit mac appended to the user agent, so check for a space exactly 17 digits before the end. //Yealink: 17 digit mac appended to the user agent, so check for a space exactly 17 digits before the end.
}//check alternates if (strtolower(substr($_SERVER['HTTP_USER_AGENT'],0,7)) == "yealink") {
$mac = substr($_SERVER['HTTP_USER_AGENT'],-17);
$mac = preg_replace("#[^a-fA-F0-9./]#", "", $mac);
}
}
//prepare the mac address //prepare the mac address
//normalize the mac address to lower case //normalize the mac address to lower case
@@ -116,34 +113,49 @@ require_once "resources/require.php";
//get the device_template //get the device_template
if (strlen($device_template) == 0) { if (strlen($device_template) == 0) {
$sql = "SELECT * FROM v_devices "; $sql = "SELECT * FROM v_devices ";
//$sql .= "WHERE domain_uuid=:domain_uuid ";
$sql .= "WHERE device_mac_address=:mac "; $sql .= "WHERE device_mac_address=:mac ";
$prep_statement_2 = $db->prepare(check_sql($sql)); $prep_statement_2 = $db->prepare(check_sql($sql));
if ($prep_statement_2) { if ($prep_statement_2) {
//$prep_statement_2->bindParam(':domain_uuid', $_SESSION['domain_uuid']); //use the prepared statement
$prep_statement_2->bindParam(':mac', $mac); $prep_statement_2->bindParam(':mac', $mac);
$prep_statement_2->execute(); $prep_statement_2->execute();
$row = $prep_statement_2->fetch(); $row = $prep_statement_2->fetch();
$device_uuid = $row["device_uuid"]; $domain_uuid = $row["domain_uuid"];
$device_label = $row["device_label"]; //set the variables from values in the database
if (strlen($row["device_vendor"]) > 0) { $device_uuid = $row["device_uuid"];
$device_vendor = strtolower($row["device_vendor"]); $device_label = $row["device_label"];
} if (strlen($row["device_vendor"]) > 0) {
$device_model = $row["device_model"]; $device_vendor = strtolower($row["device_vendor"]);
$device_firmware_version = $row["device_firmware_version"]; }
$device_provision_enable = $row["device_provision_enable"]; $device_model = $row["device_model"];
$device_template = $row["device_template"]; $device_firmware_version = $row["device_firmware_version"];
$device_username = $row["device_username"]; $device_provision_enable = $row["device_provision_enable"];
$device_password = $row["device_password"]; $device_template = $row["device_template"];
$device_time_zone = $row["device_time_zone"]; $device_username = $row["device_username"];
$device_description = $row["device_description"]; $device_password = $row["device_password"];
$device_time_zone = $row["device_time_zone"];
$device_description = $row["device_description"];
//set the domain uuid
$_SESSION["domain_uuid"] = $row["domain_uuid"];
} }
} }
//get the domain_uuid
if (strlen($_SESSION['domain_name']) == 0) {
$sql = "SELECT * FROM v_domains ";
$sql .= "WHERE domain_name = '".$_SESSION['domain_name']."' ";
$prep_statement = $db->prepare($sql);
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach($result as $row) {
$_SESSION["domain_uuid"] = $row["domain_uuid"];
}
unset($result, $prep_statement);
}
//find a template that was defined on another phone and use that as the default. //find a template that was defined on another phone and use that as the default.
if (strlen($device_template) == 0) { if (strlen($device_template) == 0) {
$sql = "SELECT * FROM v_devices "; $sql = "SELECT * FROM v_devices ";
$sql .= "WHERE domain_uuid=:domain_uuid "; $sql .= "WHERE device_template LIKE '%/%' ";
$sql .= "AND device_template LIKE '%/%' "; $sql .= "AND domain_uuid=:domain_uuid ";
$prep_statement_3 = $db->prepare(check_sql($sql)); $prep_statement_3 = $db->prepare(check_sql($sql));
if ($prep_statement_3) { if ($prep_statement_3) {
$prep_statement_3->bindParam(':domain_uuid', $_SESSION['domain_uuid']); $prep_statement_3->bindParam(':domain_uuid', $_SESSION['domain_uuid']);
@@ -205,6 +217,19 @@ require_once "resources/require.php";
} }
unset($template_list); unset($template_list);
//get the domain_uuid
if (strlen($_SESSION['domain_name']) == 0) {
$sql = "SELECT * FROM v_domains ";
$sql .= "WHERE domain_name = '".$_SESSION['domain_name']."' ";
$prep_statement = $db->prepare($sql);
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach($result as $row) {
$_SESSION["domain_uuid"] = $row["domain_uuid"];
}
unset($result, $prep_statement);
}
//mac address does not exist in the table so add it //mac address does not exist in the table so add it
$device_uuid = uuid(); $device_uuid = uuid();
$sql = "INSERT INTO v_devices "; $sql = "INSERT INTO v_devices ";