diff --git a/includes/get_clients.php b/includes/get_clients.php index 05edff6d..1b3e124a 100644 --- a/includes/get_clients.php +++ b/includes/get_clients.php @@ -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); diff --git a/templates/networking.php b/templates/networking.php index e925367b..0bcf5c54 100755 --- a/templates/networking.php +++ b/templates/networking.php @@ -119,7 +119,8 @@ if(isset($dev["isAP"]) && $dev["isAP"]) $ty="Access Point"; echo "".$ty."\n"; echo "".$dev["mac"]."\n"; - echo "".$dev["vid"]."/".$dev["pid"]."\n"; + if(isset($dev["vid"]) && !empty($dev["vid"])) echo "".$dev["vid"]."/".$dev["pid"]."\n"; + else echo " - \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);