From 92420c0a5b4ca34a6c087381635626bfb04f9b55 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 21 Nov 2011 17:09:53 -0500
Subject: Also show the config version in the backup history.

---
 usr/local/www/diag_confbak.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'usr/local/www/diag_confbak.php')

diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php
index f02d2de..daa036f 100755
--- a/usr/local/www/diag_confbak.php
+++ b/usr/local/www/diag_confbak.php
@@ -150,7 +150,8 @@ include("head.inc");
 						<?php if (is_array($confvers)): ?>
 						<tr>
 							<td colspan="2" valign="middle" align="center" class="list" nowrap><input type="submit" name="diff" value="<?=gettext("Diff"); ?>"></td>
-							<td width="30%" class="listhdrr"><?=gettext("Date");?></td>
+							<td width="22%" class="listhdrr"><?=gettext("Date");?></td>
+							<td width="8%" class="listhdrr"><?=gettext("Version");?></td>
 							<td width="70%" class="listhdrr"><?=gettext("Configuration Change");?></td>
 						</tr>
 						<tr valign="top">
@@ -159,6 +160,7 @@ include("head.inc");
 								<input type="radio" name="newtime" value="current">
 							</td>
 							<td class="listlr"> <?= date(gettext("n/j/y H:i:s"), $config['revision']['time']) ?></td>
+							<td class="listr"> <?= $config['version'] ?></td>
 							<td class="listr"> <?= $config['revision']['description'] ?></td>
 							<td colspan="3" valign="middle" class="list" nowrap><b><?=gettext("Current");?></b></td>
 						</tr>
@@ -169,7 +171,6 @@ include("head.inc");
 									$date = date(gettext("n/j/y H:i:s"), $version['time']);
 								else
 									$date = gettext("Unknown");
-								$desc = $version['description'];
 						?>
 						<tr valign="top">
 							<td class="list">
@@ -184,7 +185,8 @@ include("head.inc");
 								$c++; ?>
 							</td>
 							<td class="listlr"> <?= $date ?></td>
-							<td class="listr"> <?= $desc ?></td>
+							<td class="listr"> <?= $version['version'] ?></td>
+							<td class="listr"> <?= $version['description'] ?></td>
 							<td valign="middle" class="list" nowrap>
 							<a href="diag_confbak.php?newver=<?=$version['time'];?>" onclick="return confirm('<?=gettext("Revert to this configuration?");?>'")>
 							<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="<?=gettext("Revert to this configuration");?>" title="<?=gettext("Revert to this configuration");?>">
-- 
cgit v1.1