Fix adding duplicate device error (#6490)
* [extensions] Fix adding duplicate device error
This commit is contained in:
parent
0706b52427
commit
0e2b083807
|
|
@ -678,14 +678,8 @@
|
||||||
$line_display_name = str_replace("\${description}", $description, $line_display_name);
|
$line_display_name = str_replace("\${description}", $description, $line_display_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
//send a message to the user the device is not unique
|
|
||||||
if (!$device_unique) {
|
|
||||||
$message = $text['message-duplicate'].(if_group("superadmin") && $domain_name != $device_domain_name ? ": ".$device_domain_name : null);
|
|
||||||
message::add($message,'negative');
|
|
||||||
}
|
|
||||||
|
|
||||||
//build the devices array
|
//build the devices array
|
||||||
if ($device_unique && $device_address != '000000000000') {
|
if (($device_unique && $device_mac_address != '000000000000') || $device_mac_address == '000000000000') {
|
||||||
$array["devices"][$j]["device_uuid"] = $device_uuids[$d];
|
$array["devices"][$j]["device_uuid"] = $device_uuids[$d];
|
||||||
$array["devices"][$j]["domain_uuid"] = $domain_uuid;
|
$array["devices"][$j]["domain_uuid"] = $domain_uuid;
|
||||||
$array["devices"][$j]["device_address"] = $device_address;
|
$array["devices"][$j]["device_address"] = $device_address;
|
||||||
|
|
@ -716,6 +710,11 @@
|
||||||
if ($provision_line_register_expires !== null) $array["devices"][$j]["device_lines"][0]["register_expires"] = $provision_line_register_expires;
|
if ($provision_line_register_expires !== null) $array["devices"][$j]["device_lines"][0]["register_expires"] = $provision_line_register_expires;
|
||||||
$array["devices"][$j]["device_lines"][0]["enabled"] = "true";
|
$array["devices"][$j]["device_lines"][0]["enabled"] = "true";
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
//send a message to the user the device is not unique
|
||||||
|
$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null);
|
||||||
|
message::add($message,'negative');
|
||||||
|
}
|
||||||
|
|
||||||
//increment
|
//increment
|
||||||
$j++;
|
$j++;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue