From a9caf736867d5df0ff3b82c9e8500318832fa537 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 12 Nov 2015 14:50:11 -0500
Subject: Server operations need the original timestamp, but keep the pretty
 one for local presentation. Fixes #5250

---
 config/autoconfigbackup/autoconfigbackup.php | 8 ++++----
 config/autoconfigbackup/autoconfigbackup.xml | 2 +-
 pkg_config.10.xml                            | 2 +-
 pkg_config.8.xml                             | 2 +-
 pkg_config.8.xml.amd64                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/autoconfigbackup/autoconfigbackup.php b/config/autoconfigbackup/autoconfigbackup.php
index d384e3dd..dcc7a489 100644
--- a/config/autoconfigbackup/autoconfigbackup.php
+++ b/config/autoconfigbackup/autoconfigbackup.php
@@ -365,7 +365,7 @@ EOF;
 					/* Convert the time from server time to local. See #5250 */
 					$budate = new DateTime($tmp_array['time'], $acbtz);
 					$budate->setTimezone($mytz);
-					$tmp_array['time'] = $budate->format(DATE_RFC2822);
+					$tmp_array['localtime'] = $budate->format(DATE_RFC2822);
 
 					if ($ds_split[2] && $ds_split[0]) {
 						$confvers[] = $tmp_array;
@@ -409,16 +409,16 @@ EOF;
 	foreach ($confvers as $cv):
 ?>
 		<tr valign="top">
-			<td class="listlr"> <?= $cv['time']; ?></td>
+			<td class="listlr"> <?= $cv['localtime']; ?></td>
 			<td class="listbg"> <?= $cv['reason']; ?></td>
 			<td colspan="2" valign="middle" class="list" nowrap="nowrap">
-				<a title="Restore this revision" onclick="return confirm('Are you sure you want to restore <?= $cv['time']; ?>?')" href="autoconfigbackup.php?hostname=<?=urlencode($hostname)?>&newver=<?=urlencode($cv['time']);?>">
+				<a title="Restore this revision" onclick="return confirm('Are you sure you want to restore <?= $cv['localtime']; ?>?')" href="autoconfigbackup.php?hostname=<?=urlencode($hostname)?>&newver=<?=urlencode($cv['time']);?>">
 				<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" />
 				</a>
 				<a title="Show info" href="autoconfigbackup.php?download=<?=urlencode($cv['time']);?>&hostname=<?=urlencode($hostname)?>&reason=<?php echo urlencode($cv['reason']);?>">
 				<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_down.gif" width="17" height="17" border="0" alt="" />
 				</a>
-				<a title="Delete" onclick="return confirm('Are you sure you want to delete <?= $cv['time']; ?>?')"href="autoconfigbackup.php?hostname=<?=urlencode($hostname)?>&rmver=<?=urlencode($cv['time']);?>">
+				<a title="Delete" onclick="return confirm('Are you sure you want to delete <?= $cv['localtime']; ?>?')"href="autoconfigbackup.php?hostname=<?=urlencode($hostname)?>&rmver=<?=urlencode($cv['time']);?>">
 				<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" />
 				</a>
 			</td>
diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml
index 93526a49..91da371a 100644
--- a/config/autoconfigbackup/autoconfigbackup.xml
+++ b/config/autoconfigbackup/autoconfigbackup.xml
@@ -43,7 +43,7 @@
 	<description>Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org</description>
 	<requirements>pfSense Portal subscription</requirements>
 	<name>AutoConfigBackup</name>
-	<version>1.30</version>
+	<version>1.31</version>
 	<title>Diagnostics: Auto Configuration Backup</title>
 	<savetext>Change</savetext>
 	<include_file>/usr/local/pkg/autoconfigbackup.inc</include_file>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index efe0b45f..9476968f 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -774,7 +774,7 @@
 		</descr>
 		<website>https://portal.pfsense.org</website>
 		<category>Services</category>
-		<version>1.30</version>
+		<version>1.31</version>
 		<status>RELEASE</status>
 		<required_version>2.2</required_version>
 		<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 76faf2fb..78670f98 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -833,7 +833,7 @@
 		<descr>Automatically backs up your pfSense configuration.  All contents are encrypted before being sent to the server.  Requires Gold Subscription from https://portal.pfsense.org</descr>
 		<website>https://portal.pfsense.org</website>
 		<category>Services</category>
-		<version>1.30</version>
+		<version>1.31</version>
 		<status>Stable</status>
 		<required_version>1.2</required_version>
 		<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 40ee1b39..7ab0af74 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -820,7 +820,7 @@
 		<descr>Automatically backs up your pfSense configuration.  All contents are encrypted before being sent to the server.  Requires Gold Subscription from https://portal.pfsense.org</descr>
 		<website>https://portal.pfsense.org</website>
 		<category>Services</category>
-		<version>1.30</version>
+		<version>1.31</version>
 		<status>Stable</status>
 		<required_version>1.2</required_version>
 		<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
-- 
cgit v1.2.3