Skip to content

Fix 8021q ports forms #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SergeyParfenoff wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 8021q ports forms #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions wwwroot/inc/interface-8021q.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,11 @@ function renderObject8021QPorts ($object_id)
$uplinks = filter8021QChangeRequests ($vdom['vlanlist'], $desired_config, produceUplinkPorts ($vdom['vlanlist'], $desired_config, $vswitch['object_id']));
echo '<table border=0 width="100%"><tr valign=top><td class=tdleft width="50%">';
// port list
if ($req_port_name == '');
printOpFormIntro ('save8021QConfig', array ('mutex_rev' => $vswitch['mutex_rev'], 'form_mode' => 'save'));
echo '<table cellspacing=0 cellpadding=5 align=center class=widetable>';
echo '<tr><th>port</th><th>interface</th><th>link</th><th width="25%">last&nbsp;saved&nbsp;config</th>';
echo $req_port_name == '' ? '<th width="25%">new&nbsp;config</th></tr>' : '<th>(zooming)</th></tr>';
if ($req_port_name == '');
printOpFormIntro ('save8021QConfig', array ('mutex_rev' => $vswitch['mutex_rev'], 'form_mode' => 'save'));
$sockets = array();
if (isset ($_REQUEST['hl_port_id']))
{
Expand Down Expand Up @@ -547,17 +547,16 @@ function renderObject8021QPorts ($object_id)
echo "<input type=hidden name=nports value=${nports}>";
echo '<li>' . getImageHREF ('SAVE', 'save configuration', TRUE) . '</li>';
}
echo '</form>';
if (permitted (NULL, NULL, NULL, array (array ('tag' => '$op_recalc8021Q'))))
echo '<li>' . getOpLink (array ('op' => 'exec8021QRecalc'), '', 'RECALC', 'Recalculate uplinks and downlinks') . '</li>';
echo '</ul></td></tr></table>';
if ($req_port_name == '');
echo '</form>';
echo '</td>';
echo '<td>';
// configuration of currently selected port, if any
if (!array_key_exists ($req_port_name, $desired_config))
{
echo '<td>';
$port_options = array();
foreach ($desired_config as $pn => $portinfo)
if (editable8021QPort ($portinfo))
Expand All @@ -568,16 +567,15 @@ function renderObject8021QPorts ($object_id)
else
{
startPortlet ('port duplicator');
echo '<table border=0 align=center>';
printOpFormIntro ('save8021QConfig', array ('mutex_rev' => $vswitch['mutex_rev'], 'form_mode' => 'duplicate'));
echo '<table border=0 align=center>';
echo '<tr><td>' . getSelect ($port_options, array ('name' => 'from_port')) . '</td></tr>';
echo '<tr><td>&darr; &darr; &darr;</td></tr>';
echo '<tr><td>' . getSelect ($port_options, array ('name' => 'to_ports[]', 'size' => getConfigVar ('MAXSELSIZE'), 'multiple' => 1)) . '</td></tr>';
echo '<tr><td>' . getImageHREF ('COPY', 'duplicate', TRUE) . '</td></tr>';
echo '</form></table>';
echo '</table></form>';
finishPortlet();
}
echo '</td>';
}
else
renderTrunkPortControls
Expand All @@ -587,6 +585,7 @@ function renderObject8021QPorts ($object_id)
$req_port_name,
$desired_config[$req_port_name]
);
echo '</td>';
echo '</tr></table>';
}

Expand Down Expand Up @@ -677,6 +676,7 @@ function renderTrunkPortControls ($vswitch, $vdom, $port_name, $vlanport)
'form_mode' => 'save',
);
printOpFormIntro ('save8021QConfig', $formextra);
echo '<table border=0 width="100%"><tr valign=top>';
echo '<td width="35%">';
echo '<table border=0 cellspacing=0 cellpadding=3 align=center>';
echo '<tr><th colspan=2>allowed</th></tr>';
Expand Down Expand Up @@ -772,6 +772,7 @@ function renderTrunkPortControls ($vswitch, $vdom, $port_name, $vlanport)
echo '</form>';
}
echo '</td></tr></table>';
echo '</td></tr></table>';
echo '</td>';
}

Expand Down