Skip to content

Commit

Permalink
Fix pseudowires pages (#14441)
Browse files Browse the repository at this point in the history 
Thanks to @scottbob09 from #14340
  • Loading branch information
@murrant
murrant committed Oct 11, 2022
1 parent 8c2da21 commit fafd989
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 105 deletions.
101 changes: 47 additions & 54 deletions includes/html/pages/device/pseudowires.inc.php
View file
Expand Up @@ -36,16 +36,13 @@

echo '<table cellpadding=5 cellspacing=0 class=devicetable width=100%>';

$linkdone = [];
$bg = '';

foreach (dbFetchRows('SELECT * FROM pseudowires AS P, ports AS I WHERE P.port_id = I.port_id AND I.device_id = ? ORDER BY I.ifDescr', [$device['device_id']]) as $pw_a) {
$pw_a = cleanPort($pw_a);
$i = 0;
while ($i < count($linkdone)) {
$thislink = $pw_a['device_id'] . $pw_a['port_id'];
if ($linkdone[$i] == $thislink) {
$skip = 'yes';
}

$i++;
if (in_array($pw_a['device_id'] . $pw_a['port_id'], $linkdone)) {
continue;
}

$pw_b = dbFetchRow(
Expand All @@ -56,67 +53,63 @@
$pw_b = cleanPort($pw_b);

if (! port_permitted($pw_a['port_id'])) {
$skip = 'yes';
continue;
}

if (! port_permitted($pw_b['port_id'])) {
$skip = 'yes';
continue;
}

if ($skip) {
unset($skip);
if ($bg == 'ffffff') {
$bg = 'e5e5e5';
} else {
if ($bg == 'ffffff') {
$bg = 'e5e5e5';
} else {
$bg = 'ffffff';
}
$bg = 'ffffff';
}

echo "<tr style=\"background-color: #$bg;\"><td rowspan=2 style='font-size:18px; padding:4px;'>" . $pw_a['cpwVcID'] . '</td><td>' . generate_port_link($pw_a) . "</td>
echo "<tr style=\"background-color: #$bg;\"><td rowspan=2 style='font-size:18px; padding:4px;'>" . $pw_a['cpwVcID'] . '</td><td>' . generate_port_link($pw_a) . "</td>
<td rowspan=2> <i class='fa fa-arrows-alt fa-lg icon-theme' aria-hidden='true'></i> </td>
<td>" . generate_device_link($pw_b) . '</td><td>' . generate_port_link($pw_b) . '</td></tr>';
echo "<tr style=\"background-color: #$bg;\"><td colspan=2>" . $pw_a['ifAlias'] . '</td><td>' . $pw_b['ifAlias'] . '</td></tr>';

if ($vars['view'] == 'minigraphs') {
echo "<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>";

if ($pw_a) {
$pw_a['width'] = '150';
$pw_a['height'] = '30';
$pw_a['from'] = \LibreNMS\Config::get('time.day');
$pw_a['to'] = \LibreNMS\Config::get('time.now');
$pw_a['bg'] = $bg;
$types = [
'bits',
'upkts',
'errors',
];
foreach ($types as $graph_type) {
$pw_a['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_a);
}
echo "<tr style=\"background-color: #$bg;\"><td colspan=2>" . $pw_a['ifAlias'] . '</td><td>' . $pw_b['ifAlias'] . '</td></tr>';

if ($vars['view'] == 'minigraphs') {
echo "<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>";

if ($pw_a) {
$pw_a['width'] = '150';
$pw_a['height'] = '30';
$pw_a['from'] = \LibreNMS\Config::get('time.day');
$pw_a['to'] = \LibreNMS\Config::get('time.now');
$pw_a['bg'] = $bg;
$types = [
'bits',
'upkts',
'errors',
];
foreach ($types as $graph_type) {
$pw_a['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_a);
}
}

echo '</td><td></td><td colspan=2>';

if ($pw_b) {
$pw_b['width'] = '150';
$pw_b['height'] = '30';
$pw_b['from'] = \LibreNMS\Config::get('time.day');
$pw_b['to'] = \LibreNMS\Config::get('time.now');
$pw_b['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_b['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_b);
}
echo '</td><td></td><td colspan=2>';

if ($pw_b) {
$pw_b['width'] = '150';
$pw_b['height'] = '30';
$pw_b['from'] = \LibreNMS\Config::get('time.day');
$pw_b['to'] = \LibreNMS\Config::get('time.now');
$pw_b['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_b['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_b);
}

echo '</td></tr>';
}

$linkdone[] = $pw_b['device_id'] . $pw_b['port_id'];
echo '</td></tr>';
}

$linkdone[] = $pw_b['device_id'] . $pw_b['port_id'];
}

echo '</table>';
95 changes: 44 additions & 51 deletions includes/html/pages/pseudowires.inc.php
View file
Expand Up @@ -36,16 +36,13 @@

echo '<table cellpadding=5 cellspacing=0 class=devicetable width=100%>';

$linkdone = [];
$bg = '';

foreach (dbFetchRows('SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.port_id = I.port_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr') as $pw_a) {
$pw_a = cleanPort($pw_a);
$i = 0;
while ($i < count($linkdone)) {
$thislink = $pw_a['device_id'] . $pw_a['port_id'];
if ($linkdone[$i] == $thislink) {
$skip = 'yes';
}

$i++;
if (in_array($pw_a['device_id'] . $pw_a['port_id'], $linkdone)) {
continue;
}

$pw_b = dbFetchRow(
Expand All @@ -60,63 +57,59 @@
$pw_b = cleanPort($pw_b);

if (! port_permitted($pw_a['port_id'])) {
$skip = 'yes';
continue;
}

if (! port_permitted($pw_b['port_id'])) {
$skip = 'yes';
continue;
}

if ($skip) {
unset($skip);
if ($bg == 'ffffff') {
$bg = 'e5e5e5';
} else {
if ($bg == 'ffffff') {
$bg = 'e5e5e5';
} else {
$bg = 'ffffff';
}
$bg = 'ffffff';
}

echo "<tr style=\"background-color: #$bg;\"><td rowspan=2 style='font-size:18px; padding:4px;'>" . $pw_a['cpwVcID'] . '</td><td>' . generate_device_link($pw_a) . '</td><td>' . generate_port_link($pw_a) . "</td>
echo "<tr style=\"background-color: #$bg;\"><td rowspan=2 style='font-size:18px; padding:4px;'>" . $pw_a['cpwVcID'] . '</td><td>' . generate_device_link($pw_a) . '</td><td>' . generate_port_link($pw_a) . "</td>
<td rowspan=2> <i class='fa fa-arrows-alt fa-lg icon-theme' aria-hidden='true'></i> </td>
<td>" . generate_device_link($pw_b) . '</td><td>' . generate_port_link($pw_b) . '</td></tr>';
echo "<tr style=\"background-color: #$bg;\"><td colspan=2>" . $pw_a['ifAlias'] . '</td><td colspan=2>' . $pw_b['ifAlias'] . '</td></tr>';

if ($vars['view'] == 'minigraphs') {
echo "<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>";

if ($pw_a) {
$pw_a['width'] = '150';
$pw_a['height'] = '30';
$pw_a['from'] = \LibreNMS\Config::get('time.day');
$pw_a['to'] = \LibreNMS\Config::get('time.now');
$pw_a['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_a['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_a);
}
echo "<tr style=\"background-color: #$bg;\"><td colspan=2>" . $pw_a['ifAlias'] . '</td><td colspan=2>' . $pw_b['ifAlias'] . '</td></tr>';

if ($vars['view'] == 'minigraphs') {
echo "<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>";

if ($pw_a) {
$pw_a['width'] = '150';
$pw_a['height'] = '30';
$pw_a['from'] = \LibreNMS\Config::get('time.day');
$pw_a['to'] = \LibreNMS\Config::get('time.now');
$pw_a['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_a['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_a);
}
}

echo '</td><td></td><td colspan=2>';

if ($pw_b) {
$pw_b['width'] = '150';
$pw_b['height'] = '30';
$pw_b['from'] = \LibreNMS\Config::get('time.day');
$pw_b['to'] = \LibreNMS\Config::get('time.now');
$pw_b['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_b['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_b);
}
echo '</td><td></td><td colspan=2>';

if ($pw_b) {
$pw_b['width'] = '150';
$pw_b['height'] = '30';
$pw_b['from'] = \LibreNMS\Config::get('time.day');
$pw_b['to'] = \LibreNMS\Config::get('time.now');
$pw_b['bg'] = $bg;
$types = ['bits', 'upkts', 'errors'];
foreach ($types as $graph_type) {
$pw_b['graph_type'] = 'port_' . $graph_type;
print_port_thumbnail($pw_b);
}
}

echo '</td></tr>';
}//end if

$linkdone[] = $pw_b['device_id'] . $pw_b['port_id'];
echo '</td></tr>';
}//end if

$linkdone[] = $pw_b['device_id'] . $pw_b['port_id'];
}//end foreach

echo '</table>';

0 comments on commit fafd989

Please sign in to comment.