Merge branch 'unraid:master' into refactor/feedback

This commit is contained in:
Zack Spear
2023-07-17 17:27:06 -07:00
committed by GitHub
3 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -160,7 +160,7 @@ $validDNS = "([0-9a-z]([0-9a-z\-]{0,61}[0-9a-z])?\.)+($tld)";
$validIP4 = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}";
$validIP6 = "(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(:|([0-9a-fA-F]{1,4}:)+):(([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4})?)";
$maskIP4 = "([0-9]|[12][0-9]|3[0-2])?";
$maskIP6 = "([0-9]|[1-9][[0-9]|1[01][0-9]|12[0-8])?";
$maskIP6 = "([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8])?";
$validText = "^($validDNS|$validIP4|$validIP6)$";
$validList = "^(($validIP4/?$maskIP4|$validIP6/?$maskIP6)(, *)?)+$";
@@ -33,7 +33,7 @@ default:
$route = $cell[0];
$gateway = $cell[2];
if ($route=='default') $gateway .= " via {$cell[4]}";
$metric = '1';
$metric = '0';
for ($i=5; $i<count($cell); $i++) if ($cell[$i]=='metric') {$metric = $cell[$i+1]; break;}
echo "<tr><td>IPv4</td><td>$route</td><td>$gateway</td><td>$metric</td><td style='text-align:center'><a href='#' onclick='deleteRoute(\"$gateway\",\"$route\",\"$metric\");return false'><i class='fa fa-trash-o'></i></a></td></tr>";
}