diff options
| author | jim-p <jimp@pfsense.org> | 2015-11-12 14:50:11 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-11-12 14:50:32 -0500 |
| commit | a9caf736867d5df0ff3b82c9e8500318832fa537 (patch) | |
| tree | 7d0b8969b9c589bdbb00a25e17402738d3c04752 /config | |
| parent | 683f9eced9675528b61558ed327be89168b5d33f (diff) | |
| download | pfsense-packages-a9caf736867d5df0ff3b82c9e8500318832fa537.tar.gz pfsense-packages-a9caf736867d5df0ff3b82c9e8500318832fa537.tar.bz2 pfsense-packages-a9caf736867d5df0ff3b82c9e8500318832fa537.zip | |
Server operations need the original timestamp, but keep the pretty one for local presentation. Fixes #5250
Diffstat (limited to 'config')
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup.php | 8 | ||||
| -rw-r--r-- | config/autoconfigbackup/autoconfigbackup.xml | 2 |
2 files changed, 5 insertions, 5 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> |