mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-12 15:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Wireless: code update

Browse Source
This commit is contained in:
bergware
2025-03-25 09:17:36 +01:00
parent e87172da13
commit 4587d67ae9
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/include/NetworkInfo.php
+11 -10
View File
@@ -22,8 +22,8 @@ if (isset($_POST['listen'])) {
function port($eth) {
$sys = "/sys/class/net";
if (substr($eth,0,4)=='wlan') return $eth;
$x = preg_replace('/[^0-9]/','',$eth) ?: '0';
if (substr($eth,0,4) == 'wlan') return $eth;
$x = preg_replace('/[^0-9]/', '', $eth) ?: '0';
return file_exists("$sys/br{$x}") ? "br{$x}" : (file_exists("$sys/bond{$x}") ? "bond{$x}" : "eth{$x}");
}
@@ -38,25 +38,25 @@ $error = "<span class='red-text'>"._('Missing')."</span>";
$note = in_array($eth,['eth0','wlan0']) && !$vlan ? $error : $none;
$ipv4 = array_filter(explode(' ',exec("ip -4 -br addr show ".escapeshellarg($port)." scope global 2>/dev/null | awk '{\$1=\$2=\"\";print;exit}' | sed -r 's/ metric [0-9]+//g; s/\/[0-9]+//g'")));
$gw4 = exec("ip -4 route show default dev ".escapeshellarg($port)." 2>/dev/null | awk '{print \$3;exit}'") ?: $note;
$dns4 = array_filter($ns,function($ns){return strpos($ns,':')===false;});
$dns4 = array_filter($ns,function($ns){return strpos($ns,':') === false;});
$domain = exec("grep -Pom1 'domain \K.*' /etc/resolv.conf 2>/dev/null") ?: '---';
if ($v6on) {
$ipv6 = array_filter(explode(' ',exec("ip -6 -br addr show ".escapeshellarg($port)." scope global -temporary 2>/dev/null | awk '{\$1=\$2=\"\";print;exit}' | sed -r 's/ metric [0-9]+//g; s/\/[0-9]+//g'")));
$gw6 = exec("ip -6 route show default dev ".escapeshellarg($port)." 2>/dev/null | awk '{print \$3;exit}'") ?: $note;
$dns6 = array_filter($ns,function($ns){return strpos($ns,':')!==false;});
$dns6 = array_filter($ns,function($ns){return strpos($ns,':') !== false;});
}
echo "<table style='text-align:left;font-size:1.2rem'>";
echo "<tr><td>&nbsp;</td><td>&nbsp;</td></tr>";
if ($wlan0) {
exec("iw wlan0 link | awk '/^\s+(SSID|freq|signal|[rt]x bitrate): /{print \$1,\$2,\$3,\$4,\$5}'",$speed);
exec("iw wlan0 link | awk '/^\s+(SSID|freq|signal|[rt]x bitrate): /{print \$1,\$2,\$3,\$4}'", $speed);
if (count($speed) == 5) {
$network = explode(': ',$speed[0])[1];
$freq = explode(': ',$speed[1])[1];
$signal = explode(': ',$speed[2])[1];
$rxrate = explode(': ',$speed[3])[1];
$txrate = explode(': ',$speed[4])[1];
$network = explode(': ', $speed[0])[1];
$freq = explode(': ', $speed[1])[1];
$signal = explode(': ', $speed[2])[1];
$rxrate = explode(': ', $speed[3])[1];
$txrate = explode(': ', $speed[4])[1];
$tmp = '/var/tmp/attr';
$band = [];
$attr = is_readable($tmp) ? (array)parse_ini_file($tmp,true) : [];
@@ -70,6 +70,7 @@ if ($wlan0) {
}
if (!in_array($id, $band)) $band[] = $id;
}
sort($band);
$band = '('.implode(', ', $band).')';
} else {
$network = $signal = $rxrate = $txrate = _('Unknown');
emhttp/plugins/dynamix/include/Wireless.php
+9 -7
View File
@@ -45,6 +45,8 @@ function scanWifi($port) {
if (str_starts_with($network, '\\x00')) continue;
if (empty($wlan[$network])) {
$wlan[$network] = $attr;
// store MAC address only
$wlan[$network][0] = substr($wlan[$network][0],4,17);
} else {
// group radio frequencies
$wlan[$network][1] .= ' '.$attr[1];
@@ -135,10 +137,10 @@ case 'join':
if (is_readable($ssl)) extract(parse_ini_file($ssl));
$token = parse_ini_file($var)['csrf_token'];
$ssid = rawurldecode($_POST['ssid']);
$drop = $_POST['task']==1;
$manual = $_POST['task']==3;
$user = _var($wifi[$ssid],'USERNAME') && isset($cipher,$key,$iv) ? openssl_decrypt($wifi[$ssid]['USERNAME'],$cipher,$key,0,$iv) : _var($wifi[$ssid],'USERNAME');
$passwd = _var($wifi[$ssid],'PASSWORD') && isset($cipher,$key,$iv) ? openssl_decrypt($wifi[$ssid]['PASSWORD'],$cipher,$key,0,$iv) : _var($wifi[$ssid],'PASSWORD');
$drop = $_POST['task'] == 1;
$manual = $_POST['task'] == 3;
$user = _var($wifi[$ssid],'USERNAME') && isset($cipher, $key, $iv) ? openssl_decrypt($wifi[$ssid]['USERNAME'], $cipher, $key, 0, $iv) : _var($wifi[$ssid],'USERNAME');
$passwd = _var($wifi[$ssid],'PASSWORD') && isset($cipher, $key, $iv) ? openssl_decrypt($wifi[$ssid]['PASSWORD'], $cipher, $key, 0, $iv) : _var($wifi[$ssid],'PASSWORD');
$join = _var($wifi[$ssid],'AUTOJOIN','no');
$dhcp4 = _var($wifi[$ssid],'DHCP4','yes');
$dns4 = _var($wifi[$ssid],'DNS4','no');
@@ -157,11 +159,11 @@ case 'join':
$attr2 = $attr[$ssid]['ATTR2'] ?? '';
$attr3 = $attr[$ssid]['ATTR3'] ?? '';
$attr4 = $attr[$ssid]['ATTR4'] ?? '';
$ieee1 = strpos($attr3,'IEEE')!==false;
$ieee2 = strpos($safe,'IEEE')!==false;
$ieee1 = strpos($attr3,'IEEE') !== false;
$ieee2 = strpos($safe,'IEEE') !== false;
$hide0 = ($manual || !$ieee2) && !$ieee1 ? 'hide' : '';
$hide1 = $safe=='OPEN' || !$attr3 ? 'hide' : '';
$hide2 = $dhcp4=='no' ? '': 'hide';
$hide2 = $dhcp4=='no' ? '' : 'hide';
$hide3 = $dns4=='no' ? 'hide' : '';
$hide4 = $dhcp6=='no' ? '' : 'hide';
$hide5 = $dhcp6=='' ? 'hide' : '';