From 6a7230b660df51b3f3461c9169025f1a367ff4d2 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 2 Apr 2013 10:39:09 -0400
Subject: Fix service status for OpenVPN peer-to-peer client/server instances.

---
 usr/local/www/status_openvpn.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/status_openvpn.php b/usr/local/www/status_openvpn.php
index 28a9765..2796261 100644
--- a/usr/local/www/status_openvpn.php
+++ b/usr/local/www/status_openvpn.php
@@ -275,7 +275,8 @@ include("head.inc"); ?>
 			<td class="listhdrr"><?=gettext("Virtual Addr"); ?></td>
 			<td class="listhdrr"><?=gettext("Remote Host"); ?></td>
 			<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
-			<td class="listhdrr"><?=gettext("Bytes Received"); ?></td>
+			<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
+			<td class="listhdrr"><?=gettext("Svc"); ?></td>
 		</tr>
 
 <?php foreach ($sk_servers as $sk_server): ?>
@@ -301,20 +302,17 @@ include("head.inc"); ?>
 			<td class="listr">
 				<?=$sk_server['bytes_recv'];?>
 			</td>
-		</tr>
-<?php endforeach; ?>
-		<tr>
-			<td colspan="2" class="list" height="12">
+			<td class="listr">
 			<table>
 			<tr>
 			<?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?>
-			<?= get_service_status_icon($ssvc, true, true); ?>
+			<?= get_service_status_icon($ssvc, false, true); ?>
 			<td><?= get_service_control_links($ssvc, true); ?></td>
 			</tr>
 			</table>
 			</td>
-			<td colspan="5" class="list" height="12">&nbsp;</td>
 		</tr>
+<?php endforeach; ?>
 		</table>
 	</tr>
 </table>
@@ -338,7 +336,8 @@ include("head.inc"); ?>
 			<td class="listhdrr"><?=gettext("Virtual Addr"); ?></td>
 			<td class="listhdrr"><?=gettext("Remote Host"); ?></td>
 			<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
-			<td class="listhdrr"><?=gettext("Bytes Received"); ?></td>
+			<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
+			<td class="listhdrr"><?=gettext("Svc"); ?></td>
 		</tr>
 
 <?php foreach ($clients as $client): ?>
@@ -364,20 +363,17 @@ include("head.inc"); ?>
 			<td class="listr">
 				<?=$client['bytes_recv'];?>
 			</td>
-		</tr>
-<?php endforeach; ?>
-		<tr>
-			<td colspan="2" class="list" height="12">
+			<td class="listr" height="12">
 			<table>
 			<tr>
 			<?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?>
-			<?= get_service_status_icon($ssvc, true, true); ?>
+			<?= get_service_status_icon($ssvc, false, true); ?>
 			<td><?= get_service_control_links($ssvc, true); ?></td>
 			</tr>
 			</table>
 			</td>
-			<td colspan="5" class="list" height="12">&nbsp;</td>
 		</tr>
+<?php endforeach; ?>
 		</table>
 	</tr>
 </table>
-- 
cgit v1.1