mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-04 08:29:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Wireless support

Browse Source
This commit is contained in:
bergware
2025-01-29 18:51:28 +01:00
parent 33725832f7
commit 4fc6c4ddad
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emhttp/plugins/dynamix/Wireless.page
View File

@@ -54,7 +54,7 @@ _(Other networks)_:
<div markdown="1" class="shade-<?=$display['theme']?>">
_(Add network)_:
: <span class="wifi"><input name="CUSTOM" type="text" class="narrow" maxlength="20" autocomplete="off" spellcheck="false" value=""></span><i class="fa fa-wifi hand grey-text" onclick="info(encodeURIComponent($('input[name=CUSTOM]').val(),0))" title="<?=$title?>"></i>
: <span class="wifi"><input name="CUSTOM" type="text" class="narrow" maxlength="20" autocomplete="off" spellcheck="false" value=""></span><i class="fa fa-wifi hand grey-text" onclick="manage_wifi(encodeURIComponent($('input[name=CUSTOM]').val()),3)" title="<?=$title?>"></i>
</div>
</div>
@@ -76,8 +76,8 @@ function update_wifi() {
timers.wifi = setTimeout(update_wifi,5000);
}
function manage_wifi(ssid,drop) {
if (drop==2) {
function manage_wifi(ssid,task) {
if (task==2) {
$.post('/webGui/include/Wireless.php',{cmd:'forget',ssid:ssid},function(){
clearTimeout(timers.wifi);
swal.close();
@@ -86,7 +86,7 @@ function manage_wifi(ssid,drop) {
return;
}
if (ssid) {
$.post('/webGui/include/Wireless.php',{cmd:'join',ssid:ssid,drop:drop},function(text) {
$.post('/webGui/include/Wireless.php',{cmd:'join',ssid:ssid,task:task},function(text) {
swal({title:decodeURIComponent(ssid),text:text,animation:'none',html:true,confirmButtonText:"_(Join this network)_",showCancelButton:true,cancelButtonText:"_(Cancel)_"},function(join){
if (join) $('form[name=wifi]').submit();
});
@@ -132,6 +132,17 @@ function showPassword() {
$('input[name="PASSWORD"]').attr('type',view);
}
function showSecurity(val) {
if (val=='none') {
$('#username,#password').hide();
} else if (val.slice(-1)=='e') {
$('#username,#password').show();
} else {
$('#username').hide();
$('#password').show();
}
}
<?if (_var($wlan0,'WIFI')=='yes'):?>
$(function() {
$('#wifi').show();

21
emhttp/plugins/dynamix/include/Wireless.php
View File

@@ -117,7 +117,8 @@ case 'join':
require_once "$docroot/webGui/include/OpenSSL.php";
$token = parse_ini_file($var)['csrf_token'];
$ssid = rawurldecode($_POST['ssid']);
$drop = $_POST['drop']==1;
$drop = $_POST['task']==1;
$manual = $_POST['task']==3;
$user = _var($wifi[$ssid],'USERNAME') ? openssl_decrypt($wifi[$ssid]['USERNAME'],$cipher,$key,0,$iv) : '';
$passwd = _var($wifi[$ssid],'PASSWORD') ? openssl_decrypt($wifi[$ssid]['PASSWORD'],$cipher,$key,0,$iv) : '';
$join = _var($wifi[$ssid],'AUTOJOIN','no');
@@ -133,6 +134,8 @@ case 'join':
$mask6 = _var($wifi[$ssid],'MASK6','64');
$gwv6 = _var($wifi[$ssid],'GATEWAY6');
$server6 = _var($wifi[$ssid],'SERVER6');
$wlan = _var($wifi[$ssid],'SECURITY','wpa2');
$b2b = substr($wlan,-1)=='e';
$hide1 = $dhcp4=='no' ? '': 'hide';
$hide2 = $dns4=='no' ? 'hide' : '';
$hide3 = $dhcp6=='no' ? '' : 'hide';
@@ -156,8 +159,20 @@ case 'join':
echo "<tr><td colspan=\"2\"><center><input type=\"button\" class=\"form\" value=\""._('Forget this network')."\" onclick=\"manage_wifi(encodeURIComponent('$ssid'),2)\"></center></td></tr>";
echo "<tr><td colspan=\"2\">&nbsp;</td></tr>";
}
if (strpos($attr3,'IEEE')!==false) echo "<tr><td>"._('Username').":</td><td><input type=\"text\" name=\"USERNAME\" class=\"narrow\" autocomplete=\"off\" spellcheck=\"false\" value=\"$user\"></td></tr>";
if ($attr3) echo "<tr><td>"._('Password').":</td><td><input type=\"password\" name=\"PASSWORD\" class=\"narrow\" autocomplete=\"off\" spellcheck=\"false\" value=\"$passwd\"><i id=\"showPass\" class=\"fa fa-eye\" onclick=\"showPassword()\"></i></td></tr>";
if ($manual) {
echo "<tr><td>"._('Security')."</td><td><select name=\"SECURITY\" onclick=\"showSecurity(this.value)\">";
echo mk_option($wlan, 'none', _('None'));
echo mk_option($wlan, 'wep', _('WEP'));
echo mk_option($wlan, 'wpa2', _('WPA2'));
echo mk_option($wlan, 'wpa23', _('WPA2/WPA3'), 'selected');
echo mk_option($wlan, 'wpa3', _('WPA3'));
echo mk_option($wlan, 'wpa2e', _('WPA2 Enterprise'));
echo mk_option($wlan, 'wpa23e', _('WPA2/WPA3 Enterprise'));
echo mk_option($wlan, 'wpa3e', _('WPA3 Enterprise'));
echo "</select></td></tr>";
}
if (strpos($attr3,'IEEE')!==false || $manual) echo "<tr id=\"username\"".(($manual && !$b2b)?" class=\"hide\"":"")."><td>"._('Username').":</td><td><input type=\"text\" name=\"USERNAME\" class=\"narrow\" autocomplete=\"off\" spellcheck=\"false\" value=\"$user\"></td></tr>";
if ($attr3 || $manual) echo "<tr id=\"password\"".(($manual && $wlan=='none')?" class=\"hide\"":"")."><td>"._('Password').":</td><td><input type=\"password\" name=\"PASSWORD\" class=\"narrow\" autocomplete=\"off\" spellcheck=\"false\" value=\"$passwd\"><i id=\"showPass\" class=\"fa fa-eye\" onclick=\"showPassword()\"></i></td></tr>";
echo "<tr><td colspan=\"2\">&nbsp;</td></tr>";
echo "<tr><td>"._('IPv4 address assignment').":</td><td><select name=\"DHCP4\" onclick=\"showDHCP(this.value,4)\">";
echo mk_option($dhcp4, 'yes', _('Automatic'));