entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not display the disabled tunnels since they are not needed in the widget. Ticket #3955

This commit is contained in:
Ermal 2014-11-12 22:06:03 +01:00
parent 6a151c91f9
commit bd0bb466f0
1 changed files with 25 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
usr/local/www/widgets/widgets/ipsec.widget.php
View File

@ -61,36 +61,28 @@ if (isset($config['ipsec']['phase1'])){?>
if ($ph2ent['remoteid']['type'] == "mobile") if ($ph2ent['remoteid']['type'] == "mobile")
continue; continue;
ipsec_lookup_phase1($ph2ent,$ph1ent); ipsec_lookup_phase1($ph2ent,$ph1ent);
$ipsecstatus = false;
$tun_disabled = "false"; if (!isset($ph1ent['disabled']) && !isset($ph2ent['disabled'])) {
$foundsrc = false;
$founddst = false;
if (isset($ph1ent['disabled']) || isset($ph2ent['disabled'])) { if (is_array($ipsec_status['query']) &&
$tun_disabled = "true"; is_array($ipsec_status['query']['ikesalist']) &&
continue; is_array($ipsec_status['query']['ikesalist']['ikesa']) &&
} ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ph1ent['ikeid'])) {
/* tunnel is up */
$iconfn = "true";
$activecounter++;
} else {
/* tunnel is down */
$iconfn = "false";
$inactivecounter++;
}
if (is_array($ipsec_status['query']) && $ipsec_detail_array[] = array('src' => convert_friendly_interface_to_friendly_descr($ph1ent['interface']),
is_array($ipsec_status['query']['ikesalist']) &&
is_array($ipsec_status['query']['ikesalist']['ikesa']) &&
ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ph1ent['ikeid'])) {
/* tunnel is up */
$iconfn = "true";
$activecounter++;
} else {
/* tunnel is down */
$iconfn = "false";
$inactivecounter++;
}
$ipsec_detail_array[] = array('src' => convert_friendly_interface_to_friendly_descr($ph1ent['interface']),
'dest' => $ph1ent['remote-gateway'], 'dest' => $ph1ent['remote-gateway'],
'remote-subnet' => ipsec_idinfo_to_text($ph2ent['remoteid']), 'remote-subnet' => ipsec_idinfo_to_text($ph2ent['remoteid']),
'descr' => $ph2ent['descr'], 'descr' => $ph2ent['descr'],
'status' => $iconfn, 'status' => $iconfn);
'disabled' => $tun_disabled); }
} }
} }
@ -122,32 +114,20 @@ if (isset($config['ipsec']['phase1'])){?>
<div class="widgetsubheader" style="display:table-cell;width:30px">Status</div> <div class="widgetsubheader" style="display:table-cell;width:30px">Status</div>
</div> </div>
<div style="max-height:105px;overflow:auto;"> <div style="max-height:105px;overflow:auto;">
<?php
foreach ($ipsec_detail_array as $ipsec) :
if ($ipsec['disabled'] == "true"){
$spans = "<span class=\"gray\">";
$spane = "</span>";
}
else {
$spans = $spane = "";
}
?>
<?php foreach ($ipsec_detail_array as $ipsec) : ?>
<div style="display:table-row;"> <div style="display:table-row;">
<div class="listlr" style="display:table-cell;width:39px"> <div class="listlr" style="display:table-cell;width:39px">
<?php echo $spans;?> <?php echo htmlspecialchars($ipsec['src']);?>
<?php echo htmlspecialchars($ipsec['src']);?>
<?php echo $spane;?>
</div> </div>
<div class="listr" style="display:table-cell;width:100px"><?php echo $spans;?> <div class="listr" style="display:table-cell;width:100px">
<?php echo $ipsec['remote-subnet'];?> <?php echo $ipsec['remote-subnet'];?>
<br /> <br />
(<?php echo htmlspecialchars($ipsec['dest']);?>)<?php echo $spane;?> (<?php echo htmlspecialchars($ipsec['dest']);?>)
</div> </div>
<div class="listr" style="display:table-cell;width:90px"><?php echo $spans;?><?php echo htmlspecialchars($ipsec['descr']);?><?php echo $spane;?></div> <div class="listr" style="display:table-cell;width:90px"></div>
<div class="listr" style="display:table-cell;width:37px" align="center"><?php echo $spans;?> <div class="listr" style="display:table-cell;width:37px" align="center">
<?php <?php
if($ipsec['status'] == "true") { if($ipsec['status'] == "true") {
@ -159,8 +139,8 @@ if (isset($config['ipsec']['phase1'])){?>
} }
echo "<img src ='/themes/{$g['theme']}/images/icons/icon_{$iconfn}.gif' alt='Tunnel status' width='11' height='11' />"; echo "<img src ='/themes/{$g['theme']}/images/icons/icon_{$iconfn}.gif' alt='Tunnel status' width='11' height='11' />";
?>
?><?php echo $spane;?></div> </div>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>