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

Remove the formatting of the mac address.

This commit is contained in:
FusionPBX 2020-05-27 19:10:20 -06:00 committed by GitHub
parent 6163638193
commit 71c90a59c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/extensions/extension_edit.php
View File

@ -142,8 +142,11 @@
//device provisioning variables //device provisioning variables
if (is_array($_POST["devices"]) && @sizeof($_POST["devices"]) != 0) { if (is_array($_POST["devices"]) && @sizeof($_POST["devices"]) != 0) {
foreach ($_POST["devices"] as $d => $device) { foreach ($_POST["devices"] as $d => $device) {
$device_mac_address = strtolower($device["device_mac_address"]);
$device_mac_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_mac_address);
$line_numbers[$d] = $device["line_number"]; $line_numbers[$d] = $device["line_number"];
$device_mac_addresses[$d] = format_mac($device["device_mac_address"],''); $device_mac_addresses[$d] = $device_mac_address;
$device_templates[$d] = $device["device_template"]; $device_templates[$d] = $device["device_template"];
} }
} }
@ -151,16 +154,18 @@
//get or set the device_uuid //get or set the device_uuid
if (is_array($device_mac_addresses) && @sizeof($device_mac_addresses) != 0) { if (is_array($device_mac_addresses) && @sizeof($device_mac_addresses) != 0) {
foreach ($device_mac_addresses as $d => $device_mac_address) { foreach ($device_mac_addresses as $d => $device_mac_address) {
if (is_mac($device_mac_address)) { $device_mac_address = strtolower($device_mac_address);
$sql = "select device_uuid from v_devices "; $device_mac_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_mac_address);
$sql .= "where device_mac_address = :device_mac_address ";
$sql .= "and domain_uuid = :domain_uuid "; $sql = "select device_uuid from v_devices ";
$parameters['device_mac_address'] = $device_mac_address; $sql .= "where device_mac_address = :device_mac_address ";
$parameters['domain_uuid'] = $domain_uuid; $sql .= "and domain_uuid = :domain_uuid ";
$database = new database; $parameters['device_mac_address'] = $device_mac_address;
$device_uuid = $database->select($sql, $parameters, 'column'); $parameters['domain_uuid'] = $domain_uuid;
unset($sql, $parameters); $database = new database;
} $device_uuid = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
$device_uuids[$d] = is_uuid($device_uuid) ? $device_uuid : uuid(); $device_uuids[$d] = is_uuid($device_uuid) ? $device_uuid : uuid();
} }
} }