From 3e42a128039f30b8bb1176a2ff490a2fb62dbda4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@netgate.com>
Date: Thu, 21 Nov 2019 14:09:56 -0500
Subject: [PATCH] OpenVPN status page sent/recv bytes sorting changes. Fixes
 #7359

(cherry picked from commit f467ea24cb3c3a98b370c2427ff1aa53d25f14a1)
---
 src/usr/local/www/status_openvpn.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index fd70fd0dfd..16503f26f7 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -104,7 +104,8 @@ include("head.inc"); ?>
 						<th><?=gettext("Real Address")?></th>
 						<th><?=gettext("Virtual Address"); ?></th>
 						<th><?=gettext("Connected Since"); ?></th>
-						<th><?=gettext("Bytes Sent/Received")?></th>
+						<th><?=gettext("Bytes Sent")?></th>
+						<th><?=gettext("Bytes Received")?></th>
 						<th><!-- Icons --></th>
 					</tr>
 				</thead>
@@ -132,7 +133,8 @@ include("head.inc"); ?>
 							<?=$conn['virtual_addr6'];?>
 						</td>
 						<td><?=$conn['connect_time'];?></td>
-						<td><?=format_bytes($conn['bytes_sent']);?> / <?=format_bytes($conn['bytes_recv']);?></td>
+						<td data-value="<?=trim($conn['bytes_sent'])?>"><?=format_bytes($conn['bytes_sent']);?></td>
+						<td data-value="<?=trim($conn['bytes_recv'])?>"><?=format_bytes($conn['bytes_recv']);?></td>
 						<td>
 							<a
 							   onclick="killClient('<?=$server['mgmt'];?>', '<?=$conn['remote_host'];?>');" style="cursor:pointer;"
@@ -238,7 +240,8 @@ include("head.inc"); ?>
 						<th><?=gettext("Connected Since"); ?></th>
 						<th><?=gettext("Virtual Address"); ?></th>
 						<th><?=gettext("Remote Host"); ?></th>
-						<th><?=gettext("Bytes Sent / Received"); ?></th>
+						<th><?=gettext("Bytes Sent"); ?></th>
+						<th><?=gettext("Bytes Received"); ?></th>
 						<th><?=gettext("Service"); ?></th>
 					</tr>
 				</thead>
@@ -259,7 +262,8 @@ include("head.inc"); ?>
 							<?=$sk_server['virtual_addr6'];?>
 						</td>
 						<td><?=$sk_server['remote_host'];?></td>
-						<td><?=format_bytes($sk_server['bytes_sent']);?> / <?=format_bytes($sk_server['bytes_recv']);?></td>
+						<td data-value="<?=trim($sk_server['bytes_sent'])?>"><?=format_bytes($sk_server['bytes_sent']);?></td>
+						<td data-value="<?=trim($sk_server['bytes_recv'])?>"><?=format_bytes($sk_server['bytes_recv']);?></td>
 						<td>
 							<table>
 								<tr>
@@ -299,7 +303,8 @@ include("head.inc"); ?>
 						<th><?=gettext("Local Address"); ?></th>
 						<th><?=gettext("Virtual Address"); ?></th>
 						<th><?=gettext("Remote Host"); ?></th>
-						<th><?=gettext("Bytes Sent/Received"); ?></th>
+						<th><?=gettext("Bytes Sent"); ?></th>
+						<th><?=gettext("Bytes Received"); ?></th>
 						<th><?=gettext("Service"); ?></th>
 					</tr>
 				</thead>
@@ -333,7 +338,8 @@ include("head.inc"); ?>
 							<?=$client['remote_host'];?>:<?=$client['remote_port'];?>
 					<?php endif; ?>
 						</td>
-						<td><?=format_bytes($client['bytes_sent']);?> / <?=format_bytes($client['bytes_recv']);?></td>
+						<td data-value="<?=trim($client['bytes_sent'])?>"><?=format_bytes($client['bytes_sent']);?></td>
+						<td data-value="<?=trim($client['bytes_recv'])?>"><?=format_bytes($client['bytes_recv']);?></td>
 						<td>
 							<table>
 								<tr>