mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 10:38:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor code changes

Browse Source 
Consistency: use the reference [$i,$j] in array for all scripts
This commit is contained in:
bergware
2016-05-14 07:57:37 +02:00
parent 5c3fcb7383
commit f4f59803d9
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/Eth0.page
+1 -1
View File
@@ -45,7 +45,7 @@ foreach ($ports as $port) {
$build = true;
}
}
// enable when array is stopped
// enable interface only when VMs are stopped
$disabled = exec("virsh list|grep -om1 running") ? 'disabled' : '';
// get VLAN interfaces
plugins/dynamix/scripts/netconfig
+11 -12
View File
@@ -39,32 +39,31 @@ if ($bonding = isset($ini['eth0']) && $ini['eth0']['BONDING']=='yes') {
}
// create configuration file for all available interfaces
$index = 0;
$new = []; $new[] = "# Generated settings:";
$i = 0; $new = []; $new[] = "# Generated settings:";
foreach ($ini as $name => $port) {
if ($bonding && in_array($name,$members)) continue;
$bridging = $port['BRIDGING']=='yes';
$trunk = $port['TYPE']=='trunk';
$i = 0; $id0 = 0;
$j = 0; $x0 = 0;
$iface = $bridging ? $port['BRNAME'] : ($bonding && $name=='eth0' ? $port['BONDNAME'] : $name);
$new[] = "IFNAME[$index]=\"$iface\"";
$new[] = "IFNAME[$i]=\"$iface\"";
if ($set==$name) $ifname = $iface;
foreach ($port as $key => $val) {
if (preg_match('/^(TYPE|BONDING$|BRIDGING)/',$key)) continue;
if (!$bonding && preg_match('/^(BONDING_MODE|BONDING_MIIMON|BONDNICS|BONDNAME)/',$key)) continue;
if (!$bridging && preg_match('/^(BRSTP|BRFD|BRNICS|BRNAME)/',$key)) continue;
list($item,$id) = explode(':',$key,2);
if ($trunk && $id>0 && preg_match('/^(VLANID|USE_DHCP|IPADDR|NETMASK|DESCRIPTION)/',$key)) {
if ($id0 != $id) {$id0 = $id; $i++;}
$vlan = ",$i]";
list($item,$x) = explode(':',$key,2);
if ($trunk && $x>0 && preg_match('/^(VLANID|USE_DHCP|IPADDR|NETMASK|DESCRIPTION)/',$key)) {
if ($x0 != $x) {$x0 = $x; $j++;}
$vlan = ",$j]";
} else $vlan = '';
if (!$vlan && preg_match('/^VLANID/',$key)) continue;
$new[] = $item.(preg_match('/^(GATEWAY|DNS_SERVER|DHCP_KEEPRESOLV)/',$key)?'':'['.$index.($vlan?'':']')).$vlan."=\"$val\"";
$new[] = $item.(preg_match('/^(GATEWAY|DNS_SERVER|DHCP_KEEPRESOLV)/',$key)?'':'['.$i.($vlan?'':']')).$vlan."=\"$val\"";
}
if ($trunk) $new[] = "VLANS[$index]=\"".($i+1)."\"";
$index++;
if ($trunk) $new[] = "VLANS[$i]=\"".($j+1)."\"";
$i++;
}
$new[] = "SYSNICS=\"$index\"";
$new[] = "SYSNICS=\"$i\"";
file_put_contents($cfg,implode("\r\n",$new)."\r\n");
// start interface with updated (new) configuration