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

Update to enhanced network settings

Browse Source
This commit is contained in:
bergware
2016-05-10 08:27:13 +02:00
parent 4978c1a0ff
commit 77c2d150f9
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/Eth0.page
+14 -2
View File
@@ -96,6 +96,15 @@ function prepareSettings(form) {
return false;
}
}
$(form).find('select[name^="USE_DHCP:"]').each(function() {
if ($(this).prop('disabled')==false && $(this).val()=='yes') {
var ipaddr = $(this).prop('name').replace('USE_DHCP','IPADDR');
$(form).find('input[name="'+ipaddr+'"]').val('Obtaining IP address...');
}
});
if ($(form).find('select[name="DHCP_KEEPRESOLV"]').val()=='no') {
$(form).find('input[name^="DNS_SERVER"]').val('Obtaining DNS server...');
}
form.BRNAME.value = 'br'+$(form).find('input[name="#section"]').val().substr(3);
return true;
}
@@ -104,10 +113,11 @@ function checkNetworkSettings(form,index) {
$(form).find('select[name^="USE_DHCP:"]').each(function() {
var i = $(this).attr('name').substr(9);
var disabled = $(this).val()!='no';
$(form).find('input[name="IPADDR:'+i+'"]').prop('disabled',disabled).prop('required',!disabled);
var ipaddr = $(form).find('input[name="IPADDR:'+i+'"]');
var netmask = $(form).find('select[name="NETMASK:'+i+'"]');
ipaddr.prop('disabled',disabled).prop('required',!disabled);
netmask.prop('disabled',disabled);
if (disabled) netmask.append('<option value="none" selected="selected"></option>');
if (ipaddr.val()=='') netmask.append('<option value="none" selected="selected"></option>');
if (i==0 && form.GATEWAY !== undefined) {form.GATEWAY.disabled = disabled; form.GATEWAY.required = !disabled;}
});
} else {
@@ -301,6 +311,7 @@ IP address:
Network mask:
: <select name="NETMASK:<?=$i?>" size="1">
<?=mk_option($eth0["NETMASK:$i"], "255.255.0.0", "255.255.0.0");?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.252.0", "255.255.252.0");?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.254.0", "255.255.254.0");?>
<?=mk_option($eth0["NETMASK:$i"], "255.255.255.0", "255.255.255.0");?>
@@ -380,6 +391,7 @@ IP address:
Network mask:
: <select name="NETMASK:INDEX" size="1">
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.0.0", "255.255.0.0");?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.252.0", "255.255.252.0");?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.254.0", "255.255.254.0");?>
<?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.0", "255.255.255.0");?>
plugins/dynamix/EthX.page
+2
View File
@@ -101,6 +101,7 @@ IP address:
Network mask:
: <select name="NETMASK:<?=$i?>" size="1">
<?=mk_option($ethX["NETMASK:$i"], "255.255.0.0", "255.255.0.0");?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.252.0", "255.255.252.0");?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.254.0", "255.255.254.0");?>
<?=mk_option($ethX["NETMASK:$i"], "255.255.255.0", "255.255.255.0");?>
@@ -147,6 +148,7 @@ IP address:
Network mask:
: <select name="NETMASK:INDEX" size="1">
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.0.0", "255.255.0.0");?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.252.0", "255.255.252.0");?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.254.0", "255.255.254.0");?>
<?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.0", "255.255.255.0");?>
plugins/dynamix/include/DefaultPageLayout.php
+1 -1
View File
@@ -227,7 +227,7 @@ for (var i=0,mobile; mobile=mobiles[i]; i++) {
</div>
<div class="block">
<span class="text-left">Server<br/>Description<br/>Version<br/>Uptime</span>
<span class="text-right"><?=$var['NAME'].($var['IPADDR'] ? " &bullet; {$var['IPADDR']}" : "")?><br/><?=$var['COMMENT']?><br/><?=$var['version']?><br/><span id="uptime"></span></span>
<span class="text-right"><?=$var['NAME']." &bullet; ".$eth0['IPADDR:0']?><br/><?=$var['COMMENT']?><br/><?=$var['version']?><br/><span id="uptime"></span></span>
</div>
</div>
<?
plugins/dynamix/template.php
+1
View File
@@ -40,6 +40,7 @@ $sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
$sec_afp = parse_ini_file('state/sec_afp.ini',true);
// Read network settings
exec("/usr/local/sbin/create_network_ini");
extract(parse_ini_file('state/network.ini',true));
// Merge SMART settings