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

Change device_mac_address to device_address

Browse Source
This commit is contained in:
markjcrane
2023-06-29 23:40:11 -06:00
parent 49648e6655
commit 53779d50d3
14 changed files with 3077 additions and 3064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/devices/app_config.php
+3 -3
View File
@@ -48,7 +48,7 @@
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
$apps[$x]['permissions'][$y]['name'] = "device_mac_address";
$apps[$x]['permissions'][$y]['name'] = "device_address";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$y++;
@@ -411,8 +411,8 @@
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_mac_address";
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "phone_mac_address";
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_address";
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "device_mac_address";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
app/devices/app_languages.php
+67 -67
View File
@@ -220,29 +220,29 @@ $text['select-global']['zh-cn'] = "全球的";
$text['select-global']['ja-jp'] = "グローバル";
$text['select-global']['ko-kr'] = "글로벌";
$text['message_device']['en-us'] = "Enter the New MAC Address";
$text['message_device']['en-gb'] = "Enter the New MAC Address";
$text['message_device']['en-us'] = "Enter the New Address";
$text['message_device']['en-gb'] = "Enter the New Address";
$text['message_device']['ar-eg'] = "أدخل العنوان الجديد";
$text['message_device']['de-at'] = "Geben Sie die neue MAC Adresse ein";
$text['message_device']['de-ch'] = "Geben Sie die neue MAC Adresse ein";
$text['message_device']['de-de'] = "Geben Sie die neue MAC Adresse ein";
$text['message_device']['es-cl'] = "Introduzca la nueva dirección MAC";
$text['message_device']['es-mx'] = "Introduzca la nueva dirección MAC";
$text['message_device']['fr-ca'] = "Insérer la nouvelle adresse MAC";
$text['message_device']['fr-fr'] = "Insérer la nouvelle adresse MAC";
$text['message_device']['de-at'] = "Geben Sie die neue Adresse ein";
$text['message_device']['de-ch'] = "Geben Sie die neue Adresse ein";
$text['message_device']['de-de'] = "Geben Sie die neue Adresse ein";
$text['message_device']['es-cl'] = "Introduzca la nueva dirección";
$text['message_device']['es-mx'] = "Introduzca la nueva dirección";
$text['message_device']['fr-ca'] = "Insérer la nouvelle adresse";
$text['message_device']['fr-fr'] = "Insérer la nouvelle adresse";
$text['message_device']['he-il'] = "הכנס כתובת מאק חדשה";
$text['message_device']['it-it'] = "Inserire il nuovo MAC address";
$text['message_device']['nl-nl'] = "Voer het nieuwe MAC adres in";
$text['message_device']['pl-pl'] = "Wpisz nowy adres MAC";
$text['message_device']['pt-br'] = "Insira o novo endereço MAC";
$text['message_device']['pt-pt'] = "Introduza o novo endereço MAC";
$text['message_device']['ro-ro'] = "Introduceți noua adresă MAC";
$text['message_device']['ru-ru'] = "Введите новый MAC-адрес";
$text['message_device']['sv-se'] = "Fyll i den nya MAC-adressen";
$text['message_device']['uk-ua'] = "Введіть нову MAC адресу";
$text['message_device']['zh-cn'] = "输入新的 MAC 地址";
$text['message_device']['ja-jp'] = "新しいMACアドレスを入力してください";
$text['message_device']['ko-kr'] = "새 MAC 주소를 입력하십시오";
$text['message_device']['it-it'] = "Inserire il nuovo address";
$text['message_device']['nl-nl'] = "Voer het nieuwe adres in";
$text['message_device']['pl-pl'] = "Wpisz nowy adres";
$text['message_device']['pt-br'] = "Insira o novo endereço";
$text['message_device']['pt-pt'] = "Introduza o novo endereço";
$text['message_device']['ro-ro'] = "Introduceți noua adresă";
$text['message_device']['ru-ru'] = "Введите новый адрес";
$text['message_device']['sv-se'] = "Fyll i den nya adressen";
$text['message_device']['uk-ua'] = "Введіть нову адресу";
$text['message_device']['zh-cn'] = "输入新的 地址";
$text['message_device']['ja-jp'] = "新しいアドレスを入力してください";
$text['message_device']['ko-kr'] = "새 주소를 입력하십시오";
$text['message-maximum_devices']['en-us'] = "Maximum Devices:";
$text['message-maximum_devices']['en-gb'] = "Maximum Devices:";
@@ -3266,29 +3266,29 @@ $text['label-device_model']['zh-cn'] = "模型";
$text['label-device_model']['ja-jp'] = "モデル";
$text['label-device_model']['ko-kr'] = "모델";
$text['label-device_mac_address']['en-us'] = "MAC Address";
$text['label-device_mac_address']['en-gb'] = "MAC Address";
$text['label-device_mac_address']['ar-eg'] = "العنوان الرئيسي";
$text['label-device_mac_address']['de-at'] = "MAC Adresse";
$text['label-device_mac_address']['de-ch'] = "MAC Adresse";
$text['label-device_mac_address']['de-de'] = "MAC Adresse";
$text['label-device_mac_address']['es-cl'] = "Dirección MAC";
$text['label-device_mac_address']['es-mx'] = "Dirección MAC";
$text['label-device_mac_address']['fr-ca'] = "Adresse MAC";
$text['label-device_mac_address']['fr-fr'] = "Adresse MAC";
$text['label-device_mac_address']['he-il'] = "כתובת MAC";
$text['label-device_mac_address']['it-it'] = "MAC Address";
$text['label-device_mac_address']['nl-nl'] = "MAC Adres";
$text['label-device_mac_address']['pl-pl'] = "Adres MAC";
$text['label-device_mac_address']['pt-br'] = "Endereço MAC";
$text['label-device_mac_address']['pt-pt'] = "Endereço MAC";
$text['label-device_mac_address']['ro-ro'] = "Adresa mac";
$text['label-device_mac_address']['ru-ru'] = "MAC-адрес";
$text['label-device_mac_address']['sv-se'] = "MAC-adress";
$text['label-device_mac_address']['uk-ua'] = "Адреса MAC";
$text['label-device_mac_address']['zh-cn'] = "MAC地址";
$text['label-device_mac_address']['ja-jp'] = "Macアドレス";
$text['label-device_mac_address']['ko-kr'] = "MAC 주소";
$text['label-device_address']['en-us'] = "Address";
$text['label-device_address']['en-gb'] = "Address";
$text['label-device_address']['ar-eg'] = "العنوان الرئيسي";
$text['label-device_address']['de-at'] = "Adresse";
$text['label-device_address']['de-ch'] = "Adresse";
$text['label-device_address']['de-de'] = "Adresse";
$text['label-device_address']['es-cl'] = "Dirección";
$text['label-device_address']['es-mx'] = "Dirección";
$text['label-device_address']['fr-ca'] = "Adresse";
$text['label-device_address']['fr-fr'] = "Adresse";
$text['label-device_address']['he-il'] = "כתובת ";
$text['label-device_address']['it-it'] = "Address";
$text['label-device_address']['nl-nl'] = "Adres";
$text['label-device_address']['pl-pl'] = "Adres";
$text['label-device_address']['pt-br'] = "Endereço";
$text['label-device_address']['pt-pt'] = "Endereço";
$text['label-device_address']['ro-ro'] = "Adresa";
$text['label-device_address']['ru-ru'] = "адрес";
$text['label-device_address']['sv-se'] = "adress";
$text['label-device_address']['uk-ua'] = "Адреса";
$text['label-device_address']['zh-cn'] = "地址";
$text['label-device_address']['ja-jp'] = "アドレス";
$text['label-device_address']['ko-kr'] = "주소";
$text['label-download']['en-us'] = "Download";
$text['label-download']['en-gb'] = "Download";
@@ -6104,29 +6104,29 @@ $text['description-device_model']['zh-cn'] = "输入型号名称或编号。";
$text['description-device_model']['ja-jp'] = "モデル名またはモデル番号を入力します。";
$text['description-device_model']['ko-kr'] = "모델명 또는 번호를 입력하세요.";
$text['description-device_mac_address']['en-us'] = "Enter the MAC address.";
$text['description-device_mac_address']['en-gb'] = "Enter the MAC address.";
$text['description-device_mac_address']['ar-eg'] = "أدخل العنوان";
$text['description-device_mac_address']['de-at'] = "Geben Sie die MAC Adresse ein.";
$text['description-device_mac_address']['de-ch'] = "Geben Sie die MAC Adresse ein.";
$text['description-device_mac_address']['de-de'] = "Geben Sie die MAC Adresse ein.";
$text['description-device_mac_address']['es-cl'] = "Ingrese la dirección MAC";
$text['description-device_mac_address']['es-mx'] = "Ingrese la dirección MAC";
$text['description-device_mac_address']['fr-ca'] = "Entrez l'adresse MAC.";
$text['description-device_mac_address']['fr-fr'] = "Entrez l'adresse MAC.";
$text['description-device_mac_address']['he-il'] = "היכנס לכתובת MAC";
$text['description-device_mac_address']['it-it'] = "Inserire il MAC address.";
$text['description-device_mac_address']['nl-nl'] = "Voer het MAC adres in.";
$text['description-device_mac_address']['pl-pl'] = "Wprowadź adres MAC";
$text['description-device_mac_address']['pt-br'] = "Insira o endereço MAC";
$text['description-device_mac_address']['pt-pt'] = "Introduza o endereço MAC.";
$text['description-device_mac_address']['ro-ro'] = "Introduceți adresa MAC.";
$text['description-device_mac_address']['ru-ru'] = "Введите MAC-адрес.";
$text['description-device_mac_address']['sv-se'] = "Fyll i MAC-adress.";
$text['description-device_mac_address']['uk-ua'] = "Введіть адресу MAC.";
$text['description-device_mac_address']['zh-cn'] = "输入 MAC 地址。";
$text['description-device_mac_address']['ja-jp'] = "MAC アドレスを入力します。";
$text['description-device_mac_address']['ko-kr'] = "MAC 주소를 입력합니다.";
$text['description-device_address']['en-us'] = "Enter the address.";
$text['description-device_address']['en-gb'] = "Enter the address.";
$text['description-device_address']['ar-eg'] = "أدخل العنوان";
$text['description-device_address']['de-at'] = "Geben Sie die Adresse ein.";
$text['description-device_address']['de-ch'] = "Geben Sie die Adresse ein.";
$text['description-device_address']['de-de'] = "Geben Sie die Adresse ein.";
$text['description-device_address']['es-cl'] = "Ingrese la dirección";
$text['description-device_address']['es-mx'] = "Ingrese la dirección";
$text['description-device_address']['fr-ca'] = "Entrez l'adresse.";
$text['description-device_address']['fr-fr'] = "Entrez l'adresse.";
$text['description-device_address']['he-il'] = "היכנס לכתובת MAC";
$text['description-device_address']['it-it'] = "Inserire il address.";
$text['description-device_address']['nl-nl'] = "Voer het adres in.";
$text['description-device_address']['pl-pl'] = "Wprowadź adres";
$text['description-device_address']['pt-br'] = "Insira o endereço";
$text['description-device_address']['pt-pt'] = "Introduza o endereço.";
$text['description-device_address']['ro-ro'] = "Introduceți adresa.";
$text['description-device_address']['ru-ru'] = "Введите адрес.";
$text['description-device_address']['sv-se'] = "Fyll i adress.";
$text['description-device_address']['uk-ua'] = "Введіть адресу.";
$text['description-device_address']['zh-cn'] = "输入 地址。";
$text['description-device_address']['ja-jp'] = "アドレスを入力します。";
$text['description-device_address']['ko-kr'] = "주소를 입력합니다.";
$text['description-device_label']['en-us'] = "Enter the device label.";
$text['description-device_label']['en-gb'] = "Enter the device label.";
app/devices/device_copy.php
+11 -11
View File
@@ -44,21 +44,21 @@
//set the http get/post variable(s) to a php variable
if (is_uuid($_REQUEST["id"]) && isset($_REQUEST["mac"])) {
$device_uuid = $_REQUEST["id"];
$device_mac_address = $_REQUEST["mac"];
$device_mac_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_mac_address);
$device_address = $_REQUEST["mac"];
$device_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_address);
}
//set the default
$save = true;
//check to see if the mac address exists
if ($device_mac_address == "" || $device_mac_address == "000000000000") {
//check to see if the device address exists
if ($device_address == "" || $device_address == "000000000000") {
//allow duplicates to be used as templaes
}
else {
$sql = "select count(*) from v_devices ";
$sql .= "where device_mac_address = :device_mac_address ";
$parameters['device_mac_address'] = $device_mac_address;
$sql .= "where device_address = :device_address ";
$parameters['device_address'] = $device_address;
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
if ($num_rows == 0) {
@@ -151,15 +151,15 @@
}
}
//normalize the mac address
if (isset($device_mac_address) && !empty($device_mac_address)) {
$device_mac_address = strtolower($device_mac_address);
$device_mac_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_mac_address);
//normalize the device address
if (isset($device_address) && !empty($device_address)) {
$device_address = strtolower($device_address);
$device_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_address);
}
//create the device array
$device = $devices[0];
$device["device_mac_address"] = $device_mac_address;
$device["device_address"] = $device_address;
$device["device_lines"] = $device_lines;
$device["device_keys"] = $device_keys;
$device["device_settings"] = $device_settings;
app/devices/device_download.php
+1 -1
View File
@@ -76,7 +76,7 @@
//define possible columns in the array
$available_columns['devices'][] = 'device_uuid';
$available_columns['devices'][] = 'device_profile_uuid';
$available_columns['devices'][] = 'device_mac_address';
$available_columns['devices'][] = 'device_address';
$available_columns['devices'][] = 'device_label';
$available_columns['devices'][] = 'device_vendor';
$available_columns['devices'][] = 'device_template';
app/devices/device_edit.php
+33 -33
View File
@@ -92,9 +92,9 @@
exit;
}
//device mac address
if (permission_exists('device_mac_address')) {
$device_mac_address = $_POST["device_mac_address"];
//device device address
if (permission_exists('device_address')) {
$device_address = $_POST["device_address"];
}
else {
$sql = "select * from v_devices ";
@@ -103,7 +103,7 @@
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$device_mac_address = $row["device_mac_address"];
$device_address = $row["device_address"];
}
unset($sql, $parameters, $row);
}
@@ -161,16 +161,16 @@
//$device_setting_enabled = $_POST["device_setting_enabled"];
//$device_setting_description = $_POST["device_setting_description"];
//normalize the mac address
if (!empty($device_mac_address)) {
$device_mac_address = strtolower($device_mac_address);
$device_mac_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_mac_address);
//normalize the address
if (!empty($device_address)) {
$device_address = strtolower($device_address);
$device_address = preg_replace('#[^a-fA-F0-9./]#', '', $device_address);
}
}
//use the mac address to get the vendor
//use the device address to get the vendor
if (empty($device_vendor)) {
$device_vendor = device::get_vendor($device_mac_address ?? null);
$device_vendor = device::get_vendor($device_address ?? null);
}
//add or update the database
@@ -186,7 +186,7 @@
//check for all required data
$msg = '';
if (empty($device_mac_address)) { $msg .= $text['message-required'].$text['label-device_mac_address']."<br>\n"; }
if (empty($device_address)) { $msg .= $text['message-required'].$text['label-device_address']."<br>\n"; }
//if (empty($device_label)) { $msg .= "Please provide: Label<br>\n"; }
//if (empty($device_vendor)) { $msg .= "Please provide: Vendor<br>\n"; }
//if (empty($device_model)) { $msg .= "Please provide: Model<br>\n"; }
@@ -210,7 +210,7 @@
}
//check for duplicates
if ($action == 'add' && $device_mac_address != "000000000000") {
if ($action == 'add' && $device_address != "000000000000") {
$sql = "select ";
$sql .= "d2.domain_name ";
$sql .= "from ";
@@ -218,11 +218,11 @@
$sql .= "v_domains as d2 ";
$sql .= "where ";
$sql .= "d1.domain_uuid = d2.domain_uuid and ";
$sql .= "d1.device_mac_address = :device_mac_address ";
$sql .= "d1.device_address = :device_address ";
if (!empty($_GET["device_uuid"]) && is_uuid($_GET["device_uuid"])) {
$sql .= " and d1.device_uuid <> :device_uuid ";
}
$parameters['device_mac_address'] = $device_mac_address;
$parameters['device_address'] = $device_address;
$database = new database;
$domain_name = $database->select($sql, $parameters, 'column');
if ($domain_name != '') {
@@ -245,8 +245,8 @@
//prepare the array
$array['devices'][0]['domain_uuid'] = $domain_uuid;
$array['devices'][0]['device_uuid'] = $device_uuid;
if (permission_exists('device_mac_address')) {
$array['devices'][0]['device_mac_address'] = $device_mac_address;
if (permission_exists('device_address')) {
$array['devices'][0]['device_address'] = $device_address;
}
//$array['devices'][0]['device_provisioned_ip'] = $device_provisioned_ip;
if (permission_exists('device_label')) {
@@ -509,11 +509,11 @@
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$device_mac_address = $row["device_mac_address"];
$device_address = $row["device_address"];
$device_provisioned_ip = $row["device_provisioned_ip"];
$domain_uuid = $row["domain_uuid"];
$device_label = $row["device_label"];
//$device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2);
//$device_address = substr($device_address, 0,2).'-'.substr($device_address, 2,2).'-'.substr($device_address, 4,2).'-'.substr($device_address, 6,2).'-'.substr($device_address, 8,2).'-'.substr($device_address, 10,2);
$device_label = $row["device_label"];
$device_user_uuid = $row["device_user_uuid"];
$device_username = $row["device_username"];
@@ -534,12 +534,12 @@
//set the defaults
if (empty($device_enabled)) { $device_enabled = 'true'; }
//use the mac address to get the vendor
//use the device address to get the vendor
if (empty($device_vendor)) {
//get the device vendor using the mac address
$device_vendor = device::get_vendor($device_mac_address ?? null);
//get the device vendor using the device address
$device_vendor = device::get_vendor($device_address ?? null);
//if the vendor was not found using the mac address use an alternative method
//if the vendor was not found using the device address use an alternative method
if (empty($device_vendor)) {
$template_array = explode("/", $device_template ?? '');
$device_vendor = $template_array[0] ?? '';
@@ -664,9 +664,9 @@
$users = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
//use the mac address to get the vendor
//use the device address to get the vendor
if (empty($device_vendor)) {
$device_vendor = device::get_vendor($device_mac_address ?? null);
$device_vendor = device::get_vendor($device_address ?? null);
}
//get the device line info for provision button
@@ -720,7 +720,7 @@
if ($_SERVER['HTTPS'] == 'on') { $_SERVER['HTTP_PROTOCOL'] = 'https'; }
if ($_SERVER['SERVER_PORT'] == '443') { $_SERVER['HTTP_PROTOCOL'] = 'https'; }
}
echo " window.location = '".$_SERVER['HTTP_PROTOCOL']."://".$domain_name.PROJECT_PATH."/app/provision/index.php?mac=".escape($device_mac_address ?? '')."&file=' + d + '&content_type=application/octet-stream';\n";
echo " window.location = '".$_SERVER['HTTP_PROTOCOL']."://".$domain_name.PROJECT_PATH."/app/provision/index.php?mac=".escape($device_address ?? '')."&file=' + d + '&content_type=application/octet-stream';\n";
echo " }\n";
echo "\n";
@@ -869,9 +869,9 @@
echo "<select class='formfld' style='display: none; width: auto;' name='target_file' id='target_file' onchange='download(this.value)'>\n";
echo " <option value=''>".$text['label-download']."</option>\n";
foreach ($files as $file) {
//format the mac address and
//format the device address
$format = new provision();
$mac = $format->format_mac($device_mac_address, $device_vendor);
$mac = $format->format_address($device_address, $device_vendor);
//render the file name
$file_name = str_replace("{\$mac}", $mac, basename($file));
//add the select option
@@ -929,16 +929,16 @@
echo "<tr>\n";
echo "<td class='vncell' width='30%' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-device_mac_address']."\n";
echo " ".$text['label-device_address']."\n";
echo "</td>\n";
echo "<td class='vtable' width='70%' align='left'>\n";
if (permission_exists('device_mac_address')) {
echo " <input class='formfld' type='text' name='device_mac_address' id='device_mac_address' maxlength='255' value=\"".escape($device_mac_address ?? '')."\"/>\n";
if (permission_exists('device_address')) {
echo " <input class='formfld' type='text' name='device_address' id='device_address' maxlength='255' value=\"".escape($device_address ?? '')."\"/>\n";
echo "<br />\n";
echo $text['description-device_mac_address']."\n";
echo $text['description-device_address']."\n";
}
else {
echo escape($device_mac_address ?? '');
echo escape($device_address ?? '');
}
echo " <div style='display: none;' id='duplicate_mac_response'></div>\n";
echo " ".escape($device_provisioned_ip ?? '')." (<a href='http://".escape($device_provisioned_ip ?? '')."' target='_blank'>http</a>|<a href='https://".escape($device_provisioned_ip ?? '')."' target='_blank'>https</a>)\n";
@@ -1794,7 +1794,7 @@
echo "<td class='vtable' align='left' nowrap='nowrap'>\n";
$label = $device_alternate[0]['device_label'];
if (empty($label)) { $label = $device_alternate[0]['device_description']; }
if (empty($label)) { $label = $device_alternate[0]['device_mac_address']; }
if (empty($label)) { $label = $device_alternate[0]['device_address']; }
echo " <table>\n";
echo " <tr>\n";
echo " <td><a href='?id=".escape($device_uuid_alternate)."' id='device_uuid_alternate_link'>".escape($label)."</a><input class='formfld' type='hidden' name='device_uuid_alternate' id='device_uuid_alternate' maxlength='255' value=\"".escape($device_uuid_alternate)."\" />&nbsp;</td>";
app/devices/device_imports.php
+564 -564
View File
File diff suppressed because it is too large Load Diff
app/devices/devices.php
+4 -4
View File
@@ -126,7 +126,7 @@
}
if (!empty($search)) {
$sql .= "(";
$sql .= " lower(d.device_mac_address) like :search ";
$sql .= " lower(d.device_address) like :search ";
$sql .= " or lower(d.device_label) like :search ";
$sql .= " or lower(d.device_vendor) like :search ";
$sql .= " or lower(d.device_enabled) like :search ";
@@ -212,7 +212,7 @@
}
if (!empty($search)) {
$sql .= "and (";
$sql .= " lower(d.device_mac_address) like :search ";
$sql .= " lower(d.device_address) like :search ";
$sql .= " or lower(d.device_label) like :search ";
$sql .= " or lower(d.device_vendor) like :search ";
$sql .= " or lower(d.device_enabled) like :search ";
@@ -361,7 +361,7 @@
if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
}
echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order, null, null, $param ?? null);
echo th_order_by('device_address', $text['label-device_address'], $order_by, $order, null, null, $param ?? null);
echo th_order_by('device_label', $text['label-device_label'], $order_by, $order, null, null, $param ?? null);
if ($device_alternate) {
echo th_order_by('device_template', $text['label-device_uuid_alternate'], $order_by, $order, null, null, $param ?? null);
@@ -413,7 +413,7 @@
echo " <td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
}
echo " <td class='no-wrap'>";
echo permission_exists('device_edit') ? "<a href='".$list_row_url."'>".escape(format_mac($row['device_mac_address']))."</a>" : escape(format_mac($row['device_mac_address']));
echo permission_exists('device_edit') ? "<a href='".$list_row_url."'>".escape(format_device_address($row['device_address']))."</a>" : escape(format_device_address($row['device_address']));
echo " </td>\n";
echo " <td>".escape($row['device_label'])."&nbsp;</td>\n";
if ($device_alternate) {