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

Merge branch 'master' of github.com:limetech/dynamix-6.2

Browse Source
This commit is contained in:
Tom Mortensen
2016-06-07 14:09:10 -07:00
parent 802b11d691 b687c64824
commit ef605570c4
3 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/dynamix/Eth0.page
View File

@@ -20,28 +20,23 @@ $template = '/usr/local/emhttp/webGui/EthX.page';
$ini = '/var/local/emhttp/network.ini';
$validIP = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
function normalize($name) {
return ucfirst(trim($name));
}
// get available ethernet ports (excluding eth0)
exec("ip -br addr|grep -Po '^eth[1-9]+\s'",$ports);
$ports = array_map('normalize', $ports);
$ports = array_map('trim', $ports);
// remove non-existing ethernet ports
foreach (glob('/usr/local/emhttp/webGui/Eth[1-9]*.page',GLOB_NOSORT) as $port) {
if (!in_array(basename($port,'.page'), $ports)) {
if (!in_array(basename(strtolower($port),'.page'), $ports)) {
@unlink($port);
$build = true;
}
}
// add new ethernet ports
foreach ($ports as $port) {
$file = "/usr/local/emhttp/webGui/$port.page";
$file = "/usr/local/emhttp/webGui/".ucfirst($port).".page";
if (!file_exists($file)) {
copy($template, $file);
$eth = strtolower($port);
exec("sed -i 's/x-settings/NetworkSettings/;s/ethX/$eth/g' $file");
exec("sed -i 's/x-settings/NetworkSettings/;s/ethX/$port/g' $file");
$build = true;
}
}
@@ -55,7 +50,8 @@ if (isset($eth0)) foreach ($eth0 as $key => $val) if (substr($key,0,6)=='VLANID'
?>
<style>
span.pin i{font-size:16px;cursor:pointer;}
span.no-int{color:#E68A00;}
span.unset{color:#E68A00;}
span.member{color:#00529B;}
div.shade-white{background-color:#F8F8F8;}
div.shade-black{background-color:#0C0C0C;}
</style>
@@ -202,8 +198,9 @@ function removeVLAN(element,disabled) {
$(element).remove();
$('#index-'+id[1]+'-0').find('select').first().trigger('change');
}
function disableForm(form) {
function disableForm(form,member) {
$(form).find('input,select').not('input[value="Done"]').prop('disabled',true);
if (member) $(form).find('input[name^="DESCRIPTION"],input[name^="#"]').prop('disabled',false);
}
var stopEvent = false;
function exitCode(form,key) {
@@ -216,10 +213,11 @@ function exitCode(form,key) {
stopEvent = true;
}
}
function checkPort() {
function portcheck_eth0() {
$.post('/webGui/include/CheckPort.php',{port:'eth0'},function(text) {
showNotice(text);
setTimeout(checkPort,15000);
var html = $('#user-notice').html();
if (!html || html.indexOf('eth0')>0) showNotice(text);
setTimeout(portcheck_eth0,10000);
});
}
$(function() {
@@ -249,7 +247,7 @@ $(function() {
<?else:?>
$('div[id=title]').append(ctrl);
<?endif;?>
checkPort();
portcheck_eth0();
});
</script>
<form markdown="1" name="eth0_settings" method="POST" action="/update.php" target="progressFrame" onchange="exitCode(this,false)" onsubmit="return prepareSettings(this)">
@@ -300,9 +298,9 @@ Bonding mode:
Bonding members:
: <select id="bond0" name="BONDNICS" size="1" multiple="multiple" style="display:none">
<?=mk_option($eth0['BONDNICS'],'eth0','Eth0','selected disabled')?>
<?=mk_option($eth0['BONDNICS'],'eth0','eth0','selected disabled')?>
<?foreach ($ports as $port):?>
<?=mk_option_check($eth0['BONDNICS'],strtolower($port),$port)?>
<?=mk_option_check($eth0['BONDNICS'],$port,$port)?>
<?endforeach;?>
</select>
@@ -321,9 +319,9 @@ Enable bridging:
<div id="bridge-members" style="display:none" markdown="1">
Bridging members:
: <select id="bridge0" name="BRNICS" size="1" multiple="multiple" style="display:none">
<?=mk_option($eth0['BRNICS'],'eth0','Eth0','selected disabled')?>
<?=mk_option($eth0['BRNICS'],'eth0','eth0','selected disabled')?>
<?foreach ($ports as $port):?>
<?=mk_option_check($eth0['BRNICS'],strtolower($port),$port)?>
<?=mk_option_check($eth0['BRNICS'],$port,$port)?>
<?endforeach;?>
</select>

58
plugins/dynamix/EthX.page
View File

@@ -15,27 +15,33 @@ Png="ethernet.png"
*/
?>
<?
// get interface configuration state
$down = empty($ethX) || strlen(exec("ip link show ethX|grep -om1 ',UP[,>]'"))==0;
// get VLAN interfaces
$vlan_ethX = [0];
if (isset($ethX)) foreach ($ethX as $key => $val) if (substr($key,0,6)=='VLANID') $vlan_ethX[] = substr($key,7);
// get bond membership
$bond_ethX = $eth0['BONDING']=='yes' ? in_array('ethX',explode(',',$eth0['BONDNICS'])) : false;
// get bridge membership
$bridge_ethX = $eth0['BRIDGING']=='yes' ? in_array('ethX',explode(',',$eth0['BRNICS'])) : false;
if ($service)
$locked = "$service must be <b>STOPPED</b> to change";
elseif ($bond_ethX)
$locked = "Interface must be <i>removed</i> as <b>Bonding member</b> to change";
elseif ($bridge_ethX)
$locked = "Interface must be <i>removed</i> as <b>Bridging member</b> to change";
else
$locked = "";
$locked = $bond_ethX || $bridge_ethX ;
// get VLAN interfaces
$vlan_ethX = [0];
if (!$locked && isset($ethX)) foreach ($ethX as $key => $val) if (substr($key,0,6)=='VLANID') $vlan_ethX[] = substr($key,7);
if ($bond_ethX) {
$more = true;
$reason = "Interface is member of ".$eth0['BONDNAME']." (see interface eth0)";
$class = 'member';
} elseif ($bridge_ethX) {
$more = true;
$reason = "Interface is member of ".$eth0['BRNAME']." (see interface eth0)";
$class = 'member';
} elseif (empty($ethX) || strlen(exec("ip link show ethX|grep -om1 ',UP[,>]'"))==0) {
$more = true;
$reason = "Interface is not configured";
$class = 'unset';
} else {
$more = false;
}
?>
<script>
<?if ($tabbed):?>
@@ -43,18 +49,26 @@ else
<?else:?>
var waitid = '#wait_ethX';
<?endif;?>
function portcheck_ethX() {
$.post('/webGui/include/CheckPort.php',{port:'ethX'},function(text) {
var html = $('#user-notice').html();
if (!html || html.indexOf('ethX')>0) showNotice(text);
setTimeout(portcheck_ethX,10000);
});
}
$(function() {
var form = document.ethX_settings;
checkNetworkAccess(form,'ethX');
checkNetworkSettings(form);
<?if ($locked):?>
disableForm(form);
<?endif;?>
<?if (!$tabbed):?>
$('div[id=title]').each(function(){
if ($(this).text().indexOf('Interface ethX')==0) $(this).append("<span id='wait_ethX' class='status red' style='display:none;font-size:small;font-style:italic'>Please wait... configuring interfaces</span>");
});
<?endif;?>
<?if ($locked):?>
disableForm(form,true);
<?endif;?>
setTimeout(portcheck_ethX,Number('ethX'.substr(3))*1000);
});
</script>
<form markdown="1" name="ethX_settings" method="POST" action="/update.php" target="progressFrame" onchange="exitCode(this,false)" onsubmit="return prepareSettings(this)">
@@ -71,11 +85,12 @@ $(function() {
<div id="index-ethX-<?=$i?>" markdown="1">
<?if ($i==0):?>
MAC address:
: <?if ($down):?><span class="no-int"><?endif;?><?=strtoupper(exec("ip link show ethX|grep -Pom1 'ether \K\S+'"))?><?if ($down):?> - interface is not configured</span><?endif;?>
: <?if ($more):?><span class="<?=$class?>"><?endif;?><?=strtoupper(exec("ip link show ethX|grep -Pom1 'ether \K\S+'"))?><?if ($more):?> - <?=$reason?></span><?endif;?>
> This is the hardware address of the interface.
> When tagging is enabled all VLANs on this interface will share the same hardware address.
<?if (!$locked):?>
Enable bridging:
: <select name="BRIDGING" size="1">
<?=mk_option($ethX['BRIDGING'], "no", "No");?>
@@ -84,6 +99,7 @@ Enable bridging:
> Bridging is a feature which creates a virtual bridge and allows VMs to communicate directly with the physical Ethernet port.
<?endif;?>
Interface description:
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=$ethX["DESCRIPTION:$i"]?>" onchange="exitCode(this.form,true)">
@@ -124,7 +140,7 @@ Network mask:
> Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
Desired MTU:
: <input type="number" name="MTU" min="68" max="9198" value="<?=$ethX['MTU']?>" class="narrow">
: <input type="number" name="MTU" min="68" max="9198" value="<?=$locked?$eth0['MTU']:$ethX['MTU']?>" class="narrow">
> This is the MTU size to use on the physical Ethernet interface.
> If left blank, the MTU will automatically be determined (by default 1500 bytes).
@@ -238,5 +254,5 @@ Network mask:
</script>
&nbsp;
: <input type="submit" value="Apply" onclick="$(waitid).show()"><input type="button" value="Done" onclick="done()"><?=$locked?>
: <input type="submit" value="Apply" onclick="$(waitid).show()"><input type="button" value="Done" onclick="done()"><?if ($service) echo "$service must be <b>STOPPED</b> to change"?>
</form>

1
plugins/dynamix/scripts/netconfig
View File

@@ -19,6 +19,7 @@ $cfg = '/boot/config/network.cfg';
function ifname($name) {
global $old;
if (!$name) return;
for ($i=0; $i<$old['SYSNICS']; $i++) {
$nics = $old['BONDNICS'][$i] ?: $old['BRNICS'][$i];
if (strpos("$nics ","$name ")!==false) return $old['IFNAME'][$i];