1
0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00

Fix name of internal wlan interface

This commit is contained in:
Christian Zeitnitz 2021-03-20 10:24:19 +01:00
parent ac16d67609
commit 68ec5f7db5
2 changed files with 5 additions and 1 deletions

View File

@ -32,6 +32,9 @@ function getClients($simple=true) {
if(empty($model) || preg_match("/^[0-9a-f]{4}$/",$model) === 1) {
$model = preg_only_match("/ID_MODEL_FROM_DATABASE=(.*)$/",$udevinfo);
}
if(empty($model)) {
$model = preg_only_match("/ID_OUI_FROM_DATABASE=(.*)$/",$udevinfo);
}
$vendor = preg_only_match("/ID_VENDOR_ENC=(.*)$/",$udevinfo);
if(empty($vendor) || preg_match("/^[0-9a-f]{4}$/",$vendor) === 1) {
$vendor = preg_only_match("/ID_VENDOR_FROM_DATABASE=(.*)$/",$udevinfo);

View File

@ -119,7 +119,8 @@
if(isset($dev["isAP"]) && $dev["isAP"]) $ty="Access Point";
echo "<td>".$ty."</td>\n";
echo "<td>".$dev["mac"]."</td>\n";
echo "<td>".$dev["vid"]."/".$dev["pid"]."</td>\n";
if(isset($dev["vid"]) && !empty($dev["vid"])) echo "<td>".$dev["vid"]."/".$dev["pid"]."</td>\n";
else echo "<td> - </td>\n";
$udevfile=$_SESSION["udevrules"]["udev_rules_file"];
$isStatic=array();
exec('find /etc/udev/rules.d/ -type f \( -iname "*.rules" ! -iname "'.basename($udevfile).'" \) -exec grep -i '.$dev["mac"].' {} \; ',$isStatic);