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

Merge pull request #5776 from winsock/device_import_duplicate_mac_check

Browse Source 
Check for duplicate MAC addresses in the device import
This commit is contained in:
FusionPBX
2021-04-23 19:23:01 -06:00
committed by GitHub
parent a4099bcbe2 92bbb77561
commit 69a058dab1
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/devices/device_imports.php
View File

@@ -252,10 +252,14 @@
//set the domain_uuid
$domain_uuid = $_SESSION['domain_uuid'];
//open the database
$database = new database;
$database->app_name = 'devices';
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
//get the users
$sql = "select * from v_users where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$database = new database;
$users = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
@@ -320,13 +324,30 @@
}
}
// Do not duplicate MAC addresses, get the device UUID from the database and set it in the array
if (isset($array['devices']) && !isset($array['devices'][$row_id]['device_uuid']) &&
isset($array['devices'][$row_id]['device_mac_address'])) {
$sql = "SELECT device_uuid, domain_uuid FROM v_devices ";
$sql .= "WHERE device_mac_address = :mac ";
$parameters['mac'] = $array['devices'][$row_id]['device_mac_address'];
$row = $database->select($sql, $parameters, 'row');
if (is_array($row)) {
// Validate that the hit we got is for the same domain, if not add a message stating the fact
if ($array['devices'][$row_id]['domain_uuid'] == $row['domain_uuid']) {
$array['devices'][$row_id]['device_uuid'] = $row['device_uuid'];
} else {
// Maybe add in a better new message stating that it was found in a different domain?
message::add($text['message-duplicate'] . ": " . $parameters['mac']);
unset($array['devices'][$row_id]);
}
}
unset($sql, $parameters);
}
//process a chunk of the array
if ($row_id === 1000) {
//save to the data
$database = new database;
$database->app_name = 'devices';
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
//$message = $database->message;
@@ -351,9 +372,6 @@
//save to the data
if (is_array($array)) {
$database = new database;
$database->app_name = 'devices';
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
//$message = $database->message;
}